X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/509b4eccfeb7e13a30d3192c4cb1a42b2aed3f70..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/mac/carbon/fontdlg.h?ds=sidebyside diff --git a/include/wx/mac/carbon/fontdlg.h b/include/wx/mac/carbon/fontdlg.h index 29bf4742b9..eec6a51be5 100644 --- a/include/wx/mac/carbon/fontdlg.h +++ b/include/wx/mac/carbon/fontdlg.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fontdlg.h -// Purpose: wxFontDialog class using fonts window services (10.2+). +// Name: wx/mac/carbon/fontdlg.h +// Purpose: wxFontDialog class using fonts window services (10.2+). // Author: Ryan Norton // Modified by: // Created: 2004-09-25 @@ -20,7 +20,7 @@ */ #ifndef wxMAC_USE_EXPERIMENTAL_FONTDIALOG -#define wxMAC_USE_EXPERIMENTAL_FONTDIALOG 0 +#define wxMAC_USE_EXPERIMENTAL_FONTDIALOG 1 #endif #if wxMAC_USE_EXPERIMENTAL_FONTDIALOG @@ -30,7 +30,7 @@ class WXDLLEXPORT wxFontDialog : public wxDialog public: wxFontDialog(); wxFontDialog(wxWindow *parent, const wxFontData& data); - ~wxFontDialog(); + virtual ~wxFontDialog(); bool Create(wxWindow *parent, const wxFontData& data); @@ -55,13 +55,13 @@ extern "C" int RunMixedFontDialog(wxFontDialog* dialog) ; class wxFontColourSwatchCtrl; class wxFontPreviewCtrl; -class WXDLLEXPORT wxSpinCtrl; -class WXDLLEXPORT wxSpinEvent; -class WXDLLEXPORT wxListBox; -class WXDLLEXPORT wxChoice; -class WXDLLEXPORT wxButton; -class WXDLLEXPORT wxStaticText; -class WXDLLEXPORT wxCheckBox; +class WXDLLIMPEXP_FWD_CORE wxSpinCtrl; +class WXDLLIMPEXP_FWD_CORE wxSpinEvent; +class WXDLLIMPEXP_FWD_CORE wxListBox; +class WXDLLIMPEXP_FWD_CORE wxChoice; +class WXDLLIMPEXP_FWD_CORE wxButton; +class WXDLLIMPEXP_FWD_CORE wxStaticText; +class WXDLLIMPEXP_FWD_CORE wxCheckBox; /*! * Control identifiers @@ -89,7 +89,7 @@ DECLARE_EVENT_TABLE() public: wxFontDialog(); wxFontDialog(wxWindow *parent, const wxFontData& data); - ~wxFontDialog(); + virtual ~wxFontDialog(); bool Create(wxWindow *parent, const wxFontData& data); @@ -157,11 +157,10 @@ public: protected: wxWindow* m_dialogParent; wxFontData m_fontData; - void* m_pEventHandlerRef; + void* m_pEventHandlerRef; }; #endif #endif // _WX_FONTDLG_H_ -