correct access for virtuals

[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 6eaabc4f735e1df8af71eb67b1113243d41552f5..f2c7fb5a60e389e7a554e1854ac9e65e69afbe1f 100644 (file)
--- 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"
 
 #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
 
 /*!
 #if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
 /*!


@@ -46,10 +78,6 @@ class WXDLLEXPORT wxCheckBox;
 #endif
     // !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
 #endif
     // !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 

-/*
- * Font dialog
- */
- 

 class WXDLLEXPORT wxFontDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxFontDialog)
 class WXDLLEXPORT wxFontDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxFontDialog)


@@ -132,6 +160,8 @@ protected:
     void*              m_pEventHandlerRef;
 };
 
     void*              m_pEventHandlerRef;
 };
 

+#endif
+

 #endif
     // _WX_FONTDLG_H_
 
 #endif
     // _WX_FONTDLG_H_