From b84c33c242f3ac31d1d4d604cf9dcd415e53895c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 17 Oct 2013 22:26:50 +0000 Subject: [PATCH] Fix syntax error in the dialogs sample after r75028. An extra "&&" was left in the preprocessor check, remove it. Also remove the check for __WXMAC_OSX__ as it's unneeded as USE_NATIVE_FONT_DIALOG_FOR_MACOSX is only defined as 1 under wxOSX and, actually, wrong, as __WXMAC_OSX__ is never defined anywhere and was probably a corruption of __WXOSX_MAC__ in the first place. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/dialogs/dialogs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h index 24dd2208ec..9ec21f0e01 100644 --- a/samples/dialogs/dialogs.h +++ b/samples/dialogs/dialogs.h @@ -52,7 +52,7 @@ of MSW, MAC and OS2 #define USE_WXMAC 0 #endif -#if defined(__WXMAC_OSX__) && && USE_NATIVE_FONT_DIALOG_FOR_MACOSX +#if USE_NATIVE_FONT_DIALOG_FOR_MACOSX #define USE_WXMACFONTDLG 1 #else #define USE_WXMACFONTDLG 0