Little tweaks to match recent CVS changes.
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:
		@@ -1143,6 +1143,7 @@ public:
 | 
			
		||||
    void SetCurrentFocus(wxWindow *win);
 | 
			
		||||
 | 
			
		||||
    enum {
 | 
			
		||||
        IsBackward,
 | 
			
		||||
        IsForward,
 | 
			
		||||
        WinChange
 | 
			
		||||
    };
 | 
			
		||||
 
 | 
			
		||||
@@ -506,7 +506,7 @@ public:
 | 
			
		||||
 | 
			
		||||
    // Unofficial API, don't use
 | 
			
		||||
    virtual void SetNoAntiAliasing( bool no = True );
 | 
			
		||||
    virtual bool GetNoAntiAliasing();
 | 
			
		||||
    virtual bool GetNoAntiAliasing() const;
 | 
			
		||||
 | 
			
		||||
    // the default encoding is used for creating all fonts with default
 | 
			
		||||
    // encoding parameter
 | 
			
		||||
@@ -558,12 +558,18 @@ public:
 | 
			
		||||
    %extend {
 | 
			
		||||
        PyObject* GetEncodings() {
 | 
			
		||||
            wxArrayString* arr = self->GetEncodings();
 | 
			
		||||
            return wxArrayString2PyList_helper(*arr);
 | 
			
		||||
            if (arr)
 | 
			
		||||
                return wxArrayString2PyList_helper(*arr);
 | 
			
		||||
            else
 | 
			
		||||
                return PyList_New(0);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        PyObject* GetFacenames() {
 | 
			
		||||
            wxArrayString* arr = self->GetFacenames();
 | 
			
		||||
            return wxArrayString2PyList_helper(*arr);
 | 
			
		||||
            if (arr)
 | 
			
		||||
                return wxArrayString2PyList_helper(*arr);
 | 
			
		||||
            else
 | 
			
		||||
                return PyList_New(0);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
};
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user