%}
%include "stl.i"
+%include "typemaps.i"
//%include std_list.i
%include "ustring.i"
-%ignore otk::display;
-%inline %{
- otk::Display *Display_instance() { return otk::display; }
-%};
-
-%ignore otk::Property::atoms;
-%inline %{
- const otk::Atoms& Property_atoms() { return otk::Property::atoms; }
-%};
+%immutable otk::display;
+%immutable otk::Property::atoms;
namespace otk {
/*%rename(setValue_bool) Configuration::setValue(std::string const &,bool);
%include "eventhandler.hh"
%include "eventdispatcher.hh"
%include "point.hh"
+%include "size.hh"
%include "rect.hh"
%include "rendercolor.hh"
%include "rendertexture.hh"
%include "renderstyle.hh"
%include "widget.hh"
%include "label.hh"
-%include "focuswidget.hh"
-%include "focuslabel.hh"
%include "appwidget.hh"
%include "application.hh"
%include "assassin.hh"
%include "button.hh"
%include "display.hh"
%include "rendercontrol.hh"
-%include "property.hh"
%include "screeninfo.hh"
%include "strut.hh"
-%include "timer.hh"
-%include "util.hh"
-// for Mod1Mask etc
-%include "X11/X.h"
+%apply unsigned long *OUTPUT { unsigned long *value };
+%include "property.hh"
+
+// for Window etc
+%import "X11/X.h"
+
+// globals
+%pythoncode %{
+display = cvar.display;
+atoms = cvar.Property_atoms;
+
+def style(screen):
+ return RenderStyle_style(screen)
+
+%}