Clear columns on destruction

[wxWidgets.git] / include / wx / mac / carbon / fontdlg.h

diff --git a/include/wx/mac/carbon/fontdlg.h b/include/wx/mac/carbon/fontdlg.h
index b9533bea69b065a1d672f4f183d3590edb4179ff..48af50e871bb6d70b9e0295e7f272852fc72fb09 100644 (file)
--- a/include/wx/mac/carbon/fontdlg.h
+++ b/include/wx/mac/carbon/fontdlg.h
@@ -20,16 +20,12 @@
  */
 
 #ifndef wxMAC_USE_EXPERIMENTAL_FONTDIALOG
  */
 
 #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
 #define wxMAC_USE_EXPERIMENTAL_FONTDIALOG 1
 #endif

-#endif

 
 #if wxMAC_USE_EXPERIMENTAL_FONTDIALOG
 
 
 #if wxMAC_USE_EXPERIMENTAL_FONTDIALOG
 

-class WXDLLEXPORT wxFontDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxFontDialog : public wxDialog

 {
 public:
     wxFontDialog();
 {
 public:
     wxFontDialog();


@@ -59,13 +55,13 @@ extern "C" int RunMixedFontDialog(wxFontDialog* dialog) ;
 
 class wxFontColourSwatchCtrl;
 class wxFontPreviewCtrl;
 
 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
 
 /*!
  * Control identifiers


@@ -82,7 +78,7 @@ class WXDLLEXPORT wxCheckBox;
 #endif
     // !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
 #endif
     // !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 

-class WXDLLEXPORT wxFontDialog: public wxDialog
+class WXDLLIMPEXP_CORE wxFontDialog: public wxDialog

 {
 DECLARE_DYNAMIC_CLASS(wxFontDialog)
 
 {
 DECLARE_DYNAMIC_CLASS(wxFontDialog)