Fix compilation with MinGW -std=c++11 option.

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

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 176dde8d1579d553155c2b2fb88e02fd8412967e..8e9cc337df37f714f5fb2edc28cd0c1f6f96b1b3 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -23,8 +23,9 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/settings.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/settings.h"

-    #include "wx/cmndata.h"

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

+    #include "wx/encinfo.h"
+    #include "wx/crt.h"

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


@@ -450,8 +451,6 @@ void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
 // wxFont creation
 // ----------------------------------------------------------------------------
 
 // wxFont creation
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-

 wxFont::wxFont(const wxNativeFontInfo& info)
 {
     (void) Create(info.GetXFontName());
 wxFont::wxFont(const wxNativeFontInfo& info)
 {
     (void) Create(info.GetXFontName());


@@ -522,49 +521,47 @@ wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
 
 int wxFont::GetPointSize() const
 {
 
 int wxFont::GetPointSize() const
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid font") );

 
     return M_FONTDATA->m_pointSize;
 }
 
 wxString wxFont::GetFaceName() const
 {
 
     return M_FONTDATA->m_pointSize;
 }
 
 wxString wxFont::GetFaceName() const
 {

-    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );

 
     return M_FONTDATA->m_faceName;
 }
 
 
     return M_FONTDATA->m_faceName;
 }
 

-wxFontFamily wxFont::GetFamily() const
+wxFontFamily wxFont::DoGetFamily() const

 {
 {

-    wxCHECK_MSG( Ok(), wxFONTFAMILY_MAX, wxT("invalid font") );
-

     return M_FONTDATA->m_family;
 }
 
 wxFontStyle wxFont::GetStyle() const
 {
     return M_FONTDATA->m_family;
 }
 
 wxFontStyle wxFont::GetStyle() const
 {

-    wxCHECK_MSG( Ok(), wxFONTSTYLE_MAX, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") );

 
     return M_FONTDATA->m_style;
 }
 
 wxFontWeight wxFont::GetWeight() const
 {
 
     return M_FONTDATA->m_style;
 }
 
 wxFontWeight wxFont::GetWeight() const
 {

-    wxCHECK_MSG( Ok(), wxFONTWEIGHT_MAX, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") );

 
     return M_FONTDATA->m_weight;
 }
 
 bool wxFont::GetUnderlined() const
 {
 
     return M_FONTDATA->m_weight;
 }
 
 bool wxFont::GetUnderlined() const
 {

-    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), false, wxT("invalid font") );

 
     return M_FONTDATA->m_underlined;
 }
 
 wxFontEncoding wxFont::GetEncoding() const
 {
 
     return M_FONTDATA->m_underlined;
 }
 
 wxFontEncoding wxFont::GetEncoding() const
 {

-    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") );

 
     // m_encoding is unused in wxGTK2, return encoding that the user set.
     return M_FONTDATA->m_encoding;
 
     // m_encoding is unused in wxGTK2, return encoding that the user set.
     return M_FONTDATA->m_encoding;


@@ -572,7 +569,7 @@ wxFontEncoding wxFont::GetEncoding() const
 
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
 
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {

-    wxCHECK_MSG( Ok(), NULL, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") );

 
     if ( !M_FONTDATA->HasNativeFont() )
     {
 
     if ( !M_FONTDATA->HasNativeFont() )
     {


@@ -587,7 +584,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 
 bool wxFont::IsFixedWidth() const
 {
 
 bool wxFont::IsFixedWidth() const
 {

-    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), false, wxT("invalid font") );

 
     if ( M_FONTDATA->HasNativeFont() )
     {
 
     if ( M_FONTDATA->HasNativeFont() )
     {


@@ -668,7 +665,7 @@ void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
 
 static GdkFont *g_systemDefaultGuiFont = NULL;
 
 
 static GdkFont *g_systemDefaultGuiFont = NULL;
 

-// this is also used from tbargtk.cpp and tooltip.cpp, hence extern
+// this is also used from toolbar.cpp and tooltip.cpp, hence extern

 extern GdkFont *GtkGetDefaultGuiFont()
 {
     if (!g_systemDefaultGuiFont)
 extern GdkFont *GtkGetDefaultGuiFont()
 {
     if (!g_systemDefaultGuiFont)


@@ -700,7 +697,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
 {
     GdkFont *font = NULL;
 
 {
     GdkFont *font = NULL;
 

-    wxCHECK_MSG( Ok(), font, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), font, wxT("invalid font") );

 
     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);