#include "bindings.hh"
#include "actions.hh"
#include "python.hh"
-#include "otk/display.hh"
+#include "otk/otk.hh"
%}
%include "stl.i"
//%include std_list.i
-//%template(ClientList) std::list<OBClient*>;
+//%template(ClientList) std::list<Client*>;
%ignore ob::Openbox::instance;
%inline %{
}
%}
-%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;
}
}
};
-%import "../otk/eventdispatcher.hh"
-%import "../otk/eventhandler.hh"
-%import "widget.hh"
-%import "actions.hh"
+%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"
%include "openbox.hh"
%include "screen.hh"