(blind) compilation fixes after latest changes

[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..b9533bea69b065a1d672f4f183d3590edb4179ff 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
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2004-09-25


@@ -20,8 +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
 


@@ -30,7 +34,7 @@ class WXDLLEXPORT wxFontDialog : public wxDialog
 public:
     wxFontDialog();
     wxFontDialog(wxWindow *parent, const wxFontData& data);
 public:
     wxFontDialog();
     wxFontDialog(wxWindow *parent, const wxFontData& data);

-    ~wxFontDialog();
+    virtual ~wxFontDialog();

 
     bool Create(wxWindow *parent, const wxFontData& data);
 
 
     bool Create(wxWindow *parent, const wxFontData& data);
 


@@ -89,7 +93,7 @@ DECLARE_EVENT_TABLE()
 public:
     wxFontDialog();
     wxFontDialog(wxWindow *parent, const wxFontData& data);
 public:
     wxFontDialog();
     wxFontDialog(wxWindow *parent, const wxFontData& data);

-    ~wxFontDialog();
+    virtual ~wxFontDialog();

 
     bool Create(wxWindow *parent, const wxFontData& data);
 
 
     bool Create(wxWindow *parent, const wxFontData& data);
 


@@ -157,11 +161,10 @@ public:
 protected:
     wxWindow*   m_dialogParent;
     wxFontData  m_fontData;
 protected:
     wxWindow*   m_dialogParent;
     wxFontData  m_fontData;

-    void*              m_pEventHandlerRef;
+    void*       m_pEventHandlerRef;

 };
 
 #endif
 
 #endif
     // _WX_FONTDLG_H_
 };
 
 #endif
 
 #endif
     // _WX_FONTDLG_H_

-