X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..5e4903f5cce60451bbf649dd23a747571c3d2854:/include/wx/msw/fontdlg.h diff --git a/include/wx/msw/fontdlg.h b/include/wx/msw/fontdlg.h index b68bb6ccf2..92d6078b45 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,10 +12,6 @@ #ifndef _WX_MSW_FONTDLG_H_ #define _WX_MSW_FONTDLG_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "fontdlg.h" -#endif - // ---------------------------------------------------------------------------- // wxFontDialog // ---------------------------------------------------------------------------- @@ -31,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_ -