Use generic font dialog on MacOS X

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

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 50e63bdd9ea5caca5296ef44c9974e104d4305c8..060ab4c16159f37679002a07c671f2a2edd1ace7 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -65,10 +65,13 @@ protected:
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 

+#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 0
+

 #if defined(__WXUNIVERSAL__) || \
     defined(__WXMOTIF__)     || \
 #if defined(__WXUNIVERSAL__) || \
     defined(__WXMOTIF__)     || \

-    defined(__WXMAC__) && !defined(__WXMAC_OSX__)    || \
-    defined(__WXMAC_OSX__) && ( MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_2 ) || \
+    (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__)
     defined(__WXCOCOA__)     || \
     defined(__WXWINCE__)     || \
     defined(__WXGPE__)