Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core wxPython (non-contrib) now fully works with Unicode!

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-03-13 22:30:20 +00:00
parent e5dd90b137
commit a541c32586
26 changed files with 638 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
wxPython/src/misc2.i
View File

@@ -53,7 +53,6 @@
//---------------------------------------------------------------------------
// Dialog Functions
#ifdef wxUSE_UNICODE
wxString wxFileSelector(const wxChar* message = wxFileSelectorPromptStr,
const wxChar* default_path = NULL,
const wxChar* default_filename = NULL,
@@ -62,16 +61,18 @@ wxString wxFileSelector(const wxChar* message = wxFileSelectorPromptStr,
int flags = 0,
wxWindow *parent = NULL,
int x = -1, int y = -1);
#else
wxString wxFileSelector(const char* message = wxFileSelectorPromptStr,
const char* default_path = NULL,
const char* default_filename = NULL,
const char* default_extension = NULL,
const char* wildcard = wxFileSelectorDefaultWildcardStr,
int flags = 0,
wxWindow *parent = NULL,
int x = -1, int y = -1);
#endif
// Ask for filename to load
wxString wxLoadFileSelector(const wxChar *what,
const wxChar *extension,
const wxChar *default_name = NULL,
wxWindow *parent = NULL);
// Ask for filename to save
wxString wxSaveFileSelector(const wxChar *what,
const wxChar *extension,
const wxChar *default_name = NULL,
wxWindow *parent = NULL);
wxString wxGetTextFromUser(const wxString& message,
const wxString& caption = wxEmptyString,
@@ -702,7 +703,8 @@ public:
bool found;
wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "DoLog")))
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(isi)", level, szString, t)); // TODO: unicode fix
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iOi)", level,
wx2PyString(szString), t));
wxPyEndBlockThreads();
if (! found)
wxLog::DoLog(level, szString, t);
@@ -712,7 +714,8 @@ public:
bool found;
wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "DoLogString")))
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(si)", szString, t)); // TODO: unicode fix
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)",
wx2PyString(szString), t));
wxPyEndBlockThreads();
if (! found)
wxLog::DoLogString(szString, t);