X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab7ce33c563651f790f99d64ee56727706047ae3..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/gtk/fontdlg.h?ds=sidebyside diff --git a/include/wx/gtk/fontdlg.h b/include/wx/gtk/fontdlg.h index f777cbe96f..483c3e73ac 100644 --- a/include/wx/gtk/fontdlg.h +++ b/include/wx/gtk/fontdlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fontdlgg.h +// Name: wx/gtk/fontdlg.h // Purpose: wxFontDialog // Author: Robert Roebling // Created: @@ -8,18 +8,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTK_FONTDLGH__ -#define __GTK_FONTDLGH__ - -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "fontdlg.h" -#endif +#ifndef _WX_GTK_FONTDLG_H_ +#define _WX_GTK_FONTDLG_H_ //----------------------------------------------------------------------------- // wxFontDialog //----------------------------------------------------------------------------- -class wxFontDialog : public wxFontDialogBase +class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase { public: wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } @@ -30,19 +26,22 @@ public: virtual ~wxFontDialog(); - // 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 virtual bool DoCreate(wxWindow *parent); -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