From 22216b70e7281432c0846ae48b0462c470ee514b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 21 Dec 2016 00:15:15 +0100 Subject: [PATCH] Fix wxOSX build in 32 bits Exclude code added in 92dc929b3f5d2133963806511f3ec4cbdd66d921 from build in 32 bit mode because it fails to compile, apparently due to missing Objective-C runtime support for per-instance variables in 32 bit runtime. --- src/osx/cocoa/dataview.mm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm index bf79ccd47d..9a7d9a8a08 100644 --- a/src/osx/cocoa/dataview.mm +++ b/src/osx/cocoa/dataview.mm @@ -1252,6 +1252,14 @@ outlineView:(NSOutlineView*)outlineView // wxTextFieldCell // ============================================================================ +#ifndef _LP64 + // The code below doesn't compile in 32 bits failing with + // + // 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 () { int _wxAlignment; @@ -1324,6 +1332,7 @@ outlineView:(NSOutlineView*)outlineView } @end +#endif // 32/64 bits // ============================================================================ @@ -2734,8 +2743,10 @@ void wxDataViewRenderer::OSXUpdateAlignment() int align = GetEffectiveAlignment(); NSCell *cell = GetNativeData()->GetColumnCell(); [cell setAlignment:ConvertToNativeHorizontalTextAlignment(align)]; +#ifdef _LP64 if ([cell respondsToSelector:@selector(setWXAlignment:)]) [(wxTextFieldCell*)cell setWXAlignment:align]; +#endif // _LP64 } void wxDataViewRenderer::SetMode(wxDataViewCellMode mode)