OGL fixes for wxMotif; added Set/GetClientData to wxMenu in wxMSW/wxMotif/wxStubs.

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

diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp
index 6649ed56c88aa00b5524020f72df2eeaedac9a82..03adda6634e202cae9049d2afc5bbc8c176c4d5b 100644 (file)
--- a/utils/wxPython/src/helpers.cpp
+++ b/utils/wxPython/src/helpers.cpp
@@ -22,7 +22,7 @@
 #include "helpers.h"
 
 #ifdef __WXGTK__
 #include "helpers.h"
 
 #ifdef __WXGTK__

-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB

 #include "gdk_imlib/gdk_imlib.h"
 #endif
 #endif
 #include "gdk_imlib/gdk_imlib.h"
 #endif
 #endif


@@ -44,6 +44,7 @@ extern HINSTANCE wxhInstance;
 //----------------------------------------------------------------------
 // This gets run when the DLL is loaded.  We just need to save a handle.
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 // This gets run when the DLL is loaded.  We just need to save a handle.
 //----------------------------------------------------------------------

+

 BOOL WINAPI DllMain(
     HINSTANCE   hinstDLL,    // handle to DLL module
     DWORD       fdwReason,   // reason for calling function
 BOOL WINAPI DllMain(
     HINSTANCE   hinstDLL,    // handle to DLL module
     DWORD       fdwReason,   // reason for calling function


@@ -112,7 +113,7 @@ void wxPyApp::AfterMainLoop(void) {
 
 
 // This is where we pick up the first part of the wxEntry functionality...
 
 
 // This is where we pick up the first part of the wxEntry functionality...

-// The rest is in __wxStart and  AfterMainLoop.  Thi function is called when
+// The rest is in __wxStart and  AfterMainLoop.  This function is called when

 // wxpc is imported.  (Before there is a wxApp object.)
 void __wxPreStart()
 {
 // wxpc is imported.  (Before there is a wxApp object.)
 void __wxPreStart()
 {


@@ -123,7 +124,7 @@ void __wxPreStart()
         return;
 
 #ifdef __WXMSW__
         return;
 
 #ifdef __WXMSW__

-    wxApp::Initialize((WXHINSTANCE)wxhInstance);
+    wxApp::Initialize();

 #endif
 #ifdef __WXGTK__
     wxClassInfo::InitializeClasses();
 #endif
 #ifdef __WXGTK__
     wxClassInfo::InitializeClasses();


@@ -139,7 +140,7 @@ void __wxPreStart()
     gtk_init( &argc, &argv );
     delete [] argv;
 
     gtk_init( &argc, &argv );
     delete [] argv;
 

-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB

     gdk_imlib_init();
     gtk_widget_push_visual(gdk_imlib_get_visual());
     gtk_widget_push_colormap(gdk_imlib_get_colormap());
     gdk_imlib_init();
     gtk_widget_push_visual(gdk_imlib_get_visual());
     gtk_widget_push_colormap(gdk_imlib_get_colormap());


@@ -256,7 +257,7 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
 static
 PyObject* wxPyConstructObject(void* ptr, char* className)
 {
 static
 PyObject* wxPyConstructObject(void* ptr, char* className)
 {

-    char    buff[64];               // should be big enough...
+    char    buff[64];               // should always be big enough...

     char    swigptr[64];
 
     sprintf(buff, "_%s_p", className);
     char    swigptr[64];
 
     sprintf(buff, "_%s_p", className);


@@ -290,7 +291,6 @@ void wxPyCallback::EventThunker(wxEvent& event) {
     tuple = PyTuple_New(1);
     PyTuple_SET_ITEM(tuple, 0, arg);
     result = PyEval_CallObject(func, tuple);
     tuple = PyTuple_New(1);
     PyTuple_SET_ITEM(tuple, 0, arg);
     result = PyEval_CallObject(func, tuple);

-    Py_DECREF(arg);

     Py_DECREF(tuple);
     if (result) {
         Py_DECREF(result);
     Py_DECREF(tuple);
     if (result) {
         Py_DECREF(result);


@@ -328,12 +328,12 @@ void wxPyMenu::MenuCallback(wxMenu& menu, wxCommandEvent& evt) {
     }
     // Now call the callback...
     PyObject* func = ((wxPyMenu*)&menu)->func;
     }
     // Now call the callback...
     PyObject* func = ((wxPyMenu*)&menu)->func;

-    PyObject* args = Py_BuildValue("(OO)", menuobj, evtobj);
+    PyObject* args = PyTuple_New(2);
+    PyTuple_SET_ITEM(args, 0, menuobj);
+    PyTuple_SET_ITEM(args, 1, evtobj);

     PyObject* res  = PyEval_CallObject(func, args);
     Py_DECREF(args);
     PyObject* res  = PyEval_CallObject(func, args);
     Py_DECREF(args);

-    Py_DECREF(res);
-    Py_DECREF(evtobj);
-    Py_DECREF(menuobj);
+    Py_XDECREF(res); /* In case res is a NULL pointer */

 }
 
 
 }
 
 


@@ -364,7 +364,6 @@ void wxPyTimer::Notify() {
 
 
 
 
 
 

-

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


@@ -651,6 +650,23 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.12  1998/11/03 09:21:08  RD
+// fixed a typo
+//
+// Revision 1.11  1998/10/20 06:43:58  RD
+// New wxTreeCtrl wrappers (untested)
+// some changes in helpers
+// etc.
+//
+// Revision 1.10  1998/10/02 06:40:39  RD
+//
+// Version 0.4 of wxPython for MSW.
+//
+// Revision 1.9  1998/09/25 13:28:52  VZ
+//
+// USE_xxx constants renamed to wxUSE_xxx. This is an incompatible change, you
+// must recompile everything after upgrading!
+//

 // Revision 1.8  1998/08/27 21:59:08  RD
 // Some chicken-and-egg problems solved for wxPython on wxGTK
 //
 // Revision 1.8  1998/08/27 21:59:08  RD
 // Some chicken-and-egg problems solved for wxPython on wxGTK
 //