some fixes and code regeneration

[wxWidgets.git] / utils / wxPython / src / helpers.cpp

diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp
index 87ec5fbe714a5c4d145b2e3da67a461d918e2fda..a512d7c07ca8af83284d395a6dd588de68d38678 100644 (file)
--- a/utils/wxPython/src/helpers.cpp
+++ b/utils/wxPython/src/helpers.cpp
@@ -10,14 +10,12 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#endif
+#include <stdio.h>  // get the correct definition of NULL

 
 #undef DEBUG
 #include <Python.h>
 #include "helpers.h"
 
 #undef DEBUG
 #include <Python.h>
 #include "helpers.h"

+

 #ifdef __WXMSW__
 #include <wx/msw/private.h>
 #undef FindWindow
 #ifdef __WXMSW__
 #include <wx/msw/private.h>
 #undef FindWindow


@@ -26,7 +24,15 @@
 #undef GetClassInfo
 #undef GetClassName
 #endif
 #undef GetClassInfo
 #undef GetClassName
 #endif

-#include <wx/module.h>
+
+#ifdef __WXGTK__
+#include <gtk/gtk.h>
+#include <gdk/gdkprivate.h>
+#include <wx/gtk/win_gtk.h>
+//#include <gdk/gdk.h>
+//#include <gdk/gdkx.h>
+//#include <gtk/gtkwindow.h>
+#endif

 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------


@@ -74,7 +80,7 @@ wxPyApp::~wxPyApp() {
 
 // This one isn't acutally called...  See __wxStart()
 bool wxPyApp::OnInit(void) {
 
 // This one isn't acutally called...  See __wxStart()
 bool wxPyApp::OnInit(void) {

-    return false;
+    return FALSE;

 }
 
 int  wxPyApp::MainLoop(void) {
 }
 
 int  wxPyApp::MainLoop(void) {


@@ -207,7 +213,7 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args)
     }
     bResult = PyInt_AS_LONG(result);
     if (! bResult) {
     }
     bResult = PyInt_AS_LONG(result);
     if (! bResult) {

-        PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting...");
+        PyErr_SetString(PyExc_SystemExit, "OnInit returned FALSE, exiting...");

         return NULL;
     }
 
         return NULL;
     }
 


@@ -456,7 +462,7 @@ PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) {
 wxPyEvtSelfRef::wxPyEvtSelfRef() {
     //m_self = Py_None;         // **** We don't do normal ref counting to prevent
     //Py_INCREF(m_self);        //      circular loops...
 wxPyEvtSelfRef::wxPyEvtSelfRef() {
     //m_self = Py_None;         // **** We don't do normal ref counting to prevent
     //Py_INCREF(m_self);        //      circular loops...

-    m_cloned = false;
+    m_cloned = FALSE;

 }
 
 wxPyEvtSelfRef::~wxPyEvtSelfRef() {
 }
 
 wxPyEvtSelfRef::~wxPyEvtSelfRef() {


@@ -574,6 +580,25 @@ PyObject* wxPy_ConvertList(wxListBase* list, const char* className) {
     return pyList;
 }
 
     return pyList;
 }
 

+//----------------------------------------------------------------------
+
+long wxPyGetWinHandle(wxWindow* win) {
+#ifdef __WXMSW__
+    return (long)win->GetHandle();
+#endif
+
+    // Find and return the actual X-Window.
+#ifdef __WXGTK__
+    if (win->m_wxwindow) {
+        GdkWindowPrivate* bwin = (GdkWindowPrivate*)GTK_PIZZA(win->m_wxwindow)->bin_window;
+        if (bwin) {
+            return (long)bwin->xwindow;
+        }
+    }
+#endif
+    return 0;
+}
+

 //----------------------------------------------------------------------
 // Some helper functions for typemaps in my_typemaps.i, so they won't be
 // included in every file...
 //----------------------------------------------------------------------
 // Some helper functions for typemaps in my_typemaps.i, so they won't be
 // included in every file...