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

Little tweaks to match recent CVS changes.

Browse Source 
Fixed wxFontEnumerator GetFacename and GetEncodings to return an empty
list instead of crashing if the Enumerate function hasn't been called
yet.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-07-16 00:06:11 +00:00
parent 5797a657ec
commit 5a319c5cc1
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wxPython/src/_event.i
View File

@@ -1143,6 +1143,7 @@ public:
void SetCurrentFocus(wxWindow *win); void SetCurrentFocus(wxWindow *win);
enum { enum {
IsBackward,
IsForward, IsForward,
WinChange WinChange
}; };

8
wxPython/src/_font.i
View File

@@ -506,7 +506,7 @@ public:
// Unofficial API, don't use // Unofficial API, don't use
virtual void SetNoAntiAliasing( bool no = True ); virtual void SetNoAntiAliasing( bool no = True );
virtual bool GetNoAntiAliasing(); virtual bool GetNoAntiAliasing() const;
// the default encoding is used for creating all fonts with default // the default encoding is used for creating all fonts with default
// encoding parameter // encoding parameter
@@ -558,12 +558,18 @@ public:
%extend { %extend {
PyObject* GetEncodings() { PyObject* GetEncodings() {
wxArrayString* arr = self->GetEncodings(); wxArrayString* arr = self->GetEncodings();
if (arr)
return wxArrayString2PyList_helper(*arr); return wxArrayString2PyList_helper(*arr);
else
return PyList_New(0);
} }
PyObject* GetFacenames() { PyObject* GetFacenames() {
wxArrayString* arr = self->GetFacenames(); wxArrayString* arr = self->GetFacenames();
if (arr)
return wxArrayString2PyList_helper(*arr); return wxArrayString2PyList_helper(*arr);
else
return PyList_New(0);
} }
} }
}; };