AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix wxOSX build in 32 bits

Browse Source 
Exclude code added in 92dc929b3f 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.
This commit is contained in:
Vadim Zeitlin 2016-12-21 00:15:15 +01:00
parent fcde9e1f40
commit 22216b70e7
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/osx/cocoa/dataview.mm
View File

@ -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)