adjusting to changed ownership (font is only created in the GetFont call of wxTextAttr)

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

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 70260cca96aaf00b2d449ef6d74d4cf522c80ad5..097519952e5b0b6d2acfcc2db1f18751dc669261 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -54,7 +54,7 @@ WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual,
 // 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


@@ -153,7 +153,7 @@ private:
     friend class wxFont;
 };
 
     friend class wxFont;
 };
 

-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)

 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 
 // ----------------------------------------------------------------------------
 // wxFontRefData


@@ -215,8 +215,8 @@ void wxFontRefData::InitFromNative()
         }
     }
 
         }
     }
 

-    switch ( wxToupper(*m_nativeFontInfo.
-                            GetXFontComponent(wxXLFD_SLANT).c_str()) )
+    switch ( wxToupper(m_nativeFontInfo.
+                           GetXFontComponent(wxXLFD_SLANT)[0u]).GetValue() )

     {
         case _T('I'):   // italique
             m_style = wxFONTSTYLE_ITALIC;
     {
         case _T('I'):   // italique
             m_style = wxFONTSTYLE_ITALIC;


@@ -291,7 +291,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;


@@ -536,6 +536,16 @@ wxFont::~wxFont()
 {
 }
 
 {
 }
 

+wxGDIRefData *wxFont::CreateGDIRefData() const
+{
+    return new wxFontRefData;
+}
+
+wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxFontRefData(*wx_static_cast(const wxFontRefData *, data));
+}
+

 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------