fix for focus handling when deleting the items

[wxWidgets.git] / src / common / fontcmn.cpp

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index d785a3339ad42eb8a98db329de51fd35bb0b3db1..c6b9720509dbf55318e0f6e1be704462cb745749 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -77,7 +77,7 @@ wxFont *wxFontBase::New(const wxString& strNativeFontDesc)
 
 wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
 {
 
 wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
 {

-#if !defined(__WXGTK__) && !defined(__WXMSW__)
+#if !defined(__WXGTK__) && !defined(__WXMSW__) && !defined(__WXMGL__)

     wxNativeFontInfo *fontInfo = new wxNativeFontInfo;
 
     fontInfo->pointSize = GetPointSize();
     wxNativeFontInfo *fontInfo = new wxNativeFontInfo;
 
     fontInfo->pointSize = GetPointSize();


@@ -96,7 +96,7 @@ wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
 
 void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info)
 {
 
 void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info)
 {

-#if !defined(__WXGTK__) && !defined(__WXMSW__)
+#if !defined(__WXGTK__) && !defined(__WXMSW__) && !defined(__WXMGL__)

     SetPointSize(info.pointSize);
     SetFamily(info.family);
     SetStyle(info.style);
     SetPointSize(info.pointSize);
     SetFamily(info.family);
     SetStyle(info.style);


@@ -105,7 +105,7 @@ void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info)
     SetFaceName(info.faceName);
     SetEncoding(info.encoding);
 #else
     SetFaceName(info.faceName);
     SetEncoding(info.encoding);
 #else

-       (void)info;     
+    (void)info;

 #endif
 }
 
 #endif
 }
 


@@ -193,7 +193,7 @@ wxString wxFontBase::GetWeightString() const
     }
 }
 
     }
 }
 

-#if !defined(__WXGTK__) && !defined(__WXMSW__)
+#if !defined(__WXGTK__) && !defined(__WXMSW__) && !defined(__WXMGL__)

 
 // ----------------------------------------------------------------------------
 // wxNativeFontInfo
 
 // ----------------------------------------------------------------------------
 // wxNativeFontInfo