Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace usage of objective-c keyword 'id'

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-03-16 07:06:43 +00:00
parent 163b01c128
commit e3b2f973e8
2 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/propgrid/editors.cpp
View File

@@ -2159,35 +2159,35 @@ void wxPGMultiButton::Finalize( wxPropertyGrid* WXUNUSED(propGrid),
Move( pos.x + m_fullEditorSize.x - m_buttonsWidth, pos.y );
}
int wxPGMultiButton::GenId( int id ) const
int wxPGMultiButton::GenId( int itemid ) const
{
if ( id < -1 )
if ( itemid < -1 )
{
if ( m_buttons.size() )
id = GetButton(m_buttons.size()-1)->GetId() + 1;
itemid = GetButton(m_buttons.size()-1)->GetId() + 1;
else
id = wxPG_SUBID2;
itemid = wxPG_SUBID2;
}
return id;
return itemid;
}
#if wxUSE_BMPBUTTON
void wxPGMultiButton::Add( const wxBitmap& bitmap, int id )
void wxPGMultiButton::Add( const wxBitmap& bitmap, int itemid )
{
id = GenId(id);
itemid = GenId(itemid);
wxSize sz = GetSize();
wxButton* button = new wxBitmapButton( this, id, bitmap,
wxButton* button = new wxBitmapButton( this, itemid, bitmap,
wxPoint(sz.x, 0),
wxSize(sz.y, sz.y) );
DoAddButton( button, sz );
}
#endif
void wxPGMultiButton::Add( const wxString& label, int id )
void wxPGMultiButton::Add( const wxString& label, int itemid )
{
id = GenId(id);
itemid = GenId(itemid);
wxSize sz = GetSize();
wxButton* button = new wxButton( this, id, label, wxPoint(sz.x, 0),
wxButton* button = new wxButton( this, itemid, label, wxPoint(sz.x, 0),
wxSize(sz.y, sz.y) );
DoAddButton( button, sz );
}