X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=wrap%2Fotk.i;h=06fed78ef8d625fec9c9a07d2faec31f5ee615fb;hb=b18959e1bda52f807f62c95772c69ce3005215a7;hp=5bf17a216084ec0442076ce518591821e1170488;hpb=67fbe8354f27386235e0c8dc57bd036e34a4fe5e;p=chaz%2Fopenbox

diff --git a/wrap/otk.i b/wrap/otk.i
index 5bf17a21..06fed78e 100644
--- a/wrap/otk.i
+++ b/wrap/otk.i
@@ -7,18 +7,12 @@
 %}
 
 %include "stl.i"
+%include "typemaps.i"
 //%include std_list.i
 %include "ustring.i"
 
-%ignore otk::display;
-%inline %{
-  otk::Display *Display_instance() { return otk::display; }
-%};
-
-%ignore otk::Property::atoms;
-%inline %{
-  const otk::Atoms& Property_atoms() { return otk::Property::atoms; }
-%};
+%immutable otk::display;
+%immutable otk::Property::atoms;
 
 namespace otk {
 /*%rename(setValue_bool) Configuration::setValue(std::string const &,bool);
@@ -56,6 +50,7 @@ namespace otk {
 %include "eventhandler.hh"
 %include "eventdispatcher.hh"
 %include "point.hh"
+%include "size.hh"
 %include "rect.hh"
 %include "rendercolor.hh"
 %include "rendertexture.hh"
@@ -63,19 +58,27 @@ namespace otk {
 %include "renderstyle.hh"
 %include "widget.hh"
 %include "label.hh"
-%include "focuswidget.hh"
-%include "focuslabel.hh"
 %include "appwidget.hh"
 %include "application.hh"
 %include "assassin.hh"
 %include "button.hh"
 %include "display.hh"
 %include "rendercontrol.hh"
-%include "property.hh"
 %include "screeninfo.hh"
 %include "strut.hh"
-%include "timer.hh"
-%include "util.hh"
 
-// for Mod1Mask etc
-%include "X11/X.h"
+%apply unsigned long *OUTPUT { unsigned long *value };
+%include "property.hh"
+
+// for Window etc
+%import "X11/X.h"
+
+// globals
+%pythoncode %{
+display = cvar.display;
+atoms = cvar.Property_atoms;
+
+def style(screen):
+    return RenderStyle_style(screen)
+
+%}