apply complete transforms (scroll window PrepareDC was not functioning properly)

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

diff --git a/include/wx/font.h b/include/wx/font.h
index 9ffccef70cc52390cf1dd92db6fd469908117310..5d890e61765de4dcc791102ae8e9154cf150f029 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -157,7 +157,8 @@ public:
     static wxFont *New(const wxString& strNativeFontDesc);
 
     // was the font successfully created?
     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;
 
     // comparison
     bool operator == (const wxFont& font) const;


@@ -241,6 +242,8 @@ private:
     #include "wx/x11/font.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/font.h"
     #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__)
 #elif defined(__WXMAC__)
     #include "wx/mac/font.h"
 #elif defined(__WXCOCOA__)