X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfe590ae1d2d65ddc03c13171621cfa1b233ac7b..374e9b153fcb3f4e547929ccc9b80bda76fd6f6e:/include/wx/fontdlg.h?ds=inline diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h index 778dbd3a25..da2fba946d 100644 --- a/include/wx/fontdlg.h +++ b/include/wx/fontdlg.h @@ -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; } @@ -61,6 +61,15 @@ protected: DECLARE_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 // ----------------------------------------------------------------------------