X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a62848fdba49396eba4f52c037d2dc82130274b4..33f3e2b31ed781ba1446b49ec6d3e226c0a5c652:/include/wx/fontdlg.h diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h index e0eeec467c..c963c73364 100644 --- a/include/wx/fontdlg.h +++ b/include/wx/fontdlg.h @@ -17,13 +17,13 @@ #if wxUSE_FONTDLG #include "wx/dialog.h" // the base class -#include "wx/cmndata.h" // wxFontData +#include "wx/fontdata.h" // ---------------------------------------------------------------------------- // wxFontDialog interface // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFontDialogBase : public wxDialog +class WXDLLIMPEXP_CORE wxFontDialogBase : public wxDialog { public: // create the font dialog @@ -37,18 +37,16 @@ public: bool Create(wxWindow *parent, const wxFontData& data) { InitFontData(&data); return Create(parent); } - virtual ~wxFontDialogBase(); - // retrieve the font data 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 +56,32 @@ 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( __WXOSX_MAC__ ) +//set to 1 to use native mac font and color dialogs +#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 1 +#else +//not supported on these platforms, leave 0 +#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 0 +#endif + #if defined(__WXUNIVERSAL__) || \ defined(__WXMOTIF__) || \ - defined(__WXMAC__) || \ defined(__WXCOCOA__) || \ defined(__WXWINCE__) || \ defined(__WXGPE__) @@ -76,10 +90,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/osx/fontdlg.h" #endif // ---------------------------------------------------------------------------- @@ -88,9 +106,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); +WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = NULL, + const wxFont& fontInit = wxNullFont, + const wxString& caption = wxEmptyString); #endif // wxUSE_FONTDLG