Applied and merged patch 486364, which enables wxPython to be built in
unicode mode. There are a number of things still missing in it and not everything is converted correctly... But it now builds and functions properly again in non-unicode mode so this is a good time to check in everything. The previous version of all of wxPython sources is tagged wxPy_B4_UNICODE. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -39,6 +39,15 @@
|
||||
%extern utils.i
|
||||
%extern html.i
|
||||
|
||||
// #ifdef wxUSE_UNICODE
|
||||
// %typemap(python, memberin) wxChar* {
|
||||
// if ($target) delete [] $target;
|
||||
// wxString *tempStr = new wxString($source);
|
||||
// $target = new wxChar[tempStr->Len()+1];
|
||||
// memcpy($target, tempStr->c_str(), (sizeof(wxChar)*tempStr->Len())+sizeof(wxChar));
|
||||
// delete tempStr;
|
||||
// }
|
||||
// #endif
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
@@ -67,11 +76,13 @@ public:
|
||||
|
||||
struct wxHtmlContentsItem
|
||||
{
|
||||
%readonly
|
||||
short int m_Level;
|
||||
int m_ID;
|
||||
char* m_Name;
|
||||
char* m_Page;
|
||||
wxChar* m_Name;
|
||||
wxChar* m_Page;
|
||||
wxHtmlBookRecord *m_Book;
|
||||
%readwrite
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user