updated wrappers around the new otk widget system and style system

diff --git a/wrap/ob.i b/wrap/ob.i
index 19360a4308e3193507afc23fc44b5f1ee8b3a879..33cc5403f0c70714d04cfad592cd14fda2fd687c 100644 (file)
--- a/wrap/ob.i
+++ b/wrap/ob.i
@@ -49,7 +49,6 @@
 
 %import "otk.i"
 
-%import "widgetbase.hh"
 %import "actions.hh"
 
 %include "openbox.hh"

diff --git a/wrap/otk.i b/wrap/otk.i
index 8d06d6f0a7bb7cd33e95f000273c4a7e256e98f2..2d87fb82607dc7025cc811af3c19ea16e5374a73 100644 (file)
--- a/wrap/otk.i
+++ b/wrap/otk.i
@@ -49,6 +49,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,8 +57,6 @@ 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"
@@ -67,8 +66,6 @@ namespace otk {
 %include "property.hh"
 %include "screeninfo.hh"
 %include "strut.hh"
-%include "timer.hh"
-%include "util.hh"
 
 // for Window etc
 %import "X11/X.h"
@@ -77,4 +74,8 @@ namespace otk {
 %pythoncode %{
 display = cvar.display;
 atoms = cvar.Property_atoms;
+
+def style(screen):
+    return RenderStyle_style(screen)
+
 %}