X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbc65e2760f79e0296c7e8b49ec6791d62070d3e..38113684016c5ecbc65985bee3c6c7b318c012cf:/include/wx/msw/fontdlg.h diff --git a/include/wx/msw/fontdlg.h b/include/wx/msw/fontdlg.h index 2114a3f55a..24d11c8535 100644 --- a/include/wx/msw/fontdlg.h +++ b/include/wx/msw/fontdlg.h @@ -12,10 +12,6 @@ #ifndef _WX_MSW_FONTDLG_H_ #define _WX_MSW_FONTDLG_H_ -#ifdef __GNUG__ - #pragma interface "fontdlg.h" -#endif - // ---------------------------------------------------------------------------- // wxFontDialog // ---------------------------------------------------------------------------- @@ -23,19 +19,20 @@ class WXDLLEXPORT wxFontDialog : public wxFontDialogBase { public: - wxFontDialog() : wxFontDialogBase() { } - wxFontDialog(wxWindow *parent) : wxFontDialogBase(parent) { } + wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } + wxFontDialog(wxWindow *parent) + : wxFontDialogBase(parent) { Create(parent); } wxFontDialog(wxWindow *parent, const wxFontData& data) - : wxFontDialogBase(parent, data) { } + : wxFontDialogBase(parent, data) { Create(parent, data); } virtual int ShowModal(); - // deprecated - wxFontDialog(wxWindow *parent, wxFontData *data) - : wxFontDialogBase(parent, data) { } + // deprecated interface, don't use + wxFontDialog(wxWindow *parent, const wxFontData *data) + : wxFontDialogBase(parent, data) { Create(parent, data); } protected: - DECLARE_DYNAMIC_CLASS(wxFontDialog) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog) }; #endif