X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d22004c4f4cc39c10605943572251c72061e28ae..a5de8d419f6e4449c951806663a2cecf22d7facf:/include/wx/fontdlg.h

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 43bc4e5ca3..e0d5c8209f 100644
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -51,7 +51,7 @@ public:
         { InitFontData(data); return Create(parent); }
 
 protected:
-    virtual bool DoCreate(wxWindow *parent) { m_parent = parent; return TRUE; }
+    virtual bool DoCreate(wxWindow *parent) { m_parent = parent; return true; }
 
     void InitFontData(const wxFontData *data = NULL)
         { if ( data ) m_fontData = *data; }
@@ -65,9 +65,19 @@ protected:
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 
+#if defined( __WXMAC_OSX__ ) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+//set to 1 to use native mac font and color dialogs
+#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 0
+#else
+//not supported on these platforms, leave 0
+#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 0
+#endif
+
 #if defined(__WXUNIVERSAL__) || \
     defined(__WXMOTIF__)     || \
-    defined(__WXMAC__)       || \
+    (defined(__WXMAC__) && !defined(__WXMAC_OSX__))  || \
+    (defined(__WXMAC__) && !USE_NATIVE_FONT_DIALOG_FOR_MACOSX)  || \
+    (defined(__WXMAC_OSX__) && ( MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_2 ) ) || \
     defined(__WXCOCOA__)     || \
     defined(__WXWINCE__)     || \
     defined(__WXGPE__)
@@ -80,6 +90,8 @@ protected:
     #include "wx/gtk/fontdlg.h"
 #elif defined(__WXPM__)
     #include "wx/os2/fontdlg.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/fontdlg.h"
 #endif
 
 // ----------------------------------------------------------------------------