fix wxOS2 build where OpenGL headers are available but there's no wxGlCanvas implemen...

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

diff --git a/include/wx/osx/carbon/fontdlg.h b/include/wx/osx/carbon/fontdlg.h
index 48af50e871bb6d70b9e0295e7f272852fc72fb09..ca96ff10c9ff054863113019bfe86d0a8a9edb4f 100644 (file)
--- a/include/wx/osx/carbon/fontdlg.h
+++ b/include/wx/osx/carbon/fontdlg.h
@@ -19,11 +19,18 @@
  * Font dialog
  */
 
  * Font dialog
  */
 

-#ifndef wxMAC_USE_EXPERIMENTAL_FONTDIALOG
-#define wxMAC_USE_EXPERIMENTAL_FONTDIALOG 1
+/*
+ * support old notation
+ */
+#ifdef wxMAC_USE_EXPERIMENTAL_FONTDIALOG
+#define wxOSX_USE_EXPERIMENTAL_FONTDIALOG wxMAC_USE_EXPERIMENTAL_FONTDIALOG
+#endif
+
+#ifndef wxOSX_USE_EXPERIMENTAL_FONTDIALOG
+#define wxOSX_USE_EXPERIMENTAL_FONTDIALOG 1

 #endif
 
 #endif
 

-#if wxMAC_USE_EXPERIMENTAL_FONTDIALOG
+#if wxOSX_USE_EXPERIMENTAL_FONTDIALOG

 
 class WXDLLIMPEXP_CORE wxFontDialog : public wxDialog
 {
 
 class WXDLLIMPEXP_CORE wxFontDialog : public wxDialog
 {


@@ -45,7 +52,7 @@ protected:
 
 extern "C" int RunMixedFontDialog(wxFontDialog* dialog) ;
 
 
 extern "C" int RunMixedFontDialog(wxFontDialog* dialog) ;
 

-#else // wxMAC_USE_EXPERIMENTAL_FONTDIALOG
+#else // wxOSX_USE_EXPERIMENTAL_FONTDIALOG

 
 #if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
 
 #if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX