X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fotk.i;h=148ff0c2b2ed7d9a5514f9698e1a4109045869ae;hb=bc88d310fea71823fb2c61d071ff499579bffaba;hp=9fcd5b6cb89a65437f910d94e44e8202316bacfb;hpb=5869cc29ef15181427e65079d9a52c5d21190206;p=chaz%2Fopenbox

diff --git a/otk/otk.i b/otk/otk.i
index 9fcd5b6c..148ff0c2 100644
--- a/otk/otk.i
+++ b/otk/otk.i
@@ -7,38 +7,17 @@
 #  include "../config.h"
 #endif
 
-#include "application.hh"
-#include "appwidget.hh"
-#include "assassin.hh"
-#include "button.hh"
-#include "color.hh"
-#include "configuration.hh"
-#include "display.hh"
-#include "eventdispatcher.hh"
-#include "eventhandler.hh"
-#include "focuslabel.hh"
-#include "focuswidget.hh"
-#include "font.hh"
-#include "gccache.hh"
-#include "image.hh"
-#include "label.hh"
-#include "point.hh"
-#include "property.hh"
-#include "rect.hh"
-#include "screeninfo.hh"
-#include "strut.hh"
-#include "style.hh"
-#include "texture.hh"
-#include "timer.hh"
-#include "timerqueue.hh"
-#include "timerqueuemanager.hh"
-#include "util.hh"
-#include "widget.hh"
+#include "otk.hh"
 %}
 
-%include stl.i
+%include "stl.i"
 //%include std_list.i
 
+%ignore otk::OBDisplay::display;
+%inline %{
+  Display *OBDisplay_display() { return otk::OBDisplay::display; }
+%};
+
 namespace otk {
 %rename(setValue_bool) Configuration::setValue(std::string const &,bool);
 %rename(setValue_unsigned) Configuration::setValue(const std::string &, unsigned int);
@@ -50,6 +29,26 @@ namespace otk {
 %rename(itostring_unsigned) itostring(unsigned int);
 %rename(itostring_long) itostring(long);
 %rename(itostring_unsigned_long) itostring(unsigned long);
+
+// these are needed for guile, but not needed for python!
+%rename(equals) BColor::operator==;
+%rename(equals) Rect::operator==;
+%rename(equals) BTexture::operator==;
+%ignore BColor::operator!=;
+%ignore BTexture::operator!=;
+%ignore Rect::operator!=;
+%ignore Rect::operator|;
+%ignore Rect::operator|=;
+%ignore Rect::operator&;
+%ignore Rect::operator&=;
+%ignore OBTimer::operator<;
+%ignore TimerLessThan;
+
+/*
+%rename(set_multi) OtkProperty::set(Window, Atoms, Atoms, unsigned long[], int);
+%rename(set_string) OtkProperty::set(Window, Atoms, StringType, const std::string &);
+%rename(set_string_multi) OtkProperty::set(Window, Atoms, StringType, const StringVect &);
+*/
 }
 
 %include "eventdispatcher.hh"
@@ -79,3 +78,7 @@ namespace otk {
 %include "timerqueue.hh"
 %include "timerqueuemanager.hh"
 %include "util.hh"
+%include "widget.hh"
+
+// for Mod1Mask etc
+%include "X11/X.h"