Duplicate include order from regex because it's well tested already and avoids the...

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

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 2fd0ad6f5f3b99f47479bdb8405acf708688545d..6201232e19311e7409fdf5aede3e6d1754f216d5 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -15,10 +15,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "font.h"
 #endif
 
     #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"
 #include "wx/font.h"
 #include "wx/fontutil.h"
 #include "wx/cmndata.h"


@@ -94,8 +97,8 @@ public:
     void SetEncoding(wxFontEncoding encoding);
 
     void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }
     void SetEncoding(wxFontEncoding encoding);
 
     void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }

-    bool GetNoAntiAliasing() { return m_noAA; }
-    
+    bool GetNoAntiAliasing() const { return m_noAA; }
+

     // and this one also modifies all the other font data fields
     void SetNativeFontInfo(const wxNativeFontInfo& info);
 
     // and this one also modifies all the other font data fields
     void SetNativeFontInfo(const wxNativeFontInfo& info);
 


@@ -158,7 +161,7 @@ private:
 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

-// wxFontRefData 
+// wxFontRefData

 // ----------------------------------------------------------------------------
 
 void wxFontRefData::Init(int pointSize,
 // ----------------------------------------------------------------------------
 
 void wxFontRefData::Init(int pointSize,


@@ -185,7 +188,7 @@ void wxFontRefData::Init(int pointSize,
 
     m_underlined = underlined;
     m_encoding = encoding;
 
     m_underlined = underlined;
     m_encoding = encoding;

-    
+

     m_noAA = FALSE;
 
 #ifdef __WXGTK20__
     m_noAA = FALSE;
 
 #ifdef __WXGTK20__


@@ -215,7 +218,7 @@ void wxFontRefData::Init(int pointSize,
                break;
         }
     }
                break;
         }
     }

-    
+

     SetStyle( m_style );
     SetPointSize( m_pointSize );
     SetWeight( m_weight );
     SetStyle( m_style );
     SetPointSize( m_pointSize );
     SetWeight( m_weight );


@@ -233,6 +236,11 @@ void wxFontRefData::InitFromNative()
     // init fields
     m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) );
 
     // init fields
     m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) );
 

+    // Pango sometimes needs to have a size
+    int pango_size = pango_font_description_get_size( desc );
+    if (pango_size == 0)
+        pango_font_description_set_size( desc, 12 * PANGO_SCALE);
+        

     m_pointSize = pango_font_description_get_size( desc ) / PANGO_SCALE;
 
     switch (pango_font_description_get_style( desc ))
     m_pointSize = pango_font_description_get_size( desc ) / PANGO_SCALE;
 
     switch (pango_font_description_get_style( desc ))


@@ -407,8 +415,11 @@ wxFontRefData::wxFontRefData( const wxFontRefData& data )
     m_encoding = data.m_encoding;
 
     m_noAA = data.m_noAA;
     m_encoding = data.m_encoding;
 
     m_noAA = data.m_noAA;

-    
-    m_nativeFontInfo = data.m_nativeFontInfo;
+
+    // Forces a copy of the internal data.  wxNativeFontInfo should probably
+    // have a copy ctor and assignment operator to fix this properly but that
+    // would break binary compatibility...
+    m_nativeFontInfo.FromString(data.m_nativeFontInfo.ToString());

 }
 
 wxFontRefData::wxFontRefData(int size, int family, int style,
 }
 
 wxFontRefData::wxFontRefData(int size, int family, int style,


@@ -763,23 +774,28 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->m_encoding;
 }
 
     return M_FONTDATA->m_encoding;
 }
 

-bool wxFont::GetNoAntiAliasing()
+bool wxFont::GetNoAntiAliasing() const

 {
     wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
 
     return M_FONTDATA->m_noAA;
 }
 
 {
     wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
 
     return M_FONTDATA->m_noAA;
 }
 

-wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const

 {
     wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 
 {
     wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 

-#ifndef __WXGTK20__  // ???
-    if ( M_FONTDATA->m_nativeFontInfo.GetXFontName().empty() )
+#ifndef __WXGTK20__
+    if ( !M_FONTDATA->HasNativeFont() )
+    {
+        // NB: this call has important side-effect: it not only finds
+        //     GdkFont representation, it also initializes m_nativeFontInfo
+        //     by calling its SetXFontName method

         GetInternalFont();
         GetInternalFont();

+    }

 #endif
 
 #endif
 

-    return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+    return &(M_FONTDATA->m_nativeFontInfo);

 }
 
 bool wxFont::IsFixedWidth() const
 }
 
 bool wxFont::IsFixedWidth() const


@@ -853,7 +869,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
     M_FONTDATA->SetEncoding(encoding);
 }
 
     M_FONTDATA->SetEncoding(encoding);
 }
 

-void wxFont::SetNativeFontInfo( const wxNativeFontInfo& info )
+void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )

 {
     Unshare();
 
 {
     Unshare();
 


@@ -871,6 +887,7 @@ void wxFont::SetNoAntiAliasing( bool no )
 // get internal representation of font
 // ----------------------------------------------------------------------------
 
 // 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
 static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
 
 // this is also used from tbargtk.cpp and tooltip.cpp, hence extern


@@ -882,13 +899,13 @@ extern GdkFont *GtkGetDefaultGuiFont()
         GtkStyle *def = gtk_rc_get_style( widget );
         if (def)
         {
         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)
         }
         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 );
     }
         }
         gtk_widget_destroy( widget );
     }


@@ -907,19 +924,6 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
 
     wxCHECK_MSG( Ok(), font, wxT("invalid font") )
 
 
     wxCHECK_MSG( Ok(), font, wxT("invalid font") )
 

-#ifdef __WXGTK20__
-    if (*this == wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT))
-    {
-        font = GtkGetDefaultGuiFont();
-    }
-    else
-    {
-        PangoFontDescription *
-            font_description = GetNativeFontInfo()->description;
-
-        font = gdk_font_from_description( font_description );
-    }
-#else // GTK 1.x

     long int_scale = long(scale * 100.0 + 0.5); // key for fontlist
     int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100);
 
     long int_scale = long(scale * 100.0 + 0.5); // key for fontlist
     int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100);
 


@@ -939,7 +943,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
         if ( !font )
         {
             // do we have the XLFD?
         if ( !font )
         {
             // do we have the XLFD?

-            if ( M_FONTDATA->HasNativeFont() )
+            if ( int_scale == 100 && M_FONTDATA->HasNativeFont() )

             {
                 font = wxLoadFont(M_FONTDATA->m_nativeFontInfo.GetXFontName());
             }
             {
                 font = wxLoadFont(M_FONTDATA->m_nativeFontInfo.GetXFontName());
             }


@@ -956,10 +960,10 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
                                                M_FONTDATA->m_faceName,
                                                M_FONTDATA->m_encoding,
                                                &xfontname);
                                                M_FONTDATA->m_faceName,
                                                M_FONTDATA->m_encoding,
                                                &xfontname);

-                if ( font )
-                {
+                // NB: wxFont::GetNativeFontInfo relies on this 
+                //     side-effect of GetInternalFont
+                if ( int_scale == 100 )

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

-                }

             }
         }
 
             }
         }
 


@@ -968,7 +972,6 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
             list[int_scale] = font;
         }
     }
             list[int_scale] = font;
         }
     }

-#endif  // GTK 2.0/1.x

 
     // it's quite useless to make it a wxCHECK because we're going to crash
     // anyhow...
 
     // it's quite useless to make it a wxCHECK because we're going to crash
     // anyhow...


@@ -976,4 +979,5 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
 
     return font;
 }
 
     return font;
 }

+#endif  // not GTK 2.0