incremented wxPython version number

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

diff --git a/utils/wxPython/src/wx.i b/utils/wxPython/src/wx.i
index cedd7db22d524ca3da0568d1a8fd80cb147ca2c5..256489467e5addbbd4c0d2e4236a01fc7792ea4b 100644 (file)
--- a/utils/wxPython/src/wx.i
+++ b/utils/wxPython/src/wx.i
@@ -25,7 +25,10 @@
 %include my_typemaps.i
 %include _defs.i
 
 %include my_typemaps.i
 %include _defs.i
 

+%include pointer.i
+

 %import misc.i
 %import misc.i

+%import misc2.i

 %import windows.i
 %import events.i
 %import gdi.i
 %import windows.i
 %import events.i
 %import gdi.i


@@ -36,9 +39,10 @@
 %import cmndlgs.i
 %import stattool.i
 %import frames.i
 %import cmndlgs.i
 %import stattool.i
 %import frames.i

-#ifndef SEPARATE
-%import utils.i
-#endif
+%import windows3.i
+%import image.i
+%import printfw.i
+%import sizers.i

 
 
 %native(_wxStart)           __wxStart;
 
 
 %native(_wxStart)           __wxStart;


@@ -46,7 +50,8 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-#define __version__ "0.5.2"
+
+#define __version__ "0.0.0"   // The real value is in build.py...

 
 wxPoint     wxPyDefaultPosition;
 wxSize      wxPyDefaultSize;
 
 wxPoint     wxPyDefaultPosition;
 wxSize      wxPyDefaultSize;


@@ -63,6 +68,7 @@ public:
         }
     }
 
         }
     }
 

+    ~wxPyApp();

 
     wxString GetAppName();
 #ifdef __WXMSW__
 
     wxString GetAppName();
 #ifdef __WXMSW__


@@ -79,6 +85,7 @@ public:
     bool Initialized();
     int  MainLoop();
     bool Pending();
     bool Initialized();
     int  MainLoop();
     bool Pending();

+    bool ProcessIdle();

 
     void SetAppName(const wxString& name);
 #ifdef __WXMSW__
 
     void SetAppName(const wxString& name);
 #ifdef __WXMSW__


@@ -90,38 +97,63 @@ public:
     void SetTopWindow(wxWindow* window);
     void SetVendorName(const wxString& name);
 
     void SetTopWindow(wxWindow* window);
     void SetVendorName(const wxString& name);
 

-    // This one is wxPython specific.  If you override MainLoop,
-    // call this when done.
-    void AfterMainLoop();
+    wxIcon GetStdIcon(int which);
+
+

 };
 
 
 };
 
 

+//----------------------------------------------------------------------
+// An instance of this object is created in the main wx module.  As long
+// as there are no extra references to it then when the wx module is being
+// unloaded from memory then this object's destructor will be called. When
+// it is then we'll use that as a signal to clean up wxWindows
+
+%{
+class __wxPyCleanup {
+public:
+    __wxPyCleanup()  { }
+    ~__wxPyCleanup() { wxApp::CleanUp(); }
+};
+%}
+
+// now to swigify it...
+class __wxPyCleanup {
+public:
+    __wxPyCleanup();
+    ~__wxPyCleanup();
+};
+

 
 //----------------------------------------------------------------------
 // This code gets added to the module initialization function
 //----------------------------------------------------------------------
 
 %{
 
 //----------------------------------------------------------------------
 // This code gets added to the module initialization function
 //----------------------------------------------------------------------
 
 %{

-extern "C" SWIGEXPORT(void,initwindowsc)();
-extern "C" SWIGEXPORT(void,initwindows2c)();
-extern "C" SWIGEXPORT(void,initeventsc)();
-extern "C" SWIGEXPORT(void,initmiscc)();
-extern "C" SWIGEXPORT(void,initgdic)();
-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)();
-extern "C" SWIGEXPORT(void,initutilsc)();
-
+extern "C" SWIGEXPORT(void) initwindowsc();
+extern "C" SWIGEXPORT(void) initwindows2c();
+extern "C" SWIGEXPORT(void) initeventsc();
+extern "C" SWIGEXPORT(void) initmiscc();
+extern "C" SWIGEXPORT(void) initmisc2c();
+extern "C" SWIGEXPORT(void) initgdic();
+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();
+extern "C" SWIGEXPORT(void) initwindows3c();
+extern "C" SWIGEXPORT(void) initimagec();
+extern "C" SWIGEXPORT(void) initprintfwc();
+extern "C" SWIGEXPORT(void) initsizersc();

 %}
 
 %}
 

+
+

 %init %{
 
     __wxPreStart();     // initialize the GUI toolkit, if needed.
 
 %init %{
 
     __wxPreStart();     // initialize the GUI toolkit, if needed.
 

-//    wxPyWindows = new wxHashTable(wxKEY_INTEGER, 100);

 
         // Since these modules are all linked together, initialize them now
         // because python won't be able to find their shared library files,
 
         // Since these modules are all linked together, initialize them now
         // because python won't be able to find their shared library files,


@@ -130,6 +162,7 @@ extern "C" SWIGEXPORT(void,initutilsc)();
     initwindows2c();
     initeventsc();
     initmiscc();
     initwindows2c();
     initeventsc();
     initmiscc();

+    initmisc2c();

     initgdic();
     initmdic();
     initcontrolsc();
     initgdic();
     initmdic();
     initcontrolsc();


@@ -137,9 +170,10 @@ extern "C" SWIGEXPORT(void,initutilsc)();
     initcmndlgsc();
     initstattoolc();
     initframesc();
     initcmndlgsc();
     initstattoolc();
     initframesc();

-#ifndef SEPARATE
-    initutilsc();
-#endif
+    initwindows3c();
+    initimagec();
+    initprintfwc();
+    initsizersc();

 %}
 
 //----------------------------------------------------------------------
 %}
 
 //----------------------------------------------------------------------


@@ -149,72 +183,3 @@ extern "C" SWIGEXPORT(void,initutilsc)();
 %pragma(python) include="_extras.py";
 
 
 %pragma(python) include="_extras.py";
 
 

-/////////////////////////////////////////////////////////////////////////////
-//
-// $Log$
-// Revision 1.3  1998/12/17 17:52:21  RD
-// wxPython 0.5.2
-// Minor fixes and SWIG code generation for RR's changes.  MSW and GTK
-// versions are much closer now!
-//
-// Revision 1.2  1998/12/16 22:10:57  RD
-//
-// Tweaks needed to be able to build wxPython with wxGTK.
-//
-// Revision 1.1  1998/12/15 20:41:27  RD
-// Changed the import semantics from "from wxPython import *" to "from
-// wxPython.wx import *"  This is for people who are worried about
-// namespace pollution, they can use "from wxPython import wx" and then
-// prefix all the wxPython identifiers with "wx."
-//
-// Added wxTaskbarIcon for wxMSW.
-//
-// Made the events work for wxGrid.
-//
-// Added wxConfig.
-//
-// Added wxMiniFrame for wxGTK, (untested.)
-//
-// Changed many of the args and return values that were pointers to gdi
-// objects to references to reflect changes in the wxWindows API.
-//
-// Other assorted fixes and additions.
-//
-// 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
-//
-//
-
-