Improve wxMenu docs

[wxWidgets.git] / src / gtk / font.cpp

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 94cc8e66d5f6e10f0bd29d7444f2d11ae0429448..bd108ebd67c83130b1051955d5ac839808550f21 100644 (file)
--- 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;
 
 // 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
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 // ----------------------------------------------------------------------------
 

-class wxFontRefData : public wxObjectRefData
+class wxFontRefData : public wxGDIRefData

 {
 public:
     // from broken down font parameters, also default ctor
 {
 public:
     // from broken down font parameters, also default ctor


@@ -239,7 +232,7 @@ void wxFontRefData::InitFromNative()
 }
 
 wxFontRefData::wxFontRefData( const wxFontRefData& data )
 }
 
 wxFontRefData::wxFontRefData( const wxFontRefData& data )

-             : wxObjectRefData()
+             : wxGDIRefData()

 {
     m_pointSize = data.m_pointSize;
     m_family = data.m_family;
 {
     m_pointSize = data.m_pointSize;
     m_family = data.m_family;


@@ -551,12 +544,12 @@ void wxFont::SetNoAntiAliasing( bool no )
     M_FONTDATA->SetNoAntiAliasing( no );
 }
 
     M_FONTDATA->SetNoAntiAliasing( no );
 }
 

-wxObjectRefData* wxFont::CreateRefData() const
+wxGDIRefData* wxFont::CreateGDIRefData() const

 {
     return new wxFontRefData;
 }
 
 {
     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));
 }
 {
     return new wxFontRefData(*wx_static_cast(const wxFontRefData*, data));
 }