X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/853b255a6b035f9448b4ca7e07a453be7bd2f892..ac9390a0bce6c32274c9110b23d9ef4f7eb08dae:/utils/wxPython/src/wxp.i?ds=sidebyside

diff --git a/utils/wxPython/src/wxp.i b/utils/wxPython/src/wxp.i
index d7ea870517..b997b0c89b 100644
--- a/utils/wxPython/src/wxp.i
+++ b/utils/wxPython/src/wxp.i
@@ -1,5 +1,3 @@
-%module wxp
-%{
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wxp.i
 // Purpose:     SWIG interface file for a python wxWindows module
@@ -12,15 +10,10 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifdef __WXMSW__
-#include <windows.h>
-#undef FindWindow
-#undef GetCharWidth
-#undef LoadAccelerators
-#endif
+%module wxp
 
 
+%{
 #include "helpers.h"
 %}
 
@@ -99,29 +92,6 @@ public:
 };
 
 
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-
-
-%{
-#ifdef __WXMSW__             // If building for win32...
-extern HINSTANCE wxhInstance;
-
-BOOL WINAPI DllMain(
-    HINSTANCE   hinstDLL,    // handle to DLL module
-    DWORD       fdwReason,   // reason for calling function
-    LPVOID      lpvReserved  // reserved
-   )
-{
-    wxhInstance = hinstDLL;
-    return 1;
-}
-#endif
-
-%}
-
-
-
 
 //----------------------------------------------------------------------
 // This code gets added to the module initialization function
@@ -141,16 +111,8 @@ extern "C" SWIGEXPORT(void,initcmndlgsc)();
 %}
 
 %init %{
-        // We don't want to run the wxEntry or OnInit yet, so we just do the
-        // beginings of what it would have done...  See __wxStart() for the
-        // rest.
-#ifdef __WXMSW__
-    wxApp::Initialize((WXHINSTANCE)wxhInstance);
-#endif
-#ifdef __WXGTK__
-    wxApp::CommonInit();
-#endif
 
+    __wxPreStart();     // initialize the GUI toolkit, if needed.
 
 //    wxPyWindows = new wxHashTable(wxKEY_INTEGER, 100);
 
@@ -178,6 +140,25 @@ extern "C" SWIGEXPORT(void,initcmndlgsc)();
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.6  1998/08/27 21:59:10  RD
+// Some chicken-and-egg problems solved for wxPython on wxGTK
+//
+// Revision 1.5  1998/08/27 00:00:28  RD
+// - more tweaks
+// - have discovered some problems but not yet discovered solutions...
+//
+// Revision 1.4  1998/08/18 19:48:20  RD
+// more wxGTK compatibility things.
+//
+// It builds now but there are serious runtime problems...
+//
+// Revision 1.3  1998/08/15 07:36:53  RD
+// - Moved the header in the .i files out of the code that gets put into
+// the .cpp files.  It caused CVS conflicts because of the RCS ID being
+// different each time.
+//
+// - A few minor fixes.
+//
 // Revision 1.2  1998/08/14 23:36:49  RD
 // Beginings of wxGTK compatibility
 //