X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.i;h=edc29ae82303c0081fefc2a62a8b211c2b340b4f;hb=2627b85226b621868a4425f4aea695ed089d7de5;hp=23b50c3c640a9d7cc96f6fc8b62b8061088f7907;hpb=678bb52123bde0b71037393827c03f6b17904a60;p=chaz%2Fopenbox

diff --git a/src/openbox.i b/src/openbox.i
index 23b50c3c..edc29ae8 100644
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -18,7 +18,7 @@
 
 %include "stl.i"
 //%include std_list.i
-//%template(ClientList) std::list<OBClient*>;
+//%template(ClientList) std::list<Client*>;
 
 %ignore ob::Openbox::instance;
 %inline %{
@@ -90,15 +90,15 @@ void python_callback(PyObject *func, KeyData *data)
 }
 %}
 
-%ignore ob::OBScreen::clients;
+%ignore ob::Screen::clients;
 %{
   #include <iterator>
 %}
-%extend ob::OBScreen {
-  OBClient *client(int i) {
+%extend ob::Screen {
+  Client *client(int i) {
     if (i >= (int)self->clients.size())
       return NULL;
-    ob::OBClient::List::iterator it = self->clients.begin();
+    ob::Client::List::iterator it = self->clients.begin();
     std::advance(it,i);
     return *it;
   }
@@ -107,7 +107,20 @@ void python_callback(PyObject *func, KeyData *data)
   }
 };
 
-%import "../otk/otk.i"
+%ignore otk::Display::display;
+%inline %{
+  Display *Display_display() { return otk::Display::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"
+
+%include "../otk/eventhandler.hh"
+%include "../otk/eventdispatcher.hh"
 
 %import "widgetbase.hh"
 %import "actions.hh"