X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fotk.i;h=148ff0c2b2ed7d9a5514f9698e1a4109045869ae;hb=bc88d310fea71823fb2c61d071ff499579bffaba;hp=fc5a4c5f23eb160b55439c79d7e3691774296b1e;hpb=bf49e7642027f576716e5742544c282f4396f9ef;p=chaz%2Fopenbox

diff --git a/otk/otk.i b/otk/otk.i
index fc5a4c5f..148ff0c2 100644
--- a/otk/otk.i
+++ b/otk/otk.i
@@ -7,38 +7,17 @@
 #  include "../config.h"
 #endif
 
-#include "application.hh"
-#include "appwidget.hh"
-#include "assassin.hh"
-#include "button.hh"
-#include "color.hh"
-#include "configuration.hh"
-#include "display.hh"
-#include "eventdispatcher.hh"
-#include "eventhandler.hh"
-#include "focuslabel.hh"
-#include "focuswidget.hh"
-#include "font.hh"
-#include "gccache.hh"
-#include "image.hh"
-#include "label.hh"
-#include "point.hh"
-#include "property.hh"
-#include "rect.hh"
-#include "screeninfo.hh"
-#include "strut.hh"
-#include "style.hh"
-#include "texture.hh"
-#include "timer.hh"
-#include "timerqueue.hh"
-#include "timerqueuemanager.hh"
-#include "util.hh"
-#include "widget.hh"
+#include "otk.hh"
 %}
 
-%include stl.i
+%include "stl.i"
 //%include std_list.i
 
+%ignore otk::OBDisplay::display;
+%inline %{
+  Display *OBDisplay_display() { return otk::OBDisplay::display; }
+%};
+
 namespace otk {
 %rename(setValue_bool) Configuration::setValue(std::string const &,bool);
 %rename(setValue_unsigned) Configuration::setValue(const std::string &, unsigned int);
@@ -99,3 +78,7 @@ namespace otk {
 %include "timerqueue.hh"
 %include "timerqueuemanager.hh"
 %include "util.hh"
+%include "widget.hh"
+
+// for Mod1Mask etc
+%include "X11/X.h"