X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.i;h=b3d1a9ed725650c70954521d4273298662011feb;hb=d22a6c6c04cf20bd23efa68ad1202f278f25e113;hp=59dbecdd20bc32396eb381e5a9597fbbe17e6903;hpb=9e77a88d269bfafb78e56a646bfacebdd6ff4c5a;p=chaz%2Fopenbox

diff --git a/src/openbox.i b/src/openbox.i
index 59dbecdd..b3d1a9ed 100644
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -1,12 +1,13 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-%module openbox
+%module ob
 
 %{
 #ifdef HAVE_CONFIG_H
 #  include "../config.h"
 #endif
 
+#include "frame.hh"
 #include "openbox.hh"
 #include "screen.hh"
 #include "client.hh"
@@ -90,6 +91,8 @@ void python_callback(PyObject *func, KeyData *data)
 }
 %}
 
+#ignore ob::openbox;
+
 %ignore ob::Screen::clients;
 %{
   #include <iterator>
@@ -107,12 +110,18 @@ void python_callback(PyObject *func, KeyData *data)
   }
 };
 
-%ignore otk::Display::display;
+/*
+%include "../otk/ustring.i"
+
+%ignore otk::display;
 %inline %{
-  Display *Display_display() { return otk::Display::display; }
+  otk::Display *Display_instance() { return otk::display; }
 %};
 
-%include "../otk/ustring.i"
+%ignore otk::Property::atoms;
+%inline %{
+  const otk::Atoms& Property_atoms() { return otk::Property::atoms; }
+%};
 
 %include "../otk/display.hh"
 %include "../otk/point.hh"
@@ -124,12 +133,17 @@ void python_callback(PyObject *func, KeyData *data)
 %include "../otk/eventhandler.hh"
 %include "../otk/eventdispatcher.hh"
 
+%import "../otk/widget.hh"
+*/
+%import "../otk/otk.i"
+
 %import "widgetbase.hh"
 %import "actions.hh"
 
 %include "openbox.hh"
 %include "screen.hh"
 %include "client.hh"
+%include "frame.hh"
 %include "python.hh"
 
 // for Mod1Mask etc