moved IMPLEMENT_DYNAMIC_CLASS(wxGDIObject,wxObject) line to gdicmn.cpp so that we...

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

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 67d91827656a0200be1966e8e89c49a584ca607b..8dbe0064bd681b038678d339f613c2a913515575 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -23,13 +23,13 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/utils.h"

+    #include "wx/settings.h"
+    #include "wx/cmndata.h"
+    #include "wx/gdicmn.h"

 #endif
 
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/fontutil.h"

-#include "wx/cmndata.h"
-#include "wx/gdicmn.h"

 #include "wx/tokenzr.h"
 #include "wx/tokenzr.h"

-#include "wx/settings.h"

 
 #include <strings.h>
 
 
 #include <strings.h>
 


@@ -88,7 +88,7 @@ public:
     void SetStyle(int style);
     void SetWeight(int weight);
     void SetUnderlined(bool underlined);
     void SetStyle(int style);
     void SetWeight(int weight);
     void SetUnderlined(bool underlined);

-    void SetFaceName(const wxString& facename);
+    bool SetFaceName(const wxString& facename);

     void SetEncoding(wxFontEncoding encoding);
 
     void SetNoAntiAliasing( bool no = true ) { m_noAA = no; }
     void SetEncoding(wxFontEncoding encoding);
 
     void SetNoAntiAliasing( bool no = true ) { m_noAA = no; }


@@ -321,11 +321,11 @@ void wxFontRefData::SetUnderlined(bool underlined)
     // the XLFD doesn't have "underlined" field anyhow
 }
 
     // the XLFD doesn't have "underlined" field anyhow
 }
 

-void wxFontRefData::SetFaceName(const wxString& facename)
+bool wxFontRefData::SetFaceName(const wxString& facename)

 {
     m_faceName = facename;
 
 {
     m_faceName = facename;
 

-    m_nativeFontInfo.SetFaceName(facename);
+    return m_nativeFontInfo.SetFaceName(facename);

 }
 
 void wxFontRefData::SetEncoding(wxFontEncoding encoding)
 }
 
 void wxFontRefData::SetEncoding(wxFontEncoding encoding)


@@ -418,31 +418,22 @@ int wxFont::GetPointSize() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-#if wxUSE_PANGO

     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetPointSize()
                                        : M_FONTDATA->m_pointSize;
     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetPointSize()
                                        : M_FONTDATA->m_pointSize;

-#else
-    return M_FONTDATA->m_pointSize;
-#endif

 }
 
 wxString wxFont::GetFaceName() const
 {
     wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
 
 }
 
 wxString wxFont::GetFaceName() const
 {
     wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
 

-#if wxUSE_PANGO

     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()
                                        : M_FONTDATA->m_faceName;
     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()
                                        : M_FONTDATA->m_faceName;

-#else
-    return M_FONTDATA->m_faceName;
-#endif

 }
 
 int wxFont::GetFamily() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 }
 
 int wxFont::GetFamily() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-#if wxUSE_PANGO

     int ret = M_FONTDATA->m_family;
     if (M_FONTDATA->HasNativeFont())
         // wxNativeFontInfo::GetFamily is expensive, must not call more than once
     int ret = M_FONTDATA->m_family;
     if (M_FONTDATA->HasNativeFont())
         // wxNativeFontInfo::GetFamily is expensive, must not call more than once


@@ -452,33 +443,22 @@ int wxFont::GetFamily() const
         ret = M_FONTDATA->m_family;
 
     return ret;
         ret = M_FONTDATA->m_family;
 
     return ret;

-#else
-    return M_FONTDATA->m_family;
-#endif

 }
 
 int wxFont::GetStyle() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 }
 
 int wxFont::GetStyle() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-#if wxUSE_PANGO

     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetStyle()
                                        : M_FONTDATA->m_style;
     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetStyle()
                                        : M_FONTDATA->m_style;

-#else
-    return M_FONTDATA->m_style;
-#endif

 }
 
 int wxFont::GetWeight() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 }
 
 int wxFont::GetWeight() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-#if wxUSE_PANGO

     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetWeight()
                                        : M_FONTDATA->m_weight;
     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetWeight()
                                        : M_FONTDATA->m_weight;

-#else
-    return M_FONTDATA->m_weight;
-#endif

 }
 
 bool wxFont::GetUnderlined() const
 }
 
 bool wxFont::GetUnderlined() const


@@ -548,11 +528,12 @@ void wxFont::SetWeight(int weight)
     M_FONTDATA->SetWeight(weight);
 }
 
     M_FONTDATA->SetWeight(weight);
 }
 

-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)

 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->SetFaceName(faceName);
+    return M_FONTDATA->SetFaceName(faceName) &&
+           wxFontBase::SetFaceName(faceName);

 }
 
 void wxFont::SetUnderlined(bool underlined)
 }
 
 void wxFont::SetUnderlined(bool underlined)