added wx/defs.h include to correct compilation issues under Mac OS X

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

diff --git a/include/wx/font.h b/include/wx/font.h
index d38bd307f3cb861f0fc047d0f4c384c2860bb141..12ce162da7dad87bdc1f4ab4577d36fbe9982a5c 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -78,8 +78,8 @@ class WXDLLEXPORT wxFontBase : public wxGDIObject
 {
 public:
     // creator function
 {
 public:
     // creator function

-#ifdef __WXMAC_X__
-    virtual ~wxFontBase() {}  // Added min for Mac X
+#ifdef __DARWIN__
+    virtual ~wxFontBase() { }

 #endif
 
     // from the font components
 #endif
 
     // from the font components


@@ -161,8 +161,8 @@ private:
     #include "wx/motif/font.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/font.h"
     #include "wx/motif/font.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/font.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/font.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/font.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/font.h"
 #elif defined(__WXPM__)
 #elif defined(__WXMAC__)
     #include "wx/mac/font.h"
 #elif defined(__WXPM__)