//%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;
+%ignore otk::display;
%inline %{
- Display *Display_display() { return otk::Display::display; }
+ otk::Display *Display_instance() { return otk::display; }
%};
%include "../otk/ustring.i"