X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.i;h=7422d0a198f16d4b7ccec3e747f358a4f4f0a284;hb=558b55b0c31a3cf6a7006aa78a22a4d7002d9804;hp=7edc794232fb7c9ccbec685cf8daaf12bf529e00;hpb=c8e246f8de5af9963b22cc104d22ca10772028dd;p=chaz%2Fopenbox

diff --git a/src/openbox.i b/src/openbox.i
index 7edc7942..7422d0a1 100644
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -13,7 +13,7 @@
 #include "bindings.hh"
 #include "actions.hh"
 #include "python.hh"
-#include "otk/display.hh"
+#include "otk/otk.hh"
 %}
 
 %include "stl.i"
@@ -107,7 +107,25 @@ void python_callback(PyObject *func, KeyData *data)
   }
 };
 
-%include "../otk/otk.i"
+%ignore otk::OBDisplay::display;
+%inline %{
+  Display *OBDisplay_display() { return otk::OBDisplay::display; }
+%};
+
+%include "../otk/display.hh"
+%include "../otk/point.hh"
+%include "../otk/property.hh"
+%include "../otk/rect.hh"
+%include "../otk/screeninfo.hh"
+%include "../otk/strut.hh"
+
+%rename(itostring_unsigned) itostring(unsigned int);
+%rename(itostring_long) itostring(long);
+%rename(itostring_unsigned_long) itostring(unsigned long);
+%include "../otk/util.hh"
+
+%include "../otk/eventhandler.hh"
+%include "../otk/eventdispatcher.hh"
 
 %import "widgetbase.hh"
 %import "actions.hh"