Added wxDataViewCustomRenderer::RenderText() for renderer simple text in platform...

[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 f2c7fb5a60e389e7a554e1854ac9e65e69afbe1f..33fdd4bb7c098323cb1cdd014157ad278fc94be6 100644 (file)
--- 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
 
@@ -30,7 +34,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 +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
@@ -89,7 +93,7 @@ DECLARE_EVENT_TABLE()
 public:
     wxFontDialog();
     wxFontDialog(wxWindow *parent, const wxFontData& data);
-    ~wxFontDialog();
+    virtual ~wxFontDialog();
 
     bool Create(wxWindow *parent, const wxFontData& data);
 
@@ -157,11 +161,10 @@ public:
 protected:
     wxWindow*   m_dialogParent;
     wxFontData  m_fontData;
-    void*              m_pEventHandlerRef;
+    void*       m_pEventHandlerRef;
 };
 
 #endif
 
 #endif
     // _WX_FONTDLG_H_
-