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

Fix 32 bit compilation

Browse Source 
The class wxTextFieldCell was still declared, but not defined for 32 bit builds, move the define to NSTextFieldCell into the header.
This commit is contained in:
Stefan Csomor 2017-06-27 18:10:07 +02:00
parent 48d1c4ff1a
commit a352f80537
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/osx/cocoa/dataview.h
View File

@ -372,10 +372,13 @@ private:
// NSTextFieldCell customized to allow vertical alignment // NSTextFieldCell customized to allow vertical alignment
// ============================================================================ // ============================================================================
#ifndef __LP64__
#define wxTextFieldCell NSTextFieldCell
#else
@interface wxTextFieldCell : NSTextFieldCell @interface wxTextFieldCell : NSTextFieldCell
-(void) setWXAlignment:(int)alignment; -(void) setWXAlignment:(int)alignment;
@end @end
#endif
// ============================================================================ // ============================================================================
// wxImageTextCell // wxImageTextCell

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

@ -1258,7 +1258,6 @@ outlineView:(NSOutlineView*)outlineView
// error: instance variables may not be placed in class extension // error: instance variables may not be placed in class extension
// //
// Until this can be fixed, disable it to at least fix compilation. // Until this can be fixed, disable it to at least fix compilation.
#define wxTextFieldCell NSTextFieldCell
#else #else
@interface wxTextFieldCell () @interface wxTextFieldCell ()
{ {