Fix wxOSX build in 32 bits
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:
@@ -1252,6 +1252,14 @@ outlineView:(NSOutlineView*)outlineView
|
|||||||
// wxTextFieldCell
|
// 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 ()
|
@interface wxTextFieldCell ()
|
||||||
{
|
{
|
||||||
int _wxAlignment;
|
int _wxAlignment;
|
||||||
@@ -1324,6 +1332,7 @@ outlineView:(NSOutlineView*)outlineView
|
|||||||
}
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
#endif // 32/64 bits
|
||||||
|
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
@@ -2734,8 +2743,10 @@ void wxDataViewRenderer::OSXUpdateAlignment()
|
|||||||
int align = GetEffectiveAlignment();
|
int align = GetEffectiveAlignment();
|
||||||
NSCell *cell = GetNativeData()->GetColumnCell();
|
NSCell *cell = GetNativeData()->GetColumnCell();
|
||||||
[cell setAlignment:ConvertToNativeHorizontalTextAlignment(align)];
|
[cell setAlignment:ConvertToNativeHorizontalTextAlignment(align)];
|
||||||
|
#ifdef _LP64
|
||||||
if ([cell respondsToSelector:@selector(setWXAlignment:)])
|
if ([cell respondsToSelector:@selector(setWXAlignment:)])
|
||||||
[(wxTextFieldCell*)cell setWXAlignment:align];
|
[(wxTextFieldCell*)cell setWXAlignment:align];
|
||||||
|
#endif // _LP64
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxDataViewRenderer::SetMode(wxDataViewCellMode mode)
|
void wxDataViewRenderer::SetMode(wxDataViewCellMode mode)
|
||||||
|
Reference in New Issue
Block a user