More Unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -699,11 +699,11 @@ public:
|
|||||||
|
|
||||||
%extend {
|
%extend {
|
||||||
int GetUniChar() {
|
int GetUniChar() {
|
||||||
#if wxUSE_UNICODE
|
%#if wxUSE_UNICODE
|
||||||
return self->m_uniChar;
|
return self->m_uniChar;
|
||||||
#else
|
%#else
|
||||||
return 0;
|
return 0;
|
||||||
#endif
|
%#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -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){
|
void wxSizeEvent_SetSize(wxSizeEvent *self,wxSize size){
|
||||||
self->m_size = size;
|
self->m_size = size;
|
||||||
|
@@ -571,7 +571,7 @@ void wxPy_ReinitStockObjects(bool init)
|
|||||||
obj = PyDict_GetItemString(wxPython_dict, dropwx(#name)); \
|
obj = PyDict_GetItemString(wxPython_dict, dropwx(#name)); \
|
||||||
wxCHECK_RET(obj != NULL, wxT("Unable to find stock object for " #name)) \
|
wxCHECK_RET(obj != NULL, wxT("Unable to find stock object for " #name)) \
|
||||||
wxCHECK_RET(wxPySwigInstance_Check(obj), wxT("Not a swig instance: " #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); \
|
PyObject_SetAttrString(obj, "this", ptrobj); \
|
||||||
Py_DECREF(ptrobj); }
|
Py_DECREF(ptrobj); }
|
||||||
|
|
||||||
@@ -580,7 +580,7 @@ void wxPy_ReinitStockObjects(bool init)
|
|||||||
obj = PyDict_GetItemString(wxPython_dict, dropwx(#name)); \
|
obj = PyDict_GetItemString(wxPython_dict, dropwx(#name)); \
|
||||||
wxCHECK_RET(obj != NULL, wxT("Unable to find stock object for " #name)) \
|
wxCHECK_RET(obj != NULL, wxT("Unable to find stock object for " #name)) \
|
||||||
wxCHECK_RET(wxPySwigInstance_Check(obj), wxT("Not a swig instance: " #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); \
|
PyObject_SetAttrString(obj, "this", ptrobj); \
|
||||||
Py_DECREF(ptrobj); }
|
Py_DECREF(ptrobj); }
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user