iconv() doesn't set the trailing zero

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

diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i
index b052ac0dcc73cc1c37da1cb2097c323513e16641..3925c11c679acc91cf51c032c647e93b9404633f 100644 (file)
--- a/wxPython/src/wx.i
+++ b/wxPython/src/wx.i
@@ -17,11 +17,6 @@
 #include "helpers.h"
 %}
 
 #include "helpers.h"
 %}
 

-//  %pragma(python) code="
-//  # This gives this module's dictionary to the C++ extension code...
-//  wxc._wxSetDictionary(vars())
-//  "
-

 //----------------------------------------------------------------------
 // This is where we include the other wrapper definition files for SWIG
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 // This is where we include the other wrapper definition files for SWIG
 //----------------------------------------------------------------------


@@ -50,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;


@@ -106,19 +104,16 @@ 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*)wxTheApp;

     }
 %}
 
 
     }
 %}
 
 

-

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


@@ -154,6 +149,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,19 +158,25 @@ extern "C" SWIGEXPORT(void) initfilesysc();
 // the wxc module and will then have safe access to these functions, even if
 // in another shared library.
 static wxPyCoreAPI API = {
 // the wxc module and will then have safe access to these functions, even if
 // in another shared library.
 static wxPyCoreAPI API = {

-    SWIG_MakePtr,
-    SWIG_GetPtr,
-    SWIG_GetPtrObj,
-    SWIG_RegisterMapping,
-    SWIG_addvarlink,
-    SWIG_newvarlink,
-
+    (p_SWIG_MakePtr_t)SWIG_MakePtr,
+    (p_SWIG_GetPtr_t)SWIG_GetPtr,
+    (p_SWIG_GetPtrObj_t)SWIG_GetPtrObj,
+    (p_SWIG_RegisterMapping_t)SWIG_RegisterMapping,
+    (p_SWIG_addvarlink_t)SWIG_addvarlink,
+    (p_SWIG_newvarlink_t)SWIG_newvarlink,
+
+    wxPyBeginAllowThreads,
+    wxPyEndAllowThreads,

     wxPyBeginBlockThreads,
     wxPyEndBlockThreads,
 
     wxPyConstructObject,
     wxPy_ConvertList,
 
     wxPyBeginBlockThreads,
     wxPyEndBlockThreads,
 
     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,


@@ -199,7 +202,14 @@ static wxPyCoreAPI API = {
     wxPyMake_wxObject,
     wxPyMake_wxSizer,
     wxPyPtrTypeMap_Add,
     wxPyMake_wxObject,
     wxPyMake_wxSizer,
     wxPyPtrTypeMap_Add,

-    wxArrayString2PyList_helper
+    wxArrayString2PyList_helper,
+    wxArrayInt2PyList_helper,
+
+    wxPyClientData_dtor,
+    wxPyUserData_dtor,
+    wxPyOORClientData_dtor,
+
+    wxPyCBInputStream_create

 };
 
 
 };
 
 


@@ -240,13 +250,20 @@ 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 ));
 
 
     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));
     PyDict_SetItemString(d,"wxVERSION_STRING", PyString_FromString(wxVERSION_STRING));

+#endif

 
 
 %}
 
 
 %}


@@ -257,4 +274,3 @@ static wxPyCoreAPI API = {
 
 %pragma(python) include="_extras.py";
 
 
 %pragma(python) include="_extras.py";
 

-