From: Ryan Norton <wxprojects@comcast.net>
Date: Mon, 27 Sep 2004 13:14:22 +0000 (+0000)
Subject: use both generic and native on osx 10.2 for presentation purposes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/71622a6899ec1890c784c3f0b2e66b81fdc202da?hp=5dcf30a03f8b2857100d33d5c4069c0dcc45ce8f

use both generic and native on osx 10.2 for presentation purposes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 7517a20c43..6b0bcf8ce7 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -46,6 +46,12 @@ of MSW, MAC and OS2
     #define USE_WXMAC 0
 #endif
 
+#if defined(__WXMAC_OSX__) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2)
+    #define USE_WXMACFONTDLG 1
+#else
+    #define USE_WXMACFONTDLG 0
+#endif
+
 #ifdef __WXGTK__
     #define USE_WXGTK 1
 #else
@@ -67,7 +73,7 @@ of MSW, MAC and OS2
 #define USE_FILEDLG_GENERIC \
     ((USE_WXMSW || USE_WXMAC || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FILEDLG)
 #define USE_FONTDLG_GENERIC \
-    ((USE_WXMSW || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG)
+    ((USE_WXMSW || USE_WXMACFONTDLG ||USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG)
 
 
 // Turn USE_MODAL_PRESENTATION to 0 if there is any reason for not presenting difference