Define wxUSE_CAIRO in wx/chkconf.h to ensure that it's always defined.

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

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index ac1a4d3cce6e0f8e609b52af1658a4c1bcb0cdc9..832ce661a8603f16a48ca3cedb7a1ce3334122f6 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -213,8 +213,7 @@ public:
 
     WXHFONT GetHFONT() const
     {
 
     WXHFONT GetHFONT() const
     {

-        if ( !m_hFont )
-            const_cast<wxFontRefData *>(this)->Alloc();
+        AllocIfNeeded();

 
         return (WXHFONT)m_hFont;
     }
 
         return (WXHFONT)m_hFont;
     }


@@ -289,7 +288,18 @@ public:
     }
 
     const wxNativeFontInfo& GetNativeFontInfo() const
     }
 
     const wxNativeFontInfo& GetNativeFontInfo() const

-        { return m_nativeFontInfo; }
+    {
+        // we need to create the font now to get the corresponding LOGFONT if
+        // it hadn't been done yet
+        AllocIfNeeded();
+
+        // ensure that we have a valid face name in our font information:
+        // GetFaceName() will try to retrieve it from our HFONT and save it if
+        // it was successful
+        (void)GetFaceName();
+
+        return m_nativeFontInfo;
+    }

 
     void SetNativeFontInfo(const wxNativeFontInfo& nativeFontInfo)
     {
 
     void SetNativeFontInfo(const wxNativeFontInfo& nativeFontInfo)
     {


@@ -312,6 +322,12 @@ protected:
 
     void Init(const wxNativeFontInfo& info, WXHFONT hFont = 0);
 
 
     void Init(const wxNativeFontInfo& info, WXHFONT hFont = 0);
 

+    void AllocIfNeeded() const
+    {
+        if ( !m_hFont )
+            const_cast<wxFontRefData *>(this)->Alloc();
+    }
+

     // retrieve the face name really being used by the font: this is used to
     // get the face name selected by the system when we don't specify it (but
     // use just the family for example)
     // retrieve the face name really being used by the font: this is used to
     // get the face name selected by the system when we don't specify it (but
     // use just the family for example)


@@ -1048,24 +1064,6 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
     return IsOk() ? &(M_FONTDATA->GetNativeFontInfo()) : NULL;
 }
 
     return IsOk() ? &(M_FONTDATA->GetNativeFontInfo()) : NULL;
 }
 

-wxString wxFont::GetNativeFontInfoDesc() const
-{
-    wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
-
-    // be sure we have an HFONT associated...
-    const_cast<wxFont*>(this)->RealizeResource();
-    return wxFontBase::GetNativeFontInfoDesc();
-}
-
-wxString wxFont::GetNativeFontInfoUserDesc() const
-{
-    wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
-
-    // be sure we have an HFONT associated...
-    const_cast<wxFont*>(this)->RealizeResource();
-    return wxFontBase::GetNativeFontInfoUserDesc();
-}
-

 bool wxFont::IsFixedWidth() const
 {
     wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
 bool wxFont::IsFixedWidth() const
 {
     wxCHECK_MSG( IsOk(), false, wxT("invalid font") );