X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbc65e2760f79e0296c7e8b49ec6791d62070d3e..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/gtk/fontdlg.h diff --git a/include/wx/gtk/fontdlg.h b/include/wx/gtk/fontdlg.h index 20a92375e8..4c5b57a3e3 100644 --- a/include/wx/gtk/fontdlg.h +++ b/include/wx/gtk/fontdlg.h @@ -1,25 +1,20 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fontdlgg.h +// Name: wx/gtk/fontdlg.h // Purpose: wxFontDialog // Author: Robert Roebling // Created: -// RCS-ID: $Id$ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTK_FONTDLGH__ -#define __GTK_FONTDLGH__ - -#ifdef __GNUG__ -#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 +25,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