X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbc65e2760f79e0296c7e8b49ec6791d62070d3e..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/gtk1/fontdlg.h?ds=sidebyside diff --git a/include/wx/gtk1/fontdlg.h b/include/wx/gtk1/fontdlg.h index 20a92375e8..bb82bf8d9a 100644 --- a/include/wx/gtk1/fontdlg.h +++ b/include/wx/gtk1/fontdlg.h @@ -1,9 +1,8 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fontdlgg.h +// Name: wx/gtk1/fontdlg.h // Purpose: wxFontDialog // Author: Robert Roebling // Created: -// RCS-ID: $Id$ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -11,15 +10,11 @@ #ifndef __GTK_FONTDLGH__ #define __GTK_FONTDLGH__ -#ifdef __GNUG__ -#pragma interface "fontdlg.h" -#endif - //----------------------------------------------------------------------------- // wxFontDialog //----------------------------------------------------------------------------- -class wxFontDialog : public wxFontDialogBase +class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase { public: wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } @@ -33,9 +28,10 @@ public: // implementation only void SetChosenFont(const char *name); +#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: // create the GTK dialog @@ -45,4 +41,10 @@ private: DECLARE_DYNAMIC_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