diff --git a/include/wx/osx/cocoa/dataview.h b/include/wx/osx/cocoa/dataview.h index 7b9a8611a9..afbc45444e 100644 --- a/include/wx/osx/cocoa/dataview.h +++ b/include/wx/osx/cocoa/dataview.h @@ -378,8 +378,8 @@ private: @interface wxTextFieldCell : NSTextFieldCell { @private - int _wxAlignment; - BOOL _adjustRect; + int wxAlignment; + BOOL adjustRect; } -(void) setWXAlignment:(int)alignment; diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm index 3d2af4c3ad..211bb5ae70 100644 --- a/src/osx/cocoa/dataview.mm +++ b/src/osx/cocoa/dataview.mm @@ -1256,8 +1256,8 @@ outlineView:(NSOutlineView*)outlineView - (void)setWXAlignment:(int)alignment { - _wxAlignment = alignment; - _adjustRect = (alignment & (wxALIGN_CENTRE_VERTICAL | wxALIGN_BOTTOM)) != 0; + wxAlignment = alignment; + adjustRect = (alignment & (wxALIGN_CENTRE_VERTICAL | wxALIGN_BOTTOM)) != 0; } // These three overrides implement vertical alignment of text cells. @@ -1269,7 +1269,7 @@ outlineView:(NSOutlineView*)outlineView // Get the parent's idea of where we should draw NSRect r = [super drawingRectForBounds:theRect]; - if (!_adjustRect) + if (!adjustRect) return r; if (theRect.size.height <= MINIMUM_NATIVE_ROW_HEIGHT) return r; // don't mess with default-sized rows as they are centered @@ -1277,12 +1277,12 @@ outlineView:(NSOutlineView*)outlineView NSSize bestSize = [self cellSizeForBounds:theRect]; if (bestSize.height < r.size.height) { - if (_wxAlignment & wxALIGN_CENTER_VERTICAL) + if (wxAlignment & wxALIGN_CENTER_VERTICAL) { r.origin.y += int(r.size.height - bestSize.height) / 2; r.size.height = bestSize.height; } - else if (_wxAlignment & wxALIGN_BOTTOM) + else if (wxAlignment & wxALIGN_BOTTOM) { r.origin.y += r.size.height - bestSize.height; r.size.height = bestSize.height; @@ -1294,26 +1294,26 @@ outlineView:(NSOutlineView*)outlineView - (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(NSInteger)selStart length:(NSInteger)selLength { - BOOL oldAdjustRect = _adjustRect; + BOOL oldAdjustRect = adjustRect; if (oldAdjustRect) { aRect = [self drawingRectForBounds:aRect]; - _adjustRect = NO; + adjustRect = NO; } [super selectWithFrame:aRect inView:controlView editor:textObj delegate:anObject start:selStart length:selLength]; - _adjustRect = oldAdjustRect; + adjustRect = oldAdjustRect; } - (void)editWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject event:(NSEvent *)theEvent { - BOOL oldAdjustRect = _adjustRect; + BOOL oldAdjustRect = adjustRect; if (oldAdjustRect) { aRect = [self drawingRectForBounds:aRect]; - _adjustRect = NO; + adjustRect = NO; } [super editWithFrame:aRect inView:controlView editor:textObj delegate:anObject event:theEvent]; - _adjustRect = oldAdjustRect; + adjustRect = oldAdjustRect; } @end