1. added encoding param to wxFontEncoding::EnumFamilies() which allows to get
the list of families supporting the given encoding 2. added encoding decoding logic to src/gtk/font.cpp so that now choosing an encoding different from default in GTK+ font selector dialog actually works git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -25,9 +25,15 @@
 | 
			
		||||
class WXDLLEXPORT wxFontEnumerator
 | 
			
		||||
{
 | 
			
		||||
public:
 | 
			
		||||
    // start enumerating font families - will result in OnFontFamily() being
 | 
			
		||||
    // called for each available font family (unless it returns FALSE)
 | 
			
		||||
    virtual bool EnumerateFamilies(bool fixedWidthOnly = FALSE);
 | 
			
		||||
    // start enumerating font families (either all of them or those which
 | 
			
		||||
    // support the given encoding) - will result in OnFontFamily() being
 | 
			
		||||
    // called for each available font family (until they are exhausted or
 | 
			
		||||
    // OnFontFamily returns FALSE)
 | 
			
		||||
    virtual bool EnumerateFamilies
 | 
			
		||||
                 (
 | 
			
		||||
                    wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all
 | 
			
		||||
                    bool fixedWidthOnly = FALSE
 | 
			
		||||
                 );
 | 
			
		||||
 | 
			
		||||
    // enumerate the different encodings either for given font family or for
 | 
			
		||||
    // all font families - will result in OnFontEncoding() being called for
 | 
			
		||||
@@ -46,6 +52,9 @@ public:
 | 
			
		||||
    virtual bool OnFontEncoding(const wxString& WXUNUSED(family),
 | 
			
		||||
                                const wxString& WXUNUSED(encoding))
 | 
			
		||||
        { return FALSE; }
 | 
			
		||||
 | 
			
		||||
    // virtual dtor for the base class
 | 
			
		||||
    virtual ~wxFontEnumerator() { }
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#endif // _WX_FONTENUM_H_
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user