Made db.h compile (removed this wxODBC_ONLY_FARWRD_XXXXXX),

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

diff --git a/utils/wxPython/src/wx.i b/utils/wxPython/src/wx.i
index b504eff89c5d9f6db86f330925f4468beeb08b6b..70535f3d1e7125d77e9122c25af8b888ddcac4ad 100644 (file)
--- a/utils/wxPython/src/wx.i
+++ b/utils/wxPython/src/wx.i
@@ -25,6 +25,8 @@
 %include my_typemaps.i
 %include _defs.i
 
+%include pointer.i
+
 %import misc.i
 %import misc2.i
 %import windows.i
@@ -40,6 +42,7 @@
 %import windows3.i
 %import image.i
 %import printfw.i
+%import sizers.i
 
 
 %native(_wxStart)           __wxStart;
@@ -47,7 +50,8 @@
 
 //---------------------------------------------------------------------------
 
-#define __version__ "2.1b1"
+
+#define __version__ "0.0.0"   // The real value is now in build.py...
 
 wxPoint     wxPyDefaultPosition;
 wxSize      wxPyDefaultSize;
@@ -64,6 +68,7 @@ public:
         }
     }
 
+    ~wxPyApp();
 
     wxString GetAppName();
 #ifdef __WXMSW__
@@ -80,6 +85,7 @@ public:
     bool Initialized();
     int  MainLoop();
     bool Pending();
+    bool ProcessIdle();
 
     void SetAppName(const wxString& name);
 #ifdef __WXMSW__
@@ -91,37 +97,43 @@ public:
     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);
+
+
 };
 
 
+//----------------------------------------------------------------------
+// this is used to cleanup after wxWindows when Python shuts down.
+
+%inline %{
+    void wxApp_CleanUp() {
+        wxApp::CleanUp();
+    }
+%}
 
 //----------------------------------------------------------------------
 // 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,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)();
-#ifndef SEPARATE
-extern "C" SWIGEXPORT(void,initutilsc)();
-extern "C" SWIGEXPORT(void,initglcanvasc)();
-#endif
+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();
+extern "C" SWIGEXPORT(void) initclip_dndc();
 %}
 
 
@@ -130,7 +142,6 @@ extern "C" SWIGEXPORT(void,initglcanvasc)();
 
     __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,
@@ -150,12 +161,8 @@ extern "C" SWIGEXPORT(void,initglcanvasc)();
     initwindows3c();
     initimagec();
     initprintfwc();
-#ifndef SEPARATE
-    initutilsc();
-#ifdef WITH_GLCANVAS
-    initglcanvasc();
-#endif
-#endif
+    initsizersc();
+    initclip_dndc();
 %}
 
 //----------------------------------------------------------------------