Give wxListBox a GetClassDefaultAttributes so wxCalendarCtrl (and

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

diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp
index e3ac9a29d20addb52e0c0c2109f733622e3f0e6b..06d972feeeba94d652d1636b6f04712f97fb2176 100644 (file)
--- a/src/mgl/font.cpp
+++ b/src/mgl/font.cpp
@@ -14,7 +14,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

     #pragma implementation "font.h"
 #endif
 
     #pragma implementation "font.h"
 #endif
 


@@ -74,6 +74,8 @@ private:
     wxMGLFontLibrary *m_library;
     bool              m_valid;
 
     wxMGLFontLibrary *m_library;
     bool              m_valid;
 

+    wxNativeFontInfo  m_info;
+

     friend class wxFont;
 };
 
     friend class wxFont;
 };
 


@@ -264,6 +266,14 @@ bool wxFont::IsFixedWidth() const
     return (bool)(M_FONTDATA->m_library->GetFamily()->GetInfo()->isFixed);
 }
 
     return (bool)(M_FONTDATA->m_library->GetFamily()->GetInfo()->isFixed);
 }
 

+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+{
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid font") );
+
+    M_FONTDATA->m_info.InitFromFont(*this);
+
+    return &(M_FONTDATA->m_info);
+}

 
 // ----------------------------------------------------------------------------
 // change font attributes
 
 // ----------------------------------------------------------------------------
 // change font attributes