# include "../config.h"
#endif
+#include "frame.hh"
#include "openbox.hh"
#include "screen.hh"
#include "client.hh"
//%include std_list.i
//%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::openbox;
+
%ignore ob::Screen::clients;
%{
#include <iterator>
%}
%extend ob::Screen {
Client *client(int i) {
- if (i >= (int)self->clients.size())
+ if (i < 0 || i >= (int)self->clients.size())
return NULL;
ob::Client::List::iterator it = self->clients.begin();
std::advance(it,i);
}
};
-%ignore otk::Display::display;
+%include "../otk/ustring.i"
+
+%ignore otk::display;
+%inline %{
+ otk::Display *Display_instance() { return otk::display; }
+%};
+
+%ignore otk::Property::atoms;
%inline %{
- Display *Display_display() { return otk::Display::display; }
+ const otk::Atoms& Property_atoms() { return otk::Property::atoms; }
%};
%include "../otk/display.hh"
%include "../otk/eventhandler.hh"
%include "../otk/eventdispatcher.hh"
+%import "../otk/widget.hh"
%import "widgetbase.hh"
%import "actions.hh"
%include "openbox.hh"
%include "screen.hh"
%include "client.hh"
+%include "frame.hh"
%include "python.hh"
// for Mod1Mask etc