From f599a4150940488037e48490e0041171884682ad Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 8 Jun 2011 22:48:29 +0000
Subject: [PATCH 1/1] adapting to init pattern

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/osx/cocoa/nonownedwnd.mm | 2 +-
 src/osx/cocoa/notebook.mm    | 2 +-
 src/osx/cocoa/slider.mm      | 7 +++++++
 src/osx/cocoa/toolbar.mm     | 4 ++--
 src/osx/cocoa/window.mm      | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index 8a93d55f92..e6380f5a95 100644
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -271,7 +271,7 @@ extern int wxOSXGetIdFromSelector(SEL action );
 
 - (id) init
 {
-    [super init];
+    self = [super init];
     return self;
 }
 
diff --git a/src/osx/cocoa/notebook.mm b/src/osx/cocoa/notebook.mm
index 2adea3cbbc..ff4e70b7c7 100644
--- a/src/osx/cocoa/notebook.mm
+++ b/src/osx/cocoa/notebook.mm
@@ -49,7 +49,7 @@
 
 - (id) init
 {
-    [super init];
+    self = [super init];
     return self;
 }
 
diff --git a/src/osx/cocoa/slider.mm b/src/osx/cocoa/slider.mm
index 08327c438f..3bab4cc06a 100644
--- a/src/osx/cocoa/slider.mm
+++ b/src/osx/cocoa/slider.mm
@@ -90,6 +90,13 @@ wxWidgetImplType* wxWidgetImpl::CreateSlider( wxWindowMac* wxpeer,
                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
+    if ( size == wxDefaultSize )
+    {
+        if ( style & wxSL_VERTICAL )
+            r.size.height = r.size.width * 2;
+        else
+            r.size.width = r.size.height * 2;
+    }
     wxNSSlider* v = [[wxNSSlider alloc] initWithFrame:r];
 
     int tickMarks = 0;
diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index 2f3fc49395..664029f75d 100644
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -324,7 +324,7 @@ private:
 
 - (id)initWithItemIdentifier: (NSString*) identifier
 {
-    [super initWithItemIdentifier:identifier];
+    self = [super initWithItemIdentifier:identifier];
     impl = NULL;
     [self setTarget: self];
     [self setAction: @selector(clickedAction:)];
@@ -413,7 +413,7 @@ private:
 
 - (id)initWithFrame:(NSRect)frame
 {
-    [super initWithFrame:frame];
+    self = [super initWithFrame:frame];
     impl = NULL;
     [self setTarget: self];
     [self setAction: @selector(clickedAction:)];
diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index 1bea54aed2..b859eba7cb 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -1444,7 +1444,7 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible )
 
 - (id)init:(wxWindow *)win
 {
-    [super init];
+    self = [super init];
 
     m_win = win;
     m_isDone = false;
-- 
2.47.2