Added __WXMAC_OSX__ guards around the CFRunLoop calls, CFRunLoop not available on...

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

diff --git a/include/wx/font.h b/include/wx/font.h
index b8d436bb9c6749efed03543caac3560e5a5c6d11..dc03888f75ce73d8df173b97adb029c972697d19 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -142,7 +142,7 @@ public:
         int family,                 // see wxFontFamily enum
         int style,                  // see wxFontStyle enum
         int weight,                 // see wxFontWeight enum
         int family,                 // see wxFontFamily enum
         int style,                  // see wxFontStyle enum
         int weight,                 // see wxFontWeight enum

-        bool underlined = FALSE,    // not underlined by default
+        bool underlined = false,    // not underlined by default

         const wxString& face = wxEmptyString,              // facename
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // ISO8859-X, ...
 
         const wxString& face = wxEmptyString,              // facename
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // ISO8859-X, ...
 


@@ -231,7 +231,7 @@ private:
 };
 
 // include the real class declaration
 };
 
 // include the real class declaration

-#if defined(__PALMOS__)
+#if defined(__WXPALMOS__)

     #include "wx/palmos/font.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/font.h"
     #include "wx/palmos/font.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/font.h"