X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72b4f026a20d35b2053df7764a63c88a0c108e08..e777bd14b3b3ce4a601fcc0df63d64e3dc75ae8e:/include/wx/os2/fontdlg.h diff --git a/include/wx/os2/fontdlg.h b/include/wx/os2/fontdlg.h index 6fb9d30bf8..fadd23e1cb 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 @@ -20,23 +20,41 @@ * Font dialog */ -class WXDLLEXPORT wxFontDialog: public wxFontDialogBase +class WXDLLIMPEXP_CORE wxFontDialog: public wxFontDialogBase { -DECLARE_DYNAMIC_CLASS(wxFontDialog) public: - wxFontDialog(); - wxFontDialog(wxWindow *parent, const wxFontData& rData); - - bool Create(wxWindow *parent, const wxFontData& rData); - - int ShowModal(); - wxFontData& GetFontData() { return m_fontData; } - -//EK protected: - wxWindow* m_dialogParent; - wxFontData m_fontData; -}; + wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } + wxFontDialog (wxWindow* pParent) : wxFontDialogBase(pParent) { Create(pParent); } + wxFontDialog( wxWindow* pParent + ,const wxFontData& rData + ) + : wxFontDialogBase( pParent + ,rData + ) + { + Create( pParent + ,rData + ); + } + + virtual int ShowModal(); + +#if WXWIN_COMPATIBILITY_2_6 + // + // Deprecated interface, don't use + // + 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_ -