Make wxString::WorstEncodingCase take a const wxMBConv&

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

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 421716d76178009673531ee38679f2d46770a997..060ab4c16159f37679002a07c671f2a2edd1ace7 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     12.05.02
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     12.05.02
 // RCS-ID:      $Id$

-// Copyright:   (c) 1997-2002 wxWindows team
+// Copyright:   (c) 1997-2002 wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -51,7 +51,7 @@ public:
         { InitFontData(data); return Create(parent); }
 
 protected:
         { 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; }
 
     void InitFontData(const wxFontData *data = NULL)
         { if ( data ) m_fontData = *data; }


@@ -65,8 +65,17 @@ protected:
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 

-#if defined(__WXUNIVERSAL__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXCOCOA__) \
-    || defined(__WXWINCE__) || defined(__WXGPE__)
+#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 0
+
+#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
 #elif defined(__WXMSW__)
     #include "wx/generic/fontdlgg.h"
     #define wxFontDialog wxGenericFontDialog
 #elif defined(__WXMSW__)


@@ -75,6 +84,8 @@ protected:
     #include "wx/gtk/fontdlg.h"
 #elif defined(__WXPM__)
     #include "wx/os2/fontdlg.h"
     #include "wx/gtk/fontdlg.h"
 #elif defined(__WXPM__)
     #include "wx/os2/fontdlg.h"

+#elif defined(__WXMAC__)
+    #include "wx/mac/fontdlg.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------