SWIGged updates for wxGTK

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

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index 72f84096ac7043aecd26c66a052b6aa1aa71f2e0..bc9dab80718d2c307b2521ef10f7ace055eb31e8 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -10,7 +10,6 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#include <stdio.h>  // get the correct definition of NULL

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


@@ -29,7 +28,6 @@
 #include <wx/gtk/win_gtk.h>
 #endif
 
 #include <wx/gtk/win_gtk.h>
 #endif
 

-

 //----------------------------------------------------------------------
 
 #if PYTHON_API_VERSION <= 1007 && wxUSE_UNICODE
 //----------------------------------------------------------------------
 
 #if PYTHON_API_VERSION <= 1007 && wxUSE_UNICODE


@@ -94,11 +92,10 @@ BOOL WINAPI DllMain(
 
 
 wxPyApp::wxPyApp() {
 
 
 wxPyApp::wxPyApp() {

-//    printf("**** ctor\n");
+    SetUseBestVisual(TRUE);

 }
 
 wxPyApp::~wxPyApp() {
 }
 
 wxPyApp::~wxPyApp() {

-//    printf("**** dtor\n");

 }
 
 
 }
 
 


@@ -182,6 +179,8 @@ void __wxPreStart()
     wxPyTMutex = new wxMutex;
 #endif
 
     wxPyTMutex = new wxMutex;
 #endif
 

+    wxApp::CheckBuildOptions(wxBuildOptions());
+

     // Bail out if there is already a wxApp created.  This means that the
     // toolkit has already been initialized, as in embedding wxPython in
     // a C++ wxWindows app, so we don't need to call wxEntryStart.
     // Bail out if there is already a wxApp created.  This means that the
     // toolkit has already been initialized, as in embedding wxPython in
     // a C++ wxWindows app, so we don't need to call wxEntryStart.


@@ -226,13 +225,6 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args)
     if (!PyArg_ParseTuple(args, "O", &onInitFunc))
         return NULL;
 
     if (!PyArg_ParseTuple(args, "O", &onInitFunc))
         return NULL;
 

-#if 0  // Try it out without this check, see how it does...
-    if (wxTopLevelWindows.Number() > 0) {
-        PyErr_SetString(PyExc_TypeError, "Only 1 wxApp per process!");
-        return NULL;
-    }
-#endif
-

     // This is the next part of the wxEntry functionality...
     int argc = 0;
     wxChar** argv = NULL;
     // This is the next part of the wxEntry functionality...
     int argc = 0;
     wxChar** argv = NULL;


@@ -641,8 +633,9 @@ void wxPyBeginBlockThreads() {
 
 void wxPyEndBlockThreads() {
 #ifdef WXP_WITH_THREAD
 
 void wxPyEndBlockThreads() {
 #ifdef WXP_WITH_THREAD

-    PyThreadState* tstate = PyEval_SaveThread();

     // Is there any need to save it again?
     // Is there any need to save it again?

+    // PyThreadState* tstate =
+    PyEval_SaveThread();

 #endif
 }
 
 #endif
 }