adapting to init pattern

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/cocoa/listbox.mm b/src/osx/cocoa/listbox.mm
index 8f38d778cb7d0d9fec3ebd434b9a667096042ee3..4b10d40656059b215e972d825b4905f0237e6945 100644 (file)
--- a/src/osx/cocoa/listbox.mm
+++ b/src/osx/cocoa/listbox.mm
@@ -161,7 +161,7 @@ protected :
 
 - (id) init
 {
 
 - (id) init
 {

-    [super init];
+    self = [super init];

     column = nil;
     return self;
 }
     column = nil;
     return self;
 }


@@ -224,7 +224,7 @@ protected:
 
 - (id) init
 {
 
 - (id) init
 {

-    [super init];
+    self = [super init];

     impl = nil;
     return self;
 }
     impl = nil;
     return self;
 }

diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm
index 346b992bf3c9cea3be0ae5f10090e6360e850ee8..22fabe534468999459a46df9ebc5ec4e60328732 100644 (file)
--- a/src/osx/cocoa/menu.mm
+++ b/src/osx/cocoa/menu.mm
@@ -38,7 +38,7 @@
 
 - (id) initWithTitle:(NSString*) title
 {
 
 - (id) initWithTitle:(NSString*) title
 {

-    [super initWithTitle:title];
+    self = [super initWithTitle:title];

     impl = NULL;
     return self;
 }
     impl = NULL;
     return self;
 }


@@ -69,7 +69,7 @@
 
 - (id) init
 {
 
 - (id) init
 {

-    [super init];
+    self = [super init];

     return self;
 }
 
     return self;
 }
 

diff --git a/src/osx/cocoa/menuitem.mm b/src/osx/cocoa/menuitem.mm
index 969a11b44c2b67eab48a96574eceec3c9ab45d59..715517244a7c6448a9a884ca20481f626702a38b 100644 (file)
--- a/src/osx/cocoa/menuitem.mm
+++ b/src/osx/cocoa/menuitem.mm
@@ -74,8 +74,8 @@ SEL wxOSXGetSelectorFromID(int menuId )
 
 - (id) initWithTitle:(NSString *)aString action:(SEL)aSelector keyEquivalent:(NSString *)charCode
 {
 
 - (id) initWithTitle:(NSString *)aString action:(SEL)aSelector keyEquivalent:(NSString *)charCode
 {

-    [super initWithTitle:aString action:aSelector keyEquivalent:charCode];
-     return self;
+    self = [super initWithTitle:aString action:aSelector keyEquivalent:charCode];
+    return self;

 }
 
 - (void) clickedAction: (id) sender
 }
 
 - (void) clickedAction: (id) sender