* Added IsPaused() to wxSoundFileStream

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

diff --git a/utils/wxPython/src/wx.i b/utils/wxPython/src/wx.i
index d266695535400b29d9d31c70dda67c7a15934751..70535f3d1e7125d77e9122c25af8b888ddcac4ad 100644 (file)
--- a/utils/wxPython/src/wx.i
+++ b/utils/wxPython/src/wx.i
@@ -42,6 +42,7 @@
 %import windows3.i
 %import image.i
 %import printfw.i
 %import windows3.i
 %import image.i
 %import printfw.i

+%import sizers.i

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


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

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

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


@@ -102,28 +104,14 @@ public:
 
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------

-// 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
+// this is used to cleanup after wxWindows when Python shuts down.

 
 

-%{
-class __wxPyCleanup {
-public:
-    __wxPyCleanup()  { }
-    ~__wxPyCleanup() { wxApp::CleanUp(); }
-};
+%inline %{
+    void wxApp_CleanUp() {
+        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
 //----------------------------------------------------------------------


@@ -144,11 +132,8 @@ extern "C" SWIGEXPORT(void) initframesc();
 extern "C" SWIGEXPORT(void) initwindows3c();
 extern "C" SWIGEXPORT(void) initimagec();
 extern "C" SWIGEXPORT(void) initprintfwc();
 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) initoglc();
-extern "C" SWIGEXPORT(void) initglcanvasc();
-#endif
+extern "C" SWIGEXPORT(void) initsizersc();
+extern "C" SWIGEXPORT(void) initclip_dndc();

 %}
 
 
 %}
 
 


@@ -176,13 +161,8 @@ extern "C" SWIGEXPORT(void) initglcanvasc();
     initwindows3c();
     initimagec();
     initprintfwc();
     initwindows3c();
     initimagec();
     initprintfwc();

-#ifndef SEPARATE
-    initutilsc();
-//    initoglc();
-#ifdef WITH_GLCANVAS
-    initglcanvasc();
-#endif
-#endif
+    initsizersc();
+    initclip_dndc();

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