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

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index a8a5572e06..e0d5c8209f 100644
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     12.05.02
 // RCS-ID:      $Id$
-// Copyright:   (c) 1997-2002 wxWindows team
+// Copyright:   (c) 1997-2002 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -51,28 +51,47 @@ 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; }
 
     wxFontData m_fontData;
+
+    DECLARE_NO_COPY_CLASS(wxFontDialogBase)
 };
 
 // ----------------------------------------------------------------------------
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 
-#if defined(__WXUNIVERSAL__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXCOCOA__)
+#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_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__)
+
     #include "wx/generic/fontdlgg.h"
     #define wxFontDialog wxGenericFontDialog
-    #define sm_classwxFontDialog sm_classwxGenericFontDialog
 #elif defined(__WXMSW__)
     #include "wx/msw/fontdlg.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/fontdlg.h"
 #elif defined(__WXPM__)
     #include "wx/os2/fontdlg.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/fontdlg.h"
 #endif
 
 // ----------------------------------------------------------------------------