From a2056d7314078d5e6c4d8f4eb4daeaa2bde41678 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 16 Jul 2017 14:54:28 +0200 Subject: [PATCH] Fix 32 bit wxOSX build after wrong merge Correct wrong merge of 1c0ecec225130bcb318474bf01dddc3c4e5c0004, the checks for __LP64__ should have been removed in the merge commit aaae5ef702a057e6e639ef9f6004da6a52aeab17 but were mistakenly left in. See https://github.com/wxWidgets/wxWidgets/pull/377 --- include/wx/osx/cocoa/dataview.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/wx/osx/cocoa/dataview.h b/include/wx/osx/cocoa/dataview.h index 7d82302a44..8b8a1422cd 100644 --- a/include/wx/osx/cocoa/dataview.h +++ b/include/wx/osx/cocoa/dataview.h @@ -372,9 +372,6 @@ private: // NSTextFieldCell customized to allow vertical alignment // ============================================================================ -#ifndef __LP64__ - #define wxTextFieldCell NSTextFieldCell -#else @interface wxTextFieldCell : NSTextFieldCell { @private @@ -384,7 +381,6 @@ private: -(void) setWXAlignment:(int)alignment; @end -#endif // ============================================================================ // wxImageTextCell