X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbc65e2760f79e0296c7e8b49ec6791d62070d3e..880d76dfb12d4e8466df30d641bb25c6f71bd398:/include/wx/msw/fontdlg.h diff --git a/include/wx/msw/fontdlg.h b/include/wx/msw/fontdlg.h index 2114a3f55a..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: @@ -12,32 +12,35 @@ #ifndef _WX_MSW_FONTDLG_H_ #define _WX_MSW_FONTDLG_H_ -#ifdef __GNUG__ - #pragma interface "fontdlg.h" -#endif - // ---------------------------------------------------------------------------- // wxFontDialog // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFontDialog : public wxFontDialogBase +class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase { public: - wxFontDialog() : wxFontDialogBase() { } - wxFontDialog(wxWindow *parent) : wxFontDialogBase(parent) { } + wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } + wxFontDialog(wxWindow *parent) + : wxFontDialogBase(parent) { Create(parent); } wxFontDialog(wxWindow *parent, const wxFontData& data) - : wxFontDialogBase(parent, data) { } + : wxFontDialogBase(parent, data) { Create(parent, data); } virtual int ShowModal(); - // deprecated - wxFontDialog(wxWindow *parent, wxFontData *data) - : wxFontDialogBase(parent, data) { } +#if WXWIN_COMPATIBILITY_2_6 + // deprecated interface, don't use + wxDEPRECATED( wxFontDialog(wxWindow *parent, const wxFontData *data) ); +#endif // WXWIN_COMPATIBILITY_2_6 protected: - DECLARE_DYNAMIC_CLASS(wxFontDialog) + 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_ -