From 911e17c6cf31c0e9e7ab4cdb8e03d66203ebbab8 Mon Sep 17 00:00:00 2001
From: David Elliott <dfe@tgwbd.org>
Date: Tue, 2 Sep 2003 19:15:44 +0000
Subject: [PATCH] CodeWarrior Obj-C++ requires explicit casts from id to
 Objective-C types

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/cocoa/NSButton.mm | 2 +-
 src/cocoa/bmpbuttn.mm | 2 +-
 src/cocoa/button.mm   | 2 +-
 src/cocoa/checkbox.mm | 2 +-
 src/cocoa/control.mm  | 2 +-
 src/cocoa/listbox.mm  | 2 +-
 src/cocoa/radiobut.mm | 2 +-
 src/cocoa/statbox.mm  | 2 +-
 src/cocoa/stattext.mm | 2 +-
 src/cocoa/textctrl.mm | 2 +-
 src/cocoa/toplevel.mm | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/cocoa/NSButton.mm b/src/cocoa/NSButton.mm
index b9923b7f7f..1728984c53 100644
--- a/src/cocoa/NSButton.mm
+++ b/src/cocoa/NSButton.mm
@@ -47,7 +47,7 @@ WX_IMPLEMENT_POSER(wxPoserNSButton);
 @implementation wxPoserNSButton :  NSButton
 - (void)wxNSButtonAction: (id)sender
 {
-    wxASSERT_MSG(self==sender,"Received wxNSButtonAction from another object");
+    wxASSERT_MSG((id)self==sender,"Received wxNSButtonAction from another object");
     wxCocoaNSButton *button = wxCocoaNSButton::GetFromCocoa(self);
     wxCHECK_RET(button,"wxNSButtonAction received without associated wx object");
     button->Cocoa_wxNSButtonAction();
diff --git a/src/cocoa/bmpbuttn.mm b/src/cocoa/bmpbuttn.mm
index 0388a1d9db..61a0193676 100644
--- a/src/cocoa/bmpbuttn.mm
+++ b/src/cocoa/bmpbuttn.mm
@@ -55,7 +55,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID winid,
 
 wxBitmapButton::~wxBitmapButton()
 {
-    DisassociateNSButton(m_cocoaNSView);
+    DisassociateNSButton(GetNSButton());
 }
 
 void wxBitmapButton::Cocoa_wxNSButtonAction(void)
diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index 74a927eb32..093bc3fcf5 100644
--- a/src/cocoa/button.mm
+++ b/src/cocoa/button.mm
@@ -55,7 +55,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID winid,
 
 wxButton::~wxButton()
 {
-    DisassociateNSButton(m_cocoaNSView);
+    DisassociateNSButton(GetNSButton());
 }
 
 void wxButton::Cocoa_wxNSButtonAction(void)
diff --git a/src/cocoa/checkbox.mm b/src/cocoa/checkbox.mm
index 710a63b1f4..b43f179077 100644
--- a/src/cocoa/checkbox.mm
+++ b/src/cocoa/checkbox.mm
@@ -53,7 +53,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID winid,
 
 wxCheckBox::~wxCheckBox()
 {
-    DisassociateNSButton(m_cocoaNSView);
+    DisassociateNSButton(GetNSButton());
 }
 
 void wxCheckBox::SetValue(bool value)
diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm
index fac6d2831d..2919b00d10 100644
--- a/src/cocoa/control.mm
+++ b/src/cocoa/control.mm
@@ -50,7 +50,7 @@ bool wxControl::Create(wxWindow *parent, wxWindowID winid,
 
 wxControl::~wxControl()
 {
-    DisassociateNSControl(m_cocoaNSView);
+    DisassociateNSControl(GetNSControl());
 }
 
 wxSize wxControl::DoGetBestSize() const
diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm
index fe928079ff..5e9239d031 100644
--- a/src/cocoa/listbox.mm
+++ b/src/cocoa/listbox.mm
@@ -81,7 +81,7 @@ wxListBox::~wxListBox()
     [GetNSTableView() setDataSource: nil];
     [m_cocoaDataSource release];
     [m_cocoaItems release];
-    DisassociateNSTableView(m_cocoaNSView);
+    DisassociateNSTableView(GetNSTableView());
 }
 
 int wxListBox::CocoaDataSource_numberOfRows()
diff --git a/src/cocoa/radiobut.mm b/src/cocoa/radiobut.mm
index f45413d919..d5502f3d38 100644
--- a/src/cocoa/radiobut.mm
+++ b/src/cocoa/radiobut.mm
@@ -120,7 +120,7 @@ wxRadioButton::~wxRadioButton()
         m_radioMaster = NULL;
     }
     // normal stuff
-    DisassociateNSButton(m_cocoaNSView);
+    DisassociateNSButton(GetNSButton());
 }
 
 void wxRadioButton::SetValue(bool value)
diff --git a/src/cocoa/statbox.mm b/src/cocoa/statbox.mm
index a54fc3fb4f..7e6e457e7e 100644
--- a/src/cocoa/statbox.mm
+++ b/src/cocoa/statbox.mm
@@ -47,7 +47,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID winid,
 
 wxStaticBox::~wxStaticBox()
 {
-    DisassociateNSBox(m_cocoaNSView);
+    DisassociateNSBox(GetNSBox());
 }
 
 void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
diff --git a/src/cocoa/stattext.mm b/src/cocoa/stattext.mm
index 12a326714b..20ccf8ce47 100644
--- a/src/cocoa/stattext.mm
+++ b/src/cocoa/stattext.mm
@@ -60,7 +60,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID winid,
 
 wxStaticText::~wxStaticText()
 {
-    DisassociateNSTextField(m_cocoaNSView);
+    DisassociateNSTextField(GetNSTextField());
 }
 
 void wxStaticText::SetLabel(const wxString& label)
diff --git a/src/cocoa/textctrl.mm b/src/cocoa/textctrl.mm
index 02114484ba..1036882df4 100644
--- a/src/cocoa/textctrl.mm
+++ b/src/cocoa/textctrl.mm
@@ -57,7 +57,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID winid,
 
 wxTextCtrl::~wxTextCtrl()
 {
-    DisassociateNSTextField(m_cocoaNSView);
+    DisassociateNSTextField(GetNSTextField());
 }
 
 void wxTextCtrl::Cocoa_didChangeText(void)
diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index 36d6abe711..7535026a54 100644
--- a/src/cocoa/toplevel.mm
+++ b/src/cocoa/toplevel.mm
@@ -124,7 +124,7 @@ void wxTopLevelWindowCocoa::SetNSWindow(WX_NSWindow cocoaNSWindow)
 
 void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
 {
-    if([m_cocoaNSWindow contentView] == oldView)
+    if([m_cocoaNSWindow contentView] == (id)oldView)
         [m_cocoaNSWindow setContentView:newView];
 }
 
-- 
2.47.2