X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..d8416992be62932d7dbc91a27a8bcf4b4a6db390:/include/wx/mac/carbon/fontdlg.h diff --git a/include/wx/mac/carbon/fontdlg.h b/include/wx/mac/carbon/fontdlg.h index c2fb0706b9..33fdd4bb7c 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,8 +20,12 @@ */ #ifndef wxMAC_USE_EXPERIMENTAL_FONTDIALOG +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 +#define wxMAC_USE_EXPERIMENTAL_FONTDIALOG 0 +#else #define wxMAC_USE_EXPERIMENTAL_FONTDIALOG 1 #endif +#endif #if wxMAC_USE_EXPERIMENTAL_FONTDIALOG @@ -55,13 +59,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 @@ -157,11 +161,10 @@ public: protected: wxWindow* m_dialogParent; wxFontData m_fontData; - void* m_pEventHandlerRef; + void* m_pEventHandlerRef; }; #endif #endif // _WX_FONTDLG_H_ -