use specific linker flags under Mac OS X when linking executables against the

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

diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i
index 0f7cd3012ef8cf19c35ac636562afa01b1444253..010621f4fa97666e0c7b07ebef69e5d2ee7148b6 100644 (file)
--- a/wxPython/src/wx.i
+++ b/wxPython/src/wx.i
@@ -45,6 +45,9 @@
 %import sizers.i
 %import streams.i
 %import filesys.i
 %import sizers.i
 %import streams.i
 %import filesys.i

+%import utils.i
+%import fonts.i
+

 
 %native(_wxStart)           __wxStart;
 %native(_wxSetDictionary)   __wxSetDictionary;
 
 %native(_wxStart)           __wxStart;
 %native(_wxSetDictionary)   __wxSetDictionary;


@@ -101,17 +104,17 @@ public:
     void SetTopWindow(wxWindow* window);
     void SetVendorName(const wxString& name);
     void SetUseBestVisual(bool flag);
     void SetTopWindow(wxWindow* window);
     void SetVendorName(const wxString& name);
     void SetUseBestVisual(bool flag);

-    wxIcon GetStdIcon(int which);
-
-

 };
 
 %inline %{
     wxPyApp* wxGetApp() {
 };
 
 %inline %{
     wxPyApp* wxGetApp() {

-        return wxPythonApp;
+        //return wxPythonApp;
+        return (wxPyApp*)wxGetApp();

     }
 %}
 
     }
 %}
 

+
+

 //----------------------------------------------------------------------
 // this is used to cleanup after wxWindows when Python shuts down.
 
 //----------------------------------------------------------------------
 // this is used to cleanup after wxWindows when Python shuts down.
 


@@ -147,6 +150,8 @@ extern "C" SWIGEXPORT(void) initsizersc();
 extern "C" SWIGEXPORT(void) initclip_dndc();
 extern "C" SWIGEXPORT(void) initstreamsc();
 extern "C" SWIGEXPORT(void) initfilesysc();
 extern "C" SWIGEXPORT(void) initclip_dndc();
 extern "C" SWIGEXPORT(void) initstreamsc();
 extern "C" SWIGEXPORT(void) initfilesysc();

+extern "C" SWIGEXPORT(void) initutilsc();
+extern "C" SWIGEXPORT(void) initfontsc();

 
 
 
 
 
 


@@ -161,11 +166,18 @@ static wxPyCoreAPI API = {
     SWIG_addvarlink,
     SWIG_newvarlink,
 
     SWIG_addvarlink,
     SWIG_newvarlink,
 

-    wxPySaveThread,
-    wxPyRestoreThread,
+    wxPyBeginAllowThreads,
+    wxPyEndAllowThreads,
+    wxPyBeginBlockThreads,
+    wxPyEndBlockThreads,
+

     wxPyConstructObject,
     wxPy_ConvertList,
 
     wxPyConstructObject,
     wxPy_ConvertList,
 

+    wxString_in_helper,
+    Py2wxString,
+    wx2PyString,
+

     byte_LIST_helper,
     int_LIST_helper,
     long_LIST_helper,
     byte_LIST_helper,
     int_LIST_helper,
     long_LIST_helper,


@@ -181,13 +193,25 @@ static wxPyCoreAPI API = {
     wxRect_helper,
     wxColour_helper,
 
     wxRect_helper,
     wxColour_helper,
 

-    wxPyCBH_setSelf,
+    wxPyCBH_setCallbackInfo,

     wxPyCBH_findCallback,
     wxPyCBH_callCallback,
     wxPyCBH_callCallbackObj,
     wxPyCBH_delete,
     wxPyCBH_findCallback,
     wxPyCBH_callCallback,
     wxPyCBH_callCallbackObj,
     wxPyCBH_delete,

+
+    wxPyClassExists,
+    wxPyMake_wxObject,
+    wxPyMake_wxSizer,
+    wxPyPtrTypeMap_Add,
+    wxArrayString2PyList_helper,
+    wxArrayInt2PyList_helper,
+
+    wxPyClientData_dtor,
+    wxPyUserData_dtor,
+    wxPyOORClientData_dtor

 };
 
 };
 

+

 %}
 
 
 %}
 
 


@@ -225,6 +249,21 @@ static wxPyCoreAPI API = {
     initclip_dndc();
     initstreamsc();
     initfilesysc();
     initclip_dndc();
     initstreamsc();
     initfilesysc();

+    initutilsc();
+    initfontsc();
+
+
+    PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long)wxMAJOR_VERSION ));
+    PyDict_SetItemString(d,"wxMINOR_VERSION", PyInt_FromLong((long)wxMINOR_VERSION ));
+    PyDict_SetItemString(d,"wxRELEASE_NUMBER", PyInt_FromLong((long)wxRELEASE_NUMBER ));
+    PyDict_SetItemString(d,"wxVERSION_NUMBER", PyInt_FromLong((long)wxVERSION_NUMBER ));
+#if wxUSE_UNICODE
+    wxString tempStr(wxVERSION_STRING);
+    PyDict_SetItemString(d,"wxVERSION_STRING", PyUnicode_FromUnicode(tempStr.c_str(), tempStr.Len()));
+#else
+    PyDict_SetItemString(d,"wxVERSION_STRING", PyString_FromString(wxVERSION_STRING));
+#endif
+

 
 %}
 
 
 %}