X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fotk_wrap.cc;h=4788f234aa407e7b7d4bfb4d41baf6c3d2bf6a81;hb=bc88d310fea71823fb2c61d071ff499579bffaba;hp=8acf2c99db75082b2a6aa196183df8000e621045;hpb=4c768d5d63154e416e1282396dc48492d0585d42;p=chaz%2Fopenbox

diff --git a/otk/otk_wrap.cc b/otk/otk_wrap.cc
index 8acf2c99..4788f234 100644
--- a/otk/otk_wrap.cc
+++ b/otk/otk_wrap.cc
@@ -741,33 +741,7 @@ static swig_type_info *swig_types[81];
 #  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"
 
 
 #define  SWIG_MemoryError    1
@@ -5481,6 +5455,34 @@ static PyObject *_wrap_OBDisplay_findScreen(PyObject *self, PyObject *args) {
 }
 
 
+static PyObject *_wrap_OBDisplay_xkb(PyObject *self, PyObject *args) {
+    PyObject *resultobj;
+    bool result;
+    
+    if(!PyArg_ParseTuple(args,(char *)":OBDisplay_xkb")) goto fail;
+    result = (bool)otk::OBDisplay::xkb();
+    
+    resultobj = PyInt_FromLong((long)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_OBDisplay_xkbEventBase(PyObject *self, PyObject *args) {
+    PyObject *resultobj;
+    int result;
+    
+    if(!PyArg_ParseTuple(args,(char *)":OBDisplay_xkbEventBase")) goto fail;
+    result = (int)otk::OBDisplay::xkbEventBase();
+    
+    resultobj = PyInt_FromLong((long)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_OBDisplay_shape(PyObject *self, PyObject *args) {
     PyObject *resultobj;
     bool result;
@@ -12501,11 +12503,17 @@ static PyObject *_wrap_delete_OBTimerQueueManager(PyObject *self, PyObject *args
 static PyObject *_wrap_OBTimerQueueManager_fire(PyObject *self, PyObject *args) {
     PyObject *resultobj;
     otk::OBTimerQueueManager *arg1 = (otk::OBTimerQueueManager *) 0 ;
+    bool arg2 = (bool) true ;
     PyObject * obj0  = 0 ;
+    PyObject * obj1  = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"O:OBTimerQueueManager_fire",&obj0)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"O|O:OBTimerQueueManager_fire",&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OBTimerQueueManager,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    (arg1)->fire();
+    if (obj1) {
+        arg2 = (bool) PyInt_AsLong(obj1);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    (arg1)->fire(arg2);
     
     Py_INCREF(Py_None); resultobj = Py_None;
     return resultobj;
@@ -12954,6 +12962,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"OBDisplay_gcCache", _wrap_OBDisplay_gcCache, METH_VARARGS },
 	 { (char *)"OBDisplay_screenInfo", _wrap_OBDisplay_screenInfo, METH_VARARGS },
 	 { (char *)"OBDisplay_findScreen", _wrap_OBDisplay_findScreen, METH_VARARGS },
+	 { (char *)"OBDisplay_xkb", _wrap_OBDisplay_xkb, METH_VARARGS },
+	 { (char *)"OBDisplay_xkbEventBase", _wrap_OBDisplay_xkbEventBase, METH_VARARGS },
 	 { (char *)"OBDisplay_shape", _wrap_OBDisplay_shape, METH_VARARGS },
 	 { (char *)"OBDisplay_shapeEventBase", _wrap_OBDisplay_shapeEventBase, METH_VARARGS },
 	 { (char *)"OBDisplay_xinerama", _wrap_OBDisplay_xinerama, METH_VARARGS },