X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfe590ae1d2d65ddc03c13171621cfa1b233ac7b..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/fontdlg.h diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h index 778dbd3a25..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 @@ -90,7 +99,7 @@ protected: #elif defined(__WXPM__) #include "wx/os2/fontdlg.h" #elif defined(__WXMAC__) - #include "wx/mac/fontdlg.h" + #include "wx/osx/fontdlg.h" #endif // ---------------------------------------------------------------------------- @@ -99,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