initialize the font fields properly when it corresponds to a native font

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 9987e141cc4c94335a1d83301f067c44dd96c8f2..1047a2f5033f9a016413e3cfe1ff616fb95e181d 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -86,6 +86,9 @@ public:
 #endif // GTK 2.0/1.x
     }
 
 #endif // GTK 2.0/1.x
     }
 

+    // reinitilize the font with the gived XFLD
+    void ReInit(const wxString& fontname);
+

     // setters: all of them also take care to modify m_nativeFontInfo if we
     // have it so as to not lose the information not carried by our fields
     void SetPointSize(int pointSize);
     // setters: all of them also take care to modify m_nativeFontInfo if we
     // have it so as to not lose the information not carried by our fields
     void SetPointSize(int pointSize);


@@ -437,6 +440,13 @@ wxFontRefData::wxFontRefData(const wxString& fontname)
     InitFromNative();
 }
 
     InitFromNative();
 }
 

+void wxFontRefData::ReInit(const wxString& fontname)
+{
+    m_nativeFontInfo.SetXFontName(fontname);
+
+    InitFromNative();
+}
+

 void wxFontRefData::ClearGdkFonts()
 {
 #ifndef __WXGTK20__
 void wxFontRefData::ClearGdkFonts()
 {
 #ifndef __WXGTK20__


@@ -952,7 +962,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
                                                &xfontname);
                 if ( font )
                 {
                                                &xfontname);
                 if ( font )
                 {

-                    M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname);
+                    M_FONTDATA->m_nativeFontInfo.ReInit(xfontname);

                 }
             }
         }
                 }
             }
         }

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 9987e141cc4c94335a1d83301f067c44dd96c8f2..1047a2f5033f9a016413e3cfe1ff616fb95e181d 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -86,6 +86,9 @@ public:
 #endif // GTK 2.0/1.x
     }
 
 #endif // GTK 2.0/1.x
     }
 

+    // reinitilize the font with the gived XFLD
+    void ReInit(const wxString& fontname);
+

     // setters: all of them also take care to modify m_nativeFontInfo if we
     // have it so as to not lose the information not carried by our fields
     void SetPointSize(int pointSize);
     // setters: all of them also take care to modify m_nativeFontInfo if we
     // have it so as to not lose the information not carried by our fields
     void SetPointSize(int pointSize);


@@ -437,6 +440,13 @@ wxFontRefData::wxFontRefData(const wxString& fontname)
     InitFromNative();
 }
 
     InitFromNative();
 }
 

+void wxFontRefData::ReInit(const wxString& fontname)
+{
+    m_nativeFontInfo.SetXFontName(fontname);
+
+    InitFromNative();
+}
+

 void wxFontRefData::ClearGdkFonts()
 {
 #ifndef __WXGTK20__
 void wxFontRefData::ClearGdkFonts()
 {
 #ifndef __WXGTK20__


@@ -952,7 +962,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
                                                &xfontname);
                 if ( font )
                 {
                                                &xfontname);
                 if ( font )
                 {

-                    M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname);
+                    M_FONTDATA->m_nativeFontInfo.ReInit(xfontname);

                 }
             }
         }
                 }
             }
         }