X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/os2/fontdlg.h?ds=sidebyside diff --git a/include/wx/os2/fontdlg.h b/include/wx/os2/fontdlg.h index 9a836ab5f5..27031b6fcf 100644 --- a/include/wx/os2/fontdlg.h +++ b/include/wx/os2/fontdlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fontdlg.h +// Name: wx/os2/fontdlg.h // Purpose: wxFontDialog class. Use generic version if no // platform-specific implementation. // Author: David Webster @@ -7,7 +7,7 @@ // Created: 10/06/99 // RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FONTDLG_H_ @@ -39,24 +39,22 @@ public: virtual int ShowModal(); +#if WXWIN_COMPATIBILITY_2_6 // // Deprecated interface, don't use // - wxFontDialog( wxWindow* pParent - ,const wxFontData* pData - ) - : wxFontDialogBase( pParent - ,pData - ) - { - Create( pParent - ,pData - ); - } + wxDEPRECATED( wxFontDialog( wxWindow* pParent, const wxFontData* pData ) ); +#endif // WXWIN_COMPATIBILITY_2_6 + protected: DECLARE_DYNAMIC_CLASS(wxFontDialog) }; // end of CLASS 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_FONTDLG_H_ -