OSX reshuffling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -19,11 +19,18 @@
|
||||
* 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
|
||||
|
||||
#if wxMAC_USE_EXPERIMENTAL_FONTDIALOG
|
||||
#ifndef wxOSX_USE_EXPERIMENTAL_FONTDIALOG
|
||||
#define wxOSX_USE_EXPERIMENTAL_FONTDIALOG 1
|
||||
#endif
|
||||
|
||||
#if wxOSX_USE_EXPERIMENTAL_FONTDIALOG
|
||||
|
||||
class WXDLLIMPEXP_CORE wxFontDialog : public wxDialog
|
||||
{
|
||||
@@ -45,7 +52,7 @@ protected:
|
||||
|
||||
extern "C" int RunMixedFontDialog(wxFontDialog* dialog) ;
|
||||
|
||||
#else // wxMAC_USE_EXPERIMENTAL_FONTDIALOG
|
||||
#else // wxOSX_USE_EXPERIMENTAL_FONTDIALOG
|
||||
|
||||
#if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
|
||||
|
||||
|
Reference in New Issue
Block a user