X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=wrap%2Fotk.i;h=06fed78ef8d625fec9c9a07d2faec31f5ee615fb;hb=7c32ac2b3f0bfd02a1efea1d67e5ad1c3c5be93f;hp=8d06d6f0a7bb7cd33e95f000273c4a7e256e98f2;hpb=7c8c9e998ffc3a9b22e15feeffe77823142ce531;p=chaz%2Fopenbox

diff --git a/wrap/otk.i b/wrap/otk.i
index 8d06d6f0..06fed78e 100644
--- a/wrap/otk.i
+++ b/wrap/otk.i
@@ -7,6 +7,7 @@
 %}
 
 %include "stl.i"
+%include "typemaps.i"
 //%include std_list.i
 %include "ustring.i"
 
@@ -49,6 +50,7 @@ namespace otk {
 %include "eventhandler.hh"
 %include "eventdispatcher.hh"
 %include "point.hh"
+%include "size.hh"
 %include "rect.hh"
 %include "rendercolor.hh"
 %include "rendertexture.hh"
@@ -56,19 +58,17 @@ namespace otk {
 %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"
+
+%apply unsigned long *OUTPUT { unsigned long *value };
+%include "property.hh"
 
 // for Window etc
 %import "X11/X.h"
@@ -77,4 +77,8 @@ namespace otk {
 %pythoncode %{
 display = cvar.display;
 atoms = cvar.Property_atoms;
+
+def style(screen):
+    return RenderStyle_style(screen)
+
 %}