X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfe590ae1d2d65ddc03c13171621cfa1b233ac7b..a69aabc360d54a93e355fab72c6513c75aaa7337:/include/wx/mac/carbon/fontdlg.h

diff --git a/include/wx/mac/carbon/fontdlg.h b/include/wx/mac/carbon/fontdlg.h
index 6eaabc4f73..f2c7fb5a60 100644
--- a/include/wx/mac/carbon/fontdlg.h
+++ b/include/wx/mac/carbon/fontdlg.h
@@ -15,6 +15,38 @@
 #include "wx/dialog.h"
 #include "wx/cmndata.h"
 
+/*
+ * Font dialog
+ */
+
+#ifndef wxMAC_USE_EXPERIMENTAL_FONTDIALOG
+#define wxMAC_USE_EXPERIMENTAL_FONTDIALOG 1
+#endif
+
+#if wxMAC_USE_EXPERIMENTAL_FONTDIALOG
+
+class WXDLLEXPORT wxFontDialog : public wxDialog
+{
+public:
+    wxFontDialog();
+    wxFontDialog(wxWindow *parent, const wxFontData& data);
+    ~wxFontDialog();
+
+    bool Create(wxWindow *parent, const wxFontData& data);
+
+    int ShowModal();
+    wxFontData& GetFontData() { return m_fontData; }
+
+protected:
+    wxFontData m_fontData;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog)
+};
+
+extern "C" int RunMixedFontDialog(wxFontDialog* dialog) ;
+
+#else // wxMAC_USE_EXPERIMENTAL_FONTDIALOG
+
 #if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
 /*!
@@ -46,10 +78,6 @@ class WXDLLEXPORT wxCheckBox;
 #endif
     // !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
-/*
- * Font dialog
- */
- 
 class WXDLLEXPORT wxFontDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxFontDialog)
@@ -132,6 +160,8 @@ protected:
     void*		m_pEventHandlerRef;
 };
 
+#endif
+
 #endif
     // _WX_FONTDLG_H_