Removing some ifdef's for wxGTK

[wxWidgets.git] / utils / wxPython / src / wxp.i

diff --git a/utils/wxPython/src/wxp.i b/utils/wxPython/src/wxp.i
index f59de249c18f0770cc9d3f3b75bb878cb5f38607..870789e67e2559d9c01187b4c88680db00b92f44 100644 (file)
--- 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"
 %}
 
@@ -41,6 +34,8 @@
 %import controls2.i
 %import windows2.i
 %import cmndlgs.i
+%import stattool.i
+%import frames.i
 
 
 
@@ -49,12 +44,10 @@
 
 //---------------------------------------------------------------------------
 
-#define __version__ "0.3.0"
+#define __version__ "0.4.2"
 
-//%readonly
-    wxPoint     wxPyDefaultPosition;
-    wxSize      wxPyDefaultSize;
-//%readwrite
+wxPoint     wxPyDefaultPosition;
+wxSize      wxPyDefaultSize;
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
@@ -70,7 +63,9 @@ public:
 
 
     wxString GetAppName();
+#ifdef __WXMSW__
     bool GetAuto3D();
+#endif
     wxString GetClassName();
     bool GetExitOnFrameDelete();
     int GetPrintMode();
@@ -84,7 +79,9 @@ public:
     bool Pending();
 
     void SetAppName(const wxString& name);
+#ifdef __WXMSW__
     void SetAuto3D(bool auto3D);
+#endif
     void SetClassName(const wxString& name);
     void SetExitOnFrameDelete(bool flag);
     void SetPrintMode(int mode);
@@ -97,29 +94,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
@@ -135,20 +109,14 @@ extern "C" SWIGEXPORT(void,initmdic)();
 extern "C" SWIGEXPORT(void,initcontrolsc)();
 extern "C" SWIGEXPORT(void,initcontrols2c)();
 extern "C" SWIGEXPORT(void,initcmndlgsc)();
+extern "C" SWIGEXPORT(void,initstattoolc)();
+extern "C" SWIGEXPORT(void,initframesc)();
 
 %}
 
 %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);
 
@@ -164,6 +132,9 @@ extern "C" SWIGEXPORT(void,initcmndlgsc)();
     initcontrolsc();
     initcontrols2c();
     initcmndlgsc();
+    initstattoolc();
+    initframesc();
+
 %}
 
 //----------------------------------------------------------------------
@@ -176,6 +147,38 @@ extern "C" SWIGEXPORT(void,initcmndlgsc)();
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.9  1998/10/20 07:38:04  RD
+// bug fix
+//
+// Revision 1.8  1998/10/07 07:34:35  RD
+// Version 0.4.1 for wxGTK
+//
+// Revision 1.7  1998/10/02 06:40:44  RD
+//
+// Version 0.4 of wxPython for MSW.
+//
+// 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
+//
 // Revision 1.1  1998/08/09 08:25:53  RD
 // Initial version
 //