include the all otk stuff into the openbox python module. rename widget.hh to stop conflicting with the one in otk/

src/Makefile.am

@@ -35,6 +35,6 @@ openbox.i: openbox.hh screen.hh client.hh python.hh
 	touch $@
 
 openbox_wrap.cc: openbox.i
-	swig $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
+	swig -I../otk $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
 
 # local dependencies

src/actions.cc

@@ -5,7 +5,7 @@
 #endif
 
 #include "actions.hh"
-#include "widget.hh"
+#include "widgetbase.hh"
 #include "openbox.hh"
 #include "client.hh"
 #include "screen.hh"

src/backgroundwidget.hh

@@ -3,7 +3,7 @@
 #define   __obbackgroundwidget_hh
 
 #include "otk/widget.hh"
-#include "widget.hh"
+#include "widgetbase.hh"
 
 namespace ob {
 

src/buttonwidget.hh

@@ -2,8 +2,8 @@
 #ifndef   __obbuttonwidget_hh
 #define   __obbuttonwidget_hh
 
+#include "widgetbase.hh"
 #include "otk/widget.hh"
-#include "widget.hh"
 
 namespace ob {
 

src/client.hh

@@ -7,7 +7,7 @@
   property changes on the window and some client messages
 */
 
-#include "widget.hh"
+#include "widgetbase.hh"
 #include "otk/point.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"

src/labelwidget.hh

@@ -2,10 +2,10 @@
 #ifndef   __oblabelwidget_hh
 #define   __oblabelwidget_hh
 
+#include "widgetbase.hh"
 #include "otk/widget.hh"
 #include "otk/font.hh"
 #include "otk/style.hh"
-#include "widget.hh"
 
 namespace ob {
 

src/openbox.i

@@ -107,13 +107,10 @@ void python_callback(PyObject *func, KeyData *data)
   }
 };
 
-%import "../otk/eventdispatcher.hh"
+%include "../otk/otk.i"
-%import "../otk/eventhandler.hh"
-%import "widget.hh"
-%import "actions.hh"
 
-%include "../otk/point.hh"
+%import "widgetbase.hh"
-%include "../otk/rect.hh"
+%import "actions.hh"
 
 %include "openbox.hh"
 %include "screen.hh"

src/python.cc

@@ -31,7 +31,7 @@ void python_init(char *argv0)
                                         otk::expandTilde("~/.openbox/python") +
                                         "')").c_str()));
 //  PyRun_SimpleString("from _otk import *; from _openbox import *;");
-  PyRun_SimpleString("from otk import *; from openbox import *;");
+  PyRun_SimpleString("from openbox import *;");
   PyRun_SimpleString("openbox = Openbox_instance()");
   PyRun_SimpleString("display = OBDisplay_display()");
 

src/screen.hh

@@ -11,7 +11,7 @@ extern "C" {
 }
 
 #include "client.hh"
-#include "widget.hh"
+#include "widgetbase.hh"
 #include "otk/image.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"

src/widgetbase.hh

@@ -1,6 +1,6 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-#ifndef   __obwidget_hh
+#ifndef   __obwidgetbase_hh
-#define   __obwidget_hh
+#define   __obwidgetbase_hh
 
 #include "python.hh"
 
@@ -8,7 +8,6 @@ namespace ob {
 
 class OBWidget {
 public:
-  // update the enum in openbox.i to match this one
   enum WidgetType {
     Type_Frame,
     Type_Titlebar,
@@ -69,4 +68,4 @@ public:
 
 }
 
-#endif // __obwidget_hh
+#endif // __obwidgetbase_hh