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
This commit is contained in:
David Elliott
2003-09-02 19:15:44 +00:00
parent 449c567346
commit 911e17c6cf
11 changed files with 11 additions and 11 deletions

View File

@@ -47,7 +47,7 @@ WX_IMPLEMENT_POSER(wxPoserNSButton);
@implementation wxPoserNSButton : NSButton @implementation wxPoserNSButton : NSButton
- (void)wxNSButtonAction: (id)sender - (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); wxCocoaNSButton *button = wxCocoaNSButton::GetFromCocoa(self);
wxCHECK_RET(button,"wxNSButtonAction received without associated wx object"); wxCHECK_RET(button,"wxNSButtonAction received without associated wx object");
button->Cocoa_wxNSButtonAction(); button->Cocoa_wxNSButtonAction();

View File

@@ -55,7 +55,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID winid,
wxBitmapButton::~wxBitmapButton() wxBitmapButton::~wxBitmapButton()
{ {
DisassociateNSButton(m_cocoaNSView); DisassociateNSButton(GetNSButton());
} }
void wxBitmapButton::Cocoa_wxNSButtonAction(void) void wxBitmapButton::Cocoa_wxNSButtonAction(void)

View File

@@ -55,7 +55,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID winid,
wxButton::~wxButton() wxButton::~wxButton()
{ {
DisassociateNSButton(m_cocoaNSView); DisassociateNSButton(GetNSButton());
} }
void wxButton::Cocoa_wxNSButtonAction(void) void wxButton::Cocoa_wxNSButtonAction(void)

View File

@@ -53,7 +53,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID winid,
wxCheckBox::~wxCheckBox() wxCheckBox::~wxCheckBox()
{ {
DisassociateNSButton(m_cocoaNSView); DisassociateNSButton(GetNSButton());
} }
void wxCheckBox::SetValue(bool value) void wxCheckBox::SetValue(bool value)

View File

@@ -50,7 +50,7 @@ bool wxControl::Create(wxWindow *parent, wxWindowID winid,
wxControl::~wxControl() wxControl::~wxControl()
{ {
DisassociateNSControl(m_cocoaNSView); DisassociateNSControl(GetNSControl());
} }
wxSize wxControl::DoGetBestSize() const wxSize wxControl::DoGetBestSize() const

View File

@@ -81,7 +81,7 @@ wxListBox::~wxListBox()
[GetNSTableView() setDataSource: nil]; [GetNSTableView() setDataSource: nil];
[m_cocoaDataSource release]; [m_cocoaDataSource release];
[m_cocoaItems release]; [m_cocoaItems release];
DisassociateNSTableView(m_cocoaNSView); DisassociateNSTableView(GetNSTableView());
} }
int wxListBox::CocoaDataSource_numberOfRows() int wxListBox::CocoaDataSource_numberOfRows()

View File

@@ -120,7 +120,7 @@ wxRadioButton::~wxRadioButton()
m_radioMaster = NULL; m_radioMaster = NULL;
} }
// normal stuff // normal stuff
DisassociateNSButton(m_cocoaNSView); DisassociateNSButton(GetNSButton());
} }
void wxRadioButton::SetValue(bool value) void wxRadioButton::SetValue(bool value)

View File

@@ -47,7 +47,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID winid,
wxStaticBox::~wxStaticBox() wxStaticBox::~wxStaticBox()
{ {
DisassociateNSBox(m_cocoaNSView); DisassociateNSBox(GetNSBox());
} }
void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const

View File

@@ -60,7 +60,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID winid,
wxStaticText::~wxStaticText() wxStaticText::~wxStaticText()
{ {
DisassociateNSTextField(m_cocoaNSView); DisassociateNSTextField(GetNSTextField());
} }
void wxStaticText::SetLabel(const wxString& label) void wxStaticText::SetLabel(const wxString& label)

View File

@@ -57,7 +57,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID winid,
wxTextCtrl::~wxTextCtrl() wxTextCtrl::~wxTextCtrl()
{ {
DisassociateNSTextField(m_cocoaNSView); DisassociateNSTextField(GetNSTextField());
} }
void wxTextCtrl::Cocoa_didChangeText(void) void wxTextCtrl::Cocoa_didChangeText(void)

View File

@@ -124,7 +124,7 @@ void wxTopLevelWindowCocoa::SetNSWindow(WX_NSWindow cocoaNSWindow)
void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newView) void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
{ {
if([m_cocoaNSWindow contentView] == oldView) if([m_cocoaNSWindow contentView] == (id)oldView)
[m_cocoaNSWindow setContentView:newView]; [m_cocoaNSWindow setContentView:newView];
} }