Commented out constructor causing ambiguity

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

diff --git a/utils/wxPython/src/wxp.i b/utils/wxPython/src/wxp.i
index 530211888a5a28129ff139f215c5d4cd2376fc84..79891c4a94fa911c31059cec0dc620ba739f7a1c 100644 (file)
--- a/utils/wxPython/src/wxp.i
+++ b/utils/wxPython/src/wxp.i
@@ -34,6 +34,8 @@
 %import controls2.i
 %import windows2.i
 %import cmndlgs.i
+%import stattool.i
+%import frames.i
 
 
 
@@ -42,7 +44,7 @@
 
 //---------------------------------------------------------------------------
 
-#define __version__ "0.3.1"
+#define __version__ "0.4.1"
 
 wxPoint     wxPyDefaultPosition;
 wxSize      wxPyDefaultSize;
@@ -107,11 +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 %{
 
+    __wxPreStart();     // initialize the GUI toolkit, if needed.
 
 //    wxPyWindows = new wxHashTable(wxKEY_INTEGER, 100);
 
@@ -127,6 +132,9 @@ extern "C" SWIGEXPORT(void,initcmndlgsc)();
     initcontrolsc();
     initcontrols2c();
     initcmndlgsc();
+    initstattoolc();
+    initframesc();
+
 %}
 
 //----------------------------------------------------------------------
@@ -139,6 +147,16 @@ extern "C" SWIGEXPORT(void,initcmndlgsc)();
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// 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...