A little clarification

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

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 3d22f9a80507ff6121f189eb6dc0b483a2ac7bdf..eef97f198b6735ff8e99a500af5868ee8cf8e371 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -15,10 +15,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "font.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/font.h"
 #include "wx/fontutil.h"
 #include "wx/cmndata.h"
@@ -83,6 +86,11 @@ public:
 #endif // GTK 2.0/1.x
     }
 
+#ifndef __WXGTK20__
+    // reinitilize the font with the gived XFLD
+    void ReInit(const wxString& fontname);
+#endif
+
     // 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);
@@ -434,6 +442,15 @@ wxFontRefData::wxFontRefData(const wxString& fontname)
     InitFromNative();
 }
 
+#ifndef __WXGTK20__
+void wxFontRefData::ReInit(const wxString& fontname)
+{
+    m_nativeFontInfo.SetXFontName(fontname);
+
+    InitFromNative();
+}
+#endif
+
 void wxFontRefData::ClearGdkFonts()
 {
 #ifndef __WXGTK20__
@@ -773,16 +790,16 @@ bool wxFont::GetNoAntiAliasing()
     return M_FONTDATA->m_noAA;
 }
 
-wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
     wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 
-#ifndef __WXGTK20__  // ???
+#ifndef __WXGTK20__
     if ( M_FONTDATA->m_nativeFontInfo.GetXFontName().empty() )
         GetInternalFont();
 #endif
 
-    return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+    return &(M_FONTDATA->m_nativeFontInfo);
 }
 
 bool wxFont::IsFixedWidth() const
@@ -856,7 +873,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
     M_FONTDATA->SetEncoding(encoding);
 }
 
-void wxFont::SetNativeFontInfo( const wxNativeFontInfo& info )
+void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
 {
     Unshare();
 
@@ -874,6 +891,7 @@ void wxFont::SetNoAntiAliasing( bool no )
 // get internal representation of font
 // ----------------------------------------------------------------------------
 
+#ifndef __WXGTK20__
 static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
 
 // this is also used from tbargtk.cpp and tooltip.cpp, hence extern
@@ -885,13 +903,13 @@ extern GdkFont *GtkGetDefaultGuiFont()
         GtkStyle *def = gtk_rc_get_style( widget );
         if (def)
         {
-            g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) );
+            g_systemDefaultGuiFont = gdk_font_ref( def->font );
         }
         else
         {
             def = gtk_widget_get_default_style();
             if (def)
-                g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) );
+                g_systemDefaultGuiFont = gdk_font_ref( def->font );
         }
         gtk_widget_destroy( widget );
     }
@@ -906,14 +924,6 @@ extern GdkFont *GtkGetDefaultGuiFont()
 
 GdkFont *wxFont::GetInternalFont( float scale ) const
 {
-#ifdef __WXGTK20__
-    // Deprecated for GTK 2.0 and should be removed
-    // in the 2.5 tree.
-    wxFAIL_MSG( wxT("No longer used") );
-    
-    return (GdkFont *) NULL;
-    
-#else // GTK 1.x
     GdkFont *font = (GdkFont *) NULL;
 
     wxCHECK_MSG( Ok(), font, wxT("invalid font") )
@@ -956,7 +966,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
                                                &xfontname);
                 if ( font )
                 {
-                    M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname);
+                    M_FONTDATA->ReInit(xfontname);
                 }
             }
         }
@@ -972,6 +982,6 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
     wxASSERT_MSG( font, wxT("could not load any font?") );
 
     return font;
-#endif  // GTK 2.0/1.x
 }
+#endif  // not GTK 2.0