Apply [ 1713345 ] combobox: cmd accelerators shouldn't steal editing hotkeys

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

diff --git a/include/wx/font.h b/include/wx/font.h
index 9ffccef70cc52390cf1dd92db6fd469908117310..b8300fca36dc384dae25fea691080d8633a5a2f2 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -105,7 +105,6 @@ enum
 // wxFontBase represents a font object
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFontRefData;
 class WXDLLEXPORT wxNativeFontInfo;
 
 class WXDLLEXPORT wxFontBase : public wxGDIObject
@@ -157,7 +156,8 @@ public:
     static wxFont *New(const wxString& strNativeFontDesc);
 
     // was the font successfully created?
-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }
 
     // comparison
     bool operator == (const wxFont& font) const;
@@ -211,10 +211,6 @@ public:
     static void SetDefaultEncoding(wxFontEncoding encoding);
 
 protected:
-    // get the internal data
-    wxFontRefData *GetFontData() const
-        { return (wxFontRefData *)m_refData; }
-
     // the function called by both overloads of SetNativeFontInfo()
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
 
@@ -241,6 +237,8 @@ private:
     #include "wx/x11/font.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/font.h"
+#elif defined(__WXDFB__)
+    #include "wx/dfb/font.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/font.h"
 #elif defined(__WXCOCOA__)
@@ -249,11 +247,5 @@ private:
     #include "wx/os2/font.h"
 #endif
 
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-#define M_FONTDATA GetFontData()
-
 #endif
     // _WX_FONT_H_BASE_