Fix showing slider label in wxMSW when wxSL_MIN_MAX_LABELS was not used.

[wxWidgets.git] / src / osx / cocoa / window.mm

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index aba5751431749cbdcc2e0381253705d29fbf8426..b859eba7cba2775c9f33b117663e3ac562df29b5 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -812,7 +812,8 @@ void wxOSX_drawRect(NSView* self, SEL _cmd, NSRect rect)
                 CGContextSaveGState( context );
 
                 CGContextSetFillColorWithColor( context, win->GetBackgroundColour().GetCGColor());
-                CGContextFillRect( context, NSRectToCGRect(rect) );
+                CGRect r = CGRectMake(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
+                CGContextFillRect( context, r );
 
                 CGContextRestoreGState( context );
             }
@@ -1443,7 +1444,7 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible )
 
 - (id)init:(wxWindow *)win
 {
-    [super init];
+    self = [super init];
 
     m_win = win;
     m_isDone = false;