%include "stl.i"
//%include std_list.i
-//%template(ClientList) std::list<OBClient*>;
+//%template(ClientList) std::list<Client*>;
-%ignore ob::Openbox::instance;
+%ignore ob::openbox;
%inline %{
- ob::Openbox *Openbox_instance() { return ob::Openbox::instance; }
+ ob::Openbox *Openbox_instance() { return ob::openbox; }
%};
%{
}
%}
-%ignore ob::OBScreen::clients;
+%ignore ob::Screen::clients;
%{
#include <iterator>
%}
-%extend ob::OBScreen {
- OBClient *client(int i) {
- if (i >= (int)self->clients.size())
+%extend ob::Screen {
+ Client *client(int i) {
+ if (i < 0 || 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;
}
}
};
-%ignore otk::OBDisplay::display;
+%ignore otk::Display::display;
%inline %{
- Display *OBDisplay_display() { return otk::OBDisplay::display; }
+ Display *Display_display() { return otk::Display::display; }
%};
+%include "../otk/ustring.i"
+
%include "../otk/display.hh"
%include "../otk/point.hh"
%include "../otk/property.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"