From a352f80537b6b464288acef0910de11023182e5d Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 27 Jun 2017 18:10:07 +0200 Subject: [PATCH] Fix 32 bit compilation The class wxTextFieldCell was still declared, but not defined for 32 bit builds, move the define to NSTextFieldCell into the header. --- include/wx/osx/cocoa/dataview.h | 5 ++++- src/osx/cocoa/dataview.mm | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/wx/osx/cocoa/dataview.h b/include/wx/osx/cocoa/dataview.h index 2a9f02860d..5f6583b886 100644 --- a/include/wx/osx/cocoa/dataview.h +++ b/include/wx/osx/cocoa/dataview.h @@ -372,10 +372,13 @@ private: // NSTextFieldCell customized to allow vertical alignment // ============================================================================ +#ifndef __LP64__ + #define wxTextFieldCell NSTextFieldCell +#else @interface wxTextFieldCell : NSTextFieldCell -(void) setWXAlignment:(int)alignment; @end - +#endif // ============================================================================ // wxImageTextCell diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm index ee1e7ff180..d37da1a447 100644 --- a/src/osx/cocoa/dataview.mm +++ b/src/osx/cocoa/dataview.mm @@ -1258,7 +1258,6 @@ outlineView:(NSOutlineView*)outlineView // error: instance variables may not be placed in class extension // // Until this can be fixed, disable it to at least fix compilation. - #define wxTextFieldCell NSTextFieldCell #else @interface wxTextFieldCell () {