Did splitting of wxEntry for wxMSW. Not nearly as complex as wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/wxPython/src/helpers.cpp

@@ -105,9 +105,9 @@ int  wxPyApp::MainLoop(void) {
 //---------------------------------------------------------------------
 //----------------------------------------------------------------------
 
-int wxEntryStart( int argc, char *argv[] );
-int wxEntryInitGui();
-void wxEntryCleanup();
+int  WXDLLEXPORT wxEntryStart( int argc, char** argv );
+int  WXDLLEXPORT wxEntryInitGui();
+void WXDLLEXPORT wxEntryCleanup();
 
 
 // This is where we pick up the first part of the wxEntry functionality...
@@ -125,55 +125,6 @@ void __wxPreStart()
     if (wxTopLevelWindows.Number() > 0)
         return;
 
-#if 0
-
-#ifdef __WXMSW__
-    wxApp::Initialize();
-#endif
-
-#ifdef __WXGTK__
-    PyObject* sysargv = PySys_GetObject("argv");
-    int argc = PyList_Size(sysargv);
-    char** argv = new char*[argc+1];
-    int x;
-    for(x=0; x<argc; x++)
-        argv[x] = PyString_AsString(PyList_GetItem(sysargv, x));
-    argv[argc] = NULL;
-
-#if wxUSE_THREADS
-    /* GTK 1.2 up to version 1.2.3 has broken threads */
-    if ((gtk_major_version == 1) &&
-        (gtk_minor_version == 2) &&
-        (gtk_micro_version < 4))
-    {
-        printf( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" );
-    }
-    else
-    {
-        g_thread_init(NULL);
-    }
-#endif
-
-    gtk_set_locale();
-
-#if wxUSE_WCHAR_T
-    if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
-#else
-    if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
-#endif
-
-    gdk_threads_enter();
-    gtk_init( &argc, &argv );
-    wxSetDetectableAutoRepeat( TRUE );
-    delete [] argv;
-
-    if (!wxApp::Initialize())
-    {
-        gdk_threads_leave();
-    }
-#endif
-#endif // 0
-
 
     PyObject* sysargv = PySys_GetObject("argv");
     int argc = PyList_Size(sysargv);

utils/wxPython/src/msw/wx.cpp

@@ -615,7 +615,7 @@ PyObject *ptrfree(PyObject *_PTRVALUE) {
 
 
     void wxApp_CleanUp() {
-        wxApp::CleanUp();
+        __wxCleanup();
     }
 
 extern "C" SWIGEXPORT(void) initwindowsc();