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:
@@ -35,7 +35,7 @@ class wxObject {
|
||||
public:
|
||||
|
||||
%addmethods {
|
||||
const char* GetClassName() {
|
||||
wxString GetClassName() {
|
||||
return self->GetClassInfo()->GetClassName();
|
||||
}
|
||||
|
||||
@@ -357,8 +357,9 @@ bool wxYieldIfNeeded();
|
||||
void wxEnableTopLevelWindows(bool enable);
|
||||
|
||||
%inline %{
|
||||
char* wxGetResource(char *section, char *entry, char *file = NULL) {
|
||||
char * retval;
|
||||
wxString wxGetResource(const wxString& section, const wxString& entry,
|
||||
const wxString& file = wxEmptyString) {
|
||||
wxChar * retval;
|
||||
wxGetResource(section, entry, &retval, file);
|
||||
return retval;
|
||||
}
|
||||
|
Reference in New Issue
Block a user