X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..0ecd03525b34edba886ca83ff724265cd912dbbd:/include/wx/msw/fontdlg.h diff --git a/include/wx/msw/fontdlg.h b/include/wx/msw/fontdlg.h index 24d11c8535..b20a79d7ce 100644 --- a/include/wx/msw/fontdlg.h +++ b/include/wx/msw/fontdlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fontdlg.h +// Name: wx/msw/fontdlg.h // Purpose: wxFontDialog class // Author: Julian Smart // Modified by: @@ -16,7 +16,7 @@ // wxFontDialog // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFontDialog : public wxFontDialogBase +class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase { public: wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } @@ -27,14 +27,20 @@ public: virtual int ShowModal(); +#if WXWIN_COMPATIBILITY_2_6 // deprecated interface, don't use - wxFontDialog(wxWindow *parent, const wxFontData *data) - : wxFontDialogBase(parent, data) { Create(parent, data); } + wxDEPRECATED( wxFontDialog(wxWindow *parent, const wxFontData *data) ); +#endif // WXWIN_COMPATIBILITY_2_6 protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog) }; +#if WXWIN_COMPATIBILITY_2_6 + // deprecated interface, don't use +inline wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData *data) + : wxFontDialogBase(parent) { InitFontData(data); Create(parent); } +#endif // WXWIN_COMPATIBILITY_2_6 + #endif // _WX_MSW_FONTDLG_H_ -