X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/295ebfd08189c343f85b42d7bae566b404cc1fd6..ff58644a54af11b74b8e9b33a00de8496c531566:/src/gtk/font.cpp?ds=inline diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 94cc8e66d5..bd108ebd67 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -40,18 +40,11 @@ // the default size (in points) for the fonts static const int wxDEFAULT_FONT_SIZE = 12; -// ---------------------------------------------------------------------------- -// wxScaledFontList: maps the font sizes to the GDK fonts for the given font -// ---------------------------------------------------------------------------- - -WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual, - wxScaledFontList); - // ---------------------------------------------------------------------------- // wxFontRefData // ---------------------------------------------------------------------------- -class wxFontRefData : public wxObjectRefData +class wxFontRefData : public wxGDIRefData { public: // from broken down font parameters, also default ctor @@ -239,7 +232,7 @@ void wxFontRefData::InitFromNative() } wxFontRefData::wxFontRefData( const wxFontRefData& data ) - : wxObjectRefData() + : wxGDIRefData() { m_pointSize = data.m_pointSize; m_family = data.m_family; @@ -551,12 +544,12 @@ void wxFont::SetNoAntiAliasing( bool no ) M_FONTDATA->SetNoAntiAliasing( no ); } -wxObjectRefData* wxFont::CreateRefData() const +wxGDIRefData* wxFont::CreateGDIRefData() const { return new wxFontRefData; } -wxObjectRefData* wxFont::CloneRefData(const wxObjectRefData* data) const +wxGDIRefData* wxFont::CloneGDIRefData(const wxGDIRefData* data) const { return new wxFontRefData(*wx_static_cast(const wxFontRefData*, data)); }