X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f14d6dd133f96d7110b9ff635e977349b1806238..80ce465c64d6f250e26cd69e62671a189302e897:/include/wx/fontdlg.h

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 26dc4924f4..831d92409b 100644
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -23,7 +23,7 @@
 // wxFontDialog interface
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFontDialogBase : public wxDialog
+class WXDLLIMPEXP_CORE wxFontDialogBase : public wxDialog
 {
 public:
     // create the font dialog
@@ -43,12 +43,12 @@ public:
     const wxFontData& GetFontData() const { return m_fontData; }
     wxFontData& GetFontData() { return m_fontData; }
 
+#if WXWIN_COMPATIBILITY_2_6
     // deprecated interface, for compatibility only, don't use
-    wxFontDialogBase(wxWindow *parent, const wxFontData *data)
-        { m_parent = parent; InitFontData(data); }
+    wxDEPRECATED( wxFontDialogBase(wxWindow *parent, const wxFontData *data) );
 
-    bool Create(wxWindow *parent, const wxFontData *data)
-        { InitFontData(data); return Create(parent); }
+    wxDEPRECATED( bool Create(wxWindow *parent, const wxFontData *data) );
+#endif // WXWIN_COMPATIBILITY_2_6
 
 protected:
     virtual bool DoCreate(wxWindow *parent) { m_parent = parent; return true; }
@@ -58,16 +58,25 @@ protected:
 
     wxFontData m_fontData;
 
-    DECLARE_NO_COPY_CLASS(wxFontDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxFontDialogBase);
 };
 
+#if WXWIN_COMPATIBILITY_2_6
+    // deprecated interface, for compatibility only, don't use
+inline wxFontDialogBase::wxFontDialogBase(wxWindow *parent, const wxFontData *data)
+{ m_parent = parent; InitFontData(data); }
+
+inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
+{ InitFontData(data); return Create(parent); }
+#endif // WXWIN_COMPATIBILITY_2_6
+
 // ----------------------------------------------------------------------------
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 
-#if defined( __WXMAC_OSX__ ) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+#if defined( __WXOSX_MAC__ )
 //set to 1 to use native mac font and color dialogs
-#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 0
+#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 1
 #else
 //not supported on these platforms, leave 0
 #define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 0
@@ -75,9 +84,6 @@ protected:
 
 #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__)
@@ -86,12 +92,14 @@ protected:
     #define wxFontDialog wxGenericFontDialog
 #elif defined(__WXMSW__)
     #include "wx/msw/fontdlg.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/fontdlg.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/fontdlg.h"
 #elif defined(__WXPM__)
     #include "wx/os2/fontdlg.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/fontdlg.h"
+    #include "wx/osx/fontdlg.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -100,9 +108,9 @@ protected:
 
 // get the font from user and return it, returns wxNullFont if the dialog was
 // cancelled
-wxFont WXDLLEXPORT
-wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL,
-                  const wxFont& fontInit = wxNullFont, const wxString& caption = wxEmptyString);
+WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = NULL,
+                                          const wxFont& fontInit = wxNullFont,
+                                          const wxString& caption = wxEmptyString);
 
 #endif // wxUSE_FONTDLG