More Unicode fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_event.i b/wxPython/src/_event.i
index 6e8de85b91ad493aa687be57bbddece1d47cb4a8..0dce8b8d8e8565af2704cfc6092dfc926782ce2c 100644 (file)
--- a/wxPython/src/_event.i
+++ b/wxPython/src/_event.i
@@ -699,11 +699,11 @@ public:
 
     %extend {
         int GetUniChar() {
 
     %extend {
         int GetUniChar() {

-        #if wxUSE_UNICODE
+        %#if wxUSE_UNICODE

             return self->m_uniChar;
             return self->m_uniChar;

-        #else
+        %#else

             return 0;
             return 0;

-        #endif
+        %#endif

         }
     }
     
         }
     }
     

diff --git a/wxPython/src/gtk/core_wrap.cpp b/wxPython/src/gtk/core_wrap.cpp
index 2dda32b97dbdf791927f459c597579c398455606..8a2fe38711007d3a83ab9518a11f805cf99ef45f 100644 (file)
--- a/wxPython/src/gtk/core_wrap.cpp
+++ b/wxPython/src/gtk/core_wrap.cpp
@@ -929,11 +929,11 @@ void wxEvtHandler__setOORInfo(wxEvtHandler *self,PyObject *_self){
             }
         }
 int wxKeyEvent_GetUniChar(wxKeyEvent *self){
             }
         }
 int wxKeyEvent_GetUniChar(wxKeyEvent *self){

-        
-
-
+        #if wxUSE_UNICODE
+            return self->m_uniChar;
+        #else

             return 0;
             return 0;

-        
+        #endif

         }
 void wxSizeEvent_SetSize(wxSizeEvent *self,wxSize size){
             self->m_size = size;
         }
 void wxSizeEvent_SetSize(wxSizeEvent *self,wxSize size){
             self->m_size = size;

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index 160773953c3f9edd8248d6397d5ae4ba2cd450b2..24d16eb3521bdffc591d6c65b49d924ceb154bb6 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -571,7 +571,7 @@ void wxPy_ReinitStockObjects(bool init)
     obj = PyDict_GetItemString(wxPython_dict, dropwx(#name)); \
     wxCHECK_RET(obj != NULL, wxT("Unable to find stock object for " #name)) \
     wxCHECK_RET(wxPySwigInstance_Check(obj), wxT("Not a swig instance: " #name)); \
     obj = PyDict_GetItemString(wxPython_dict, dropwx(#name)); \
     wxCHECK_RET(obj != NULL, wxT("Unable to find stock object for " #name)) \
     wxCHECK_RET(wxPySwigInstance_Check(obj), wxT("Not a swig instance: " #name)); \

-    ptrobj = wxPyMakeSwigPtr((void*)name, #classname); \
+    ptrobj = wxPyMakeSwigPtr((void*)name, wxT(#classname)); \

     PyObject_SetAttrString(obj, "this", ptrobj); \
     Py_DECREF(ptrobj); }
 
     PyObject_SetAttrString(obj, "this", ptrobj); \
     Py_DECREF(ptrobj); }
 


@@ -580,7 +580,7 @@ void wxPy_ReinitStockObjects(bool init)
     obj = PyDict_GetItemString(wxPython_dict, dropwx(#name)); \
     wxCHECK_RET(obj != NULL, wxT("Unable to find stock object for " #name)) \
     wxCHECK_RET(wxPySwigInstance_Check(obj), wxT("Not a swig instance: " #name)); \
     obj = PyDict_GetItemString(wxPython_dict, dropwx(#name)); \
     wxCHECK_RET(obj != NULL, wxT("Unable to find stock object for " #name)) \
     wxCHECK_RET(wxPySwigInstance_Check(obj), wxT("Not a swig instance: " #name)); \

-    ptrobj = wxPyMakeSwigPtr((void*)&name, #classname); \
+    ptrobj = wxPyMakeSwigPtr((void*)&name, wxT(#classname)); \

     PyObject_SetAttrString(obj, "this", ptrobj); \
     Py_DECREF(ptrobj); }
 
     PyObject_SetAttrString(obj, "this", ptrobj); \
     Py_DECREF(ptrobj); }