No changes, just simplify preprocessor checks in wxMSW wxTextEntry.

[wxWidgets.git] / include / wx / fontutil.h

diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index 050e470fa07708965f72ce8ccd19111f2aa4a99b..d52a6e3b771bb089e21bfcb2e8a432e1c359ccea 100644 (file)
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -152,11 +152,8 @@ public:
 
     void Free();
     void EnsureValid();
 
     void Free();
     void EnsureValid();

-    
+

     bool m_descriptorValid;
     bool m_descriptorValid;

-#if wxOSX_USE_CORE_TEXT
-    CTFontDescriptorRef m_ctFontDescriptor;
-#endif

 
 #if wxOSX_USE_ATSU_TEXT
     bool            m_atsuFontValid;
 
 #if wxOSX_USE_ATSU_TEXT
     bool            m_atsuFontValid;


@@ -168,13 +165,6 @@ public:
     wxInt16         m_qdFontFamily;
     wxInt16         m_qdFontStyle;
 #endif
     wxInt16         m_qdFontFamily;
     wxInt16         m_qdFontStyle;
 #endif

-#endif
-
-#if wxOSX_USE_COCOA
-    WX_NSFontDescriptor m_nsFontDescriptor;
-    void            ValidateNSFontDescriptor();
-#endif
-#if wxOSX_USE_IPHONE

 #endif
 
     int           m_pointSize;
 #endif
 
     int           m_pointSize;