fix \'s

[chaz/openbox] / src / openbox.i

diff --git a/src/openbox.i b/src/openbox.i
index 7322426bb9992deaa6790aeb69cb869b5c95634c..7422d0a198f16d4b7ccec3e747f358a4f4f0a284 100644 (file)
--- 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,13 +107,28 @@ void python_callback(PyObject *func, KeyData *data)
   }
 };
 
-%import "../otk/eventdispatcher.hh"
-%import "../otk/eventhandler.hh"
-%import "widget.hh"
-%import "actions.hh"
+%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"
 
 %include "openbox.hh"
 %include "screen.hh"