Although returning wxFONTFAMILY_UNKNOWN when the font family is not recognized makes more sense, it breaks a lot of existing code including all the font-related code generated by DialogBlocks, so prefer to return wxFONTFAMILY_DEFAULT instead -- which can't be confused for a valid font family neither but can be passed to wxFont ctor or SetFamily() without problems. To ensure that this behaviour is correctly implemented by all ports, rename the existing wxFont::GetFamily() to DoGetFamily() and call the new method from wxFontBase::GetFamily() which adjusts the return value if needed. Closes #12330. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
		
			
				
	
	
		
			130 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			130 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
/////////////////////////////////////////////////////////////////////////////
 | 
						|
// Name:        wx/gtk1/font.h
 | 
						|
// Purpose:
 | 
						|
// Author:      Robert Roebling
 | 
						|
// Id:          $Id$
 | 
						|
// Copyright:   (c) 1998 Robert Roebling
 | 
						|
// Licence:     wxWindows licence
 | 
						|
/////////////////////////////////////////////////////////////////////////////
 | 
						|
 | 
						|
#ifndef __GTKFONTH__
 | 
						|
#define __GTKFONTH__
 | 
						|
 | 
						|
#include "wx/hash.h"
 | 
						|
 | 
						|
// ----------------------------------------------------------------------------
 | 
						|
// classes
 | 
						|
// ----------------------------------------------------------------------------
 | 
						|
 | 
						|
class WXDLLIMPEXP_FWD_CORE wxDC;
 | 
						|
class WXDLLIMPEXP_FWD_CORE wxPaintDC;
 | 
						|
class WXDLLIMPEXP_FWD_CORE wxWindow;
 | 
						|
 | 
						|
class WXDLLIMPEXP_FWD_CORE wxFont;
 | 
						|
 | 
						|
// ----------------------------------------------------------------------------
 | 
						|
// wxFont
 | 
						|
// ----------------------------------------------------------------------------
 | 
						|
 | 
						|
class WXDLLIMPEXP_CORE wxFont : public wxFontBase
 | 
						|
{
 | 
						|
public:
 | 
						|
    // ctors and such
 | 
						|
    wxFont() { }
 | 
						|
 | 
						|
    // wxGTK-specific
 | 
						|
    wxFont(const wxString& fontname)
 | 
						|
    {
 | 
						|
        Create(fontname);
 | 
						|
    }
 | 
						|
 | 
						|
    wxFont(const wxNativeFontInfo& info);
 | 
						|
 | 
						|
#if FUTURE_WXWIN_COMPATIBILITY_3_0
 | 
						|
    wxFont(int size,
 | 
						|
           int family,
 | 
						|
           int style,
 | 
						|
           int weight,
 | 
						|
           bool underlined = false,
 | 
						|
           const wxString& face = wxEmptyString,
 | 
						|
           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
 | 
						|
    {
 | 
						|
        (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
 | 
						|
    }
 | 
						|
#endif
 | 
						|
 | 
						|
    wxFont(int size,
 | 
						|
           wxFontFamily family,
 | 
						|
           wxFontStyle style,
 | 
						|
           wxFontWeight weight,
 | 
						|
           bool underlined = false,
 | 
						|
           const wxString& face = wxEmptyString,
 | 
						|
           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
 | 
						|
    {
 | 
						|
        Create(size, family, style, weight, underlined, face, encoding);
 | 
						|
    }
 | 
						|
 | 
						|
    wxFont(const wxSize& pixelSize,
 | 
						|
           wxFontFamily family,
 | 
						|
           wxFontStyle style,
 | 
						|
           wxFontWeight weight,
 | 
						|
           bool underlined = false,
 | 
						|
           const wxString& face = wxEmptyString,
 | 
						|
           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
 | 
						|
    {
 | 
						|
        Create(10, family, style, weight, underlined, face, encoding);
 | 
						|
        SetPixelSize(pixelSize);
 | 
						|
    }
 | 
						|
 | 
						|
    bool Create(int size,
 | 
						|
                wxFontFamily family,
 | 
						|
                wxFontStyle style,
 | 
						|
                wxFontWeight weight,
 | 
						|
                bool underlined = false,
 | 
						|
                const wxString& face = wxEmptyString,
 | 
						|
                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 | 
						|
 | 
						|
 | 
						|
    // wxGTK-specific
 | 
						|
    bool Create(const wxString& fontname);
 | 
						|
 | 
						|
    virtual ~wxFont();
 | 
						|
 | 
						|
    // implement base class pure virtuals
 | 
						|
    virtual int GetPointSize() const;
 | 
						|
    virtual wxFontStyle GetStyle() const;
 | 
						|
    virtual wxFontWeight GetWeight() const;
 | 
						|
    virtual wxString GetFaceName() const;
 | 
						|
    virtual bool GetUnderlined() const;
 | 
						|
    virtual wxFontEncoding GetEncoding() const;
 | 
						|
    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
 | 
						|
    virtual bool IsFixedWidth() const;
 | 
						|
 | 
						|
    virtual void SetPointSize( int pointSize );
 | 
						|
    virtual void SetFamily(wxFontFamily family);
 | 
						|
    virtual void SetStyle(wxFontStyle style);
 | 
						|
    virtual void SetWeight(wxFontWeight weight);
 | 
						|
    virtual bool SetFaceName( const wxString& faceName );
 | 
						|
    virtual void SetUnderlined( bool underlined );
 | 
						|
    virtual void SetEncoding(wxFontEncoding encoding);
 | 
						|
 | 
						|
    wxDECLARE_COMMON_FONT_METHODS();
 | 
						|
 | 
						|
    // implementation from now on
 | 
						|
    void Unshare();
 | 
						|
 | 
						|
    GdkFont* GetInternalFont(float scale = 1.0) const;
 | 
						|
 | 
						|
protected:
 | 
						|
    virtual wxGDIRefData *CreateGDIRefData() const;
 | 
						|
    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 | 
						|
 | 
						|
    virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
 | 
						|
    virtual wxFontFamily DoGetFamily() const;
 | 
						|
 | 
						|
private:
 | 
						|
    DECLARE_DYNAMIC_CLASS(wxFont)
 | 
						|
};
 | 
						|
 | 
						|
#endif // __GTKFONTH__
 |