Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 32 bit wxOSX build after wrong merge

Browse Source 
Correct wrong merge of 1c0ecec225, the
checks for __LP64__ should have been removed in the merge commit
aaae5ef702 but were mistakenly left in.

See https://github.com/wxWidgets/wxWidgets/pull/377
This commit is contained in:
Vadim Zeitlin
2017-07-16 14:54:28 +02:00
parent dfd03f5fee
commit a2056d7314
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -372,9 +372,6 @@ 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
{ {
@private @private
@@ -384,7 +381,6 @@ private:
-(void) setWXAlignment:(int)alignment; -(void) setWXAlignment:(int)alignment;
@end @end
#endif
// ============================================================================ // ============================================================================
// wxImageTextCell // wxImageTextCell