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

diff --git a/src/cocoa/NSButton.mm b/src/cocoa/NSButton.mm
index b9923b7f7fa067191bad9a6ae1f363d90e323232..1728984c531d63eac5fedcf4c74a8245d959111c 100644 (file)
--- 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 0388a1d9dbbd0b1b3301ef69d18b6ecb0950832c..61a0193676f0b93503b7086c9b51ee312a017fff 100644 (file)
--- 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 74a927eb3252ec02f2a22e6981b7f4a4ba98605f..093bc3fcf5eff66fc45d5f219326963793c9a22d 100644 (file)
--- 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 710a63b1f4bd918375a587fd806877006beddbb7..b43f179077d8d1340c5863c4959c4291d54e537e 100644 (file)
--- 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 fac6d2831dd111b861155505822a880ac9f37217..2919b00d10f69c6dca105046444d78d40e9bbe14 100644 (file)
--- 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 fe928079ffeae034ed70427e72b2627e6051f0e5..5e9239d031377aa48a61f6ac6d56a1f447dd45d6 100644 (file)
--- 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 f45413d919da99c27ac5ccde4c70d72d885644b3..d5502f3d38832313153e9c9d42738148986a6e14 100644 (file)
--- 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 a54fc3fb4faa055ba5dc811ac4f97afd629cfe30..7e6e457e7ed1373c842dc5f011a0bb27c981146f 100644 (file)
--- 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 12a326714b4a6cadd0d27e6d88dabefa639b1a62..20ccf8ce4791b68fd05342bc8cba9d92995613ae 100644 (file)
--- 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 02114484bab6156a5fe49d0c1dc246bf0dccbae2..1036882df4b71129e2d3bda6c1cd53097864c8a4 100644 (file)
--- 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 36d6abe711391e9a93458ec3d13e84009a091791..7535026a54b737e61ed669079326284868c60e22 100644 (file)
--- 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];
 }