replace usage of objective-c keyword 'id'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
parent
a624c97f0a
commit
c1ec7ee8a1
@ -158,7 +158,7 @@ void wxToolBarBase::FixupStyle()
|
||||
}
|
||||
}
|
||||
|
||||
wxToolBarToolBase *wxToolBarBase::DoAddTool(int id,
|
||||
wxToolBarToolBase *wxToolBarBase::DoAddTool(int toolid,
|
||||
const wxString& label,
|
||||
const wxBitmap& bitmap,
|
||||
const wxBitmap& bmpDisabled,
|
||||
@ -170,12 +170,12 @@ wxToolBarToolBase *wxToolBarBase::DoAddTool(int id,
|
||||
wxCoord WXUNUSED(yPos))
|
||||
{
|
||||
InvalidateBestSize();
|
||||
return InsertTool(GetToolsCount(), id, label, bitmap, bmpDisabled,
|
||||
return InsertTool(GetToolsCount(), toolid, label, bitmap, bmpDisabled,
|
||||
kind, shortHelp, longHelp, clientData);
|
||||
}
|
||||
|
||||
wxToolBarToolBase *wxToolBarBase::InsertTool(size_t pos,
|
||||
int id,
|
||||
int toolid,
|
||||
const wxString& label,
|
||||
const wxBitmap& bitmap,
|
||||
const wxBitmap& bmpDisabled,
|
||||
@ -187,7 +187,7 @@ wxToolBarToolBase *wxToolBarBase::InsertTool(size_t pos,
|
||||
wxCHECK_MSG( pos <= GetToolsCount(), NULL,
|
||||
wxT("invalid position in wxToolBar::InsertTool()") );
|
||||
|
||||
return DoInsertNewTool(pos, CreateTool(id, label, bitmap, bmpDisabled, kind,
|
||||
return DoInsertNewTool(pos, CreateTool(toolid, label, bitmap, bmpDisabled, kind,
|
||||
clientData, shortHelp, longHelp));
|
||||
}
|
||||
|
||||
@ -233,7 +233,7 @@ wxToolBarBase::InsertControl(size_t pos,
|
||||
return DoInsertNewTool(pos, CreateTool(control, label));
|
||||
}
|
||||
|
||||
wxControl *wxToolBarBase::FindControl( int id )
|
||||
wxControl *wxToolBarBase::FindControl( int toolid )
|
||||
{
|
||||
for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
|
||||
node;
|
||||
@ -248,7 +248,7 @@ wxControl *wxToolBarBase::FindControl( int id )
|
||||
{
|
||||
wxFAIL_MSG( wxT("NULL control in toolbar?") );
|
||||
}
|
||||
else if ( control->GetId() == id )
|
||||
else if ( control->GetId() == toolid )
|
||||
{
|
||||
// found
|
||||
return control;
|
||||
@ -291,13 +291,13 @@ wxToolBarToolBase *wxToolBarBase::InsertStretchableSpace(size_t pos)
|
||||
return DoInsertNewTool(pos, tool);
|
||||
}
|
||||
|
||||
wxToolBarToolBase *wxToolBarBase::RemoveTool(int id)
|
||||
wxToolBarToolBase *wxToolBarBase::RemoveTool(int toolid)
|
||||
{
|
||||
size_t pos = 0;
|
||||
wxToolBarToolsList::compatibility_iterator node;
|
||||
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
|
||||
{
|
||||
if ( node->GetData()->GetId() == id )
|
||||
if ( node->GetData()->GetId() == toolid )
|
||||
break;
|
||||
|
||||
pos++;
|
||||
@ -341,13 +341,13 @@ bool wxToolBarBase::DeleteToolByPos(size_t pos)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool wxToolBarBase::DeleteTool(int id)
|
||||
bool wxToolBarBase::DeleteTool(int toolid)
|
||||
{
|
||||
size_t pos = 0;
|
||||
wxToolBarToolsList::compatibility_iterator node;
|
||||
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
|
||||
{
|
||||
if ( node->GetData()->GetId() == id )
|
||||
if ( node->GetData()->GetId() == toolid )
|
||||
break;
|
||||
|
||||
pos++;
|
||||
@ -364,7 +364,7 @@ bool wxToolBarBase::DeleteTool(int id)
|
||||
return true;
|
||||
}
|
||||
|
||||
wxToolBarToolBase *wxToolBarBase::FindById(int id) const
|
||||
wxToolBarToolBase *wxToolBarBase::FindById(int toolid) const
|
||||
{
|
||||
wxToolBarToolBase *tool = NULL;
|
||||
|
||||
@ -373,7 +373,7 @@ wxToolBarToolBase *wxToolBarBase::FindById(int id) const
|
||||
node = node->GetNext() )
|
||||
{
|
||||
tool = node->GetData();
|
||||
if ( tool->GetId() == id )
|
||||
if ( tool->GetId() == toolid )
|
||||
{
|
||||
// found
|
||||
break;
|
||||
@ -484,9 +484,9 @@ wxToolBarBase::~wxToolBarBase()
|
||||
// wxToolBarBase tools state
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
void wxToolBarBase::EnableTool(int id, bool enable)
|
||||
void wxToolBarBase::EnableTool(int toolid, bool enable)
|
||||
{
|
||||
wxToolBarToolBase *tool = FindById(id);
|
||||
wxToolBarToolBase *tool = FindById(toolid);
|
||||
if ( tool )
|
||||
{
|
||||
if ( tool->Enable(enable) )
|
||||
@ -496,9 +496,9 @@ void wxToolBarBase::EnableTool(int id, bool enable)
|
||||
}
|
||||
}
|
||||
|
||||
void wxToolBarBase::ToggleTool(int id, bool toggle)
|
||||
void wxToolBarBase::ToggleTool(int toolid, bool toggle)
|
||||
{
|
||||
wxToolBarToolBase *tool = FindById(id);
|
||||
wxToolBarToolBase *tool = FindById(toolid);
|
||||
if ( tool && tool->CanBeToggled() )
|
||||
{
|
||||
if ( tool->Toggle(toggle) )
|
||||
@ -509,9 +509,9 @@ void wxToolBarBase::ToggleTool(int id, bool toggle)
|
||||
}
|
||||
}
|
||||
|
||||
void wxToolBarBase::SetToggle(int id, bool toggle)
|
||||
void wxToolBarBase::SetToggle(int toolid, bool toggle)
|
||||
{
|
||||
wxToolBarToolBase *tool = FindById(id);
|
||||
wxToolBarToolBase *tool = FindById(toolid);
|
||||
if ( tool )
|
||||
{
|
||||
if ( tool->SetToggle(toggle) )
|
||||
@ -521,48 +521,48 @@ void wxToolBarBase::SetToggle(int id, bool toggle)
|
||||
}
|
||||
}
|
||||
|
||||
void wxToolBarBase::SetToolShortHelp(int id, const wxString& help)
|
||||
void wxToolBarBase::SetToolShortHelp(int toolid, const wxString& help)
|
||||
{
|
||||
wxToolBarToolBase *tool = FindById(id);
|
||||
wxToolBarToolBase *tool = FindById(toolid);
|
||||
if ( tool )
|
||||
{
|
||||
(void)tool->SetShortHelp(help);
|
||||
}
|
||||
}
|
||||
|
||||
void wxToolBarBase::SetToolLongHelp(int id, const wxString& help)
|
||||
void wxToolBarBase::SetToolLongHelp(int toolid, const wxString& help)
|
||||
{
|
||||
wxToolBarToolBase *tool = FindById(id);
|
||||
wxToolBarToolBase *tool = FindById(toolid);
|
||||
if ( tool )
|
||||
{
|
||||
(void)tool->SetLongHelp(help);
|
||||
}
|
||||
}
|
||||
|
||||
wxObject *wxToolBarBase::GetToolClientData(int id) const
|
||||
wxObject *wxToolBarBase::GetToolClientData(int toolid) const
|
||||
{
|
||||
wxToolBarToolBase *tool = FindById(id);
|
||||
wxToolBarToolBase *tool = FindById(toolid);
|
||||
|
||||
return tool ? tool->GetClientData() : NULL;
|
||||
}
|
||||
|
||||
void wxToolBarBase::SetToolClientData(int id, wxObject *clientData)
|
||||
void wxToolBarBase::SetToolClientData(int toolid, wxObject *clientData)
|
||||
{
|
||||
wxToolBarToolBase *tool = FindById(id);
|
||||
wxToolBarToolBase *tool = FindById(toolid);
|
||||
|
||||
wxCHECK_RET( tool, wxT("no such tool in wxToolBar::SetToolClientData") );
|
||||
|
||||
tool->SetClientData(clientData);
|
||||
}
|
||||
|
||||
int wxToolBarBase::GetToolPos(int id) const
|
||||
int wxToolBarBase::GetToolPos(int toolid) const
|
||||
{
|
||||
size_t pos = 0;
|
||||
wxToolBarToolsList::compatibility_iterator node;
|
||||
|
||||
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
|
||||
{
|
||||
if ( node->GetData()->GetId() == id )
|
||||
if ( node->GetData()->GetId() == toolid )
|
||||
return pos;
|
||||
|
||||
pos++;
|
||||
@ -571,33 +571,33 @@ int wxToolBarBase::GetToolPos(int id) const
|
||||
return wxNOT_FOUND;
|
||||
}
|
||||
|
||||
bool wxToolBarBase::GetToolState(int id) const
|
||||
bool wxToolBarBase::GetToolState(int toolid) const
|
||||
{
|
||||
wxToolBarToolBase *tool = FindById(id);
|
||||
wxToolBarToolBase *tool = FindById(toolid);
|
||||
wxCHECK_MSG( tool, false, wxT("no such tool") );
|
||||
|
||||
return tool->IsToggled();
|
||||
}
|
||||
|
||||
bool wxToolBarBase::GetToolEnabled(int id) const
|
||||
bool wxToolBarBase::GetToolEnabled(int toolid) const
|
||||
{
|
||||
wxToolBarToolBase *tool = FindById(id);
|
||||
wxToolBarToolBase *tool = FindById(toolid);
|
||||
wxCHECK_MSG( tool, false, wxT("no such tool") );
|
||||
|
||||
return tool->IsEnabled();
|
||||
}
|
||||
|
||||
wxString wxToolBarBase::GetToolShortHelp(int id) const
|
||||
wxString wxToolBarBase::GetToolShortHelp(int toolid) const
|
||||
{
|
||||
wxToolBarToolBase *tool = FindById(id);
|
||||
wxToolBarToolBase *tool = FindById(toolid);
|
||||
wxCHECK_MSG( tool, wxEmptyString, wxT("no such tool") );
|
||||
|
||||
return tool->GetShortHelp();
|
||||
}
|
||||
|
||||
wxString wxToolBarBase::GetToolLongHelp(int id) const
|
||||
wxString wxToolBarBase::GetToolLongHelp(int toolid) const
|
||||
{
|
||||
wxToolBarToolBase *tool = FindById(id);
|
||||
wxToolBarToolBase *tool = FindById(toolid);
|
||||
wxCHECK_MSG( tool, wxEmptyString, wxT("no such tool") );
|
||||
|
||||
return tool->GetLongHelp();
|
||||
@ -629,9 +629,9 @@ bool wxToolBarBase::IsVertical() const
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// Only allow toggle if returns true
|
||||
bool wxToolBarBase::OnLeftClick(int id, bool toggleDown)
|
||||
bool wxToolBarBase::OnLeftClick(int toolid, bool toggleDown)
|
||||
{
|
||||
wxCommandEvent event(wxEVT_COMMAND_TOOL_CLICKED, id);
|
||||
wxCommandEvent event(wxEVT_COMMAND_TOOL_CLICKED, toolid);
|
||||
event.SetEventObject(this);
|
||||
|
||||
// we use SetInt() to make wxCommandEvent::IsChecked() return toggleDown
|
||||
@ -647,42 +647,42 @@ bool wxToolBarBase::OnLeftClick(int id, bool toggleDown)
|
||||
}
|
||||
|
||||
// Call when right button down.
|
||||
void wxToolBarBase::OnRightClick(int id,
|
||||
void wxToolBarBase::OnRightClick(int toolid,
|
||||
long WXUNUSED(x),
|
||||
long WXUNUSED(y))
|
||||
{
|
||||
wxCommandEvent event(wxEVT_COMMAND_TOOL_RCLICKED, id);
|
||||
wxCommandEvent event(wxEVT_COMMAND_TOOL_RCLICKED, toolid);
|
||||
event.SetEventObject(this);
|
||||
event.SetInt(id);
|
||||
event.SetInt(toolid);
|
||||
|
||||
GetEventHandler()->ProcessEvent(event);
|
||||
}
|
||||
|
||||
// Called when the mouse cursor enters a tool bitmap (no button pressed).
|
||||
// Argument is wxID_ANY if mouse is exiting the toolbar.
|
||||
// Note that for this event, the id of the window is used,
|
||||
// Note that for this event, the toolid of the window is used,
|
||||
// and the integer parameter of wxCommandEvent is used to retrieve
|
||||
// the tool id.
|
||||
void wxToolBarBase::OnMouseEnter(int id)
|
||||
// the tool toolid.
|
||||
void wxToolBarBase::OnMouseEnter(int toolid)
|
||||
{
|
||||
wxCommandEvent event(wxEVT_COMMAND_TOOL_ENTER, GetId());
|
||||
event.SetEventObject(this);
|
||||
event.SetInt(id);
|
||||
event.SetInt(toolid);
|
||||
|
||||
wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
|
||||
if ( frame )
|
||||
{
|
||||
wxString help;
|
||||
if ( id != wxID_ANY )
|
||||
if ( toolid != wxID_ANY )
|
||||
{
|
||||
const wxToolBarToolBase * const tool = FindById(id);
|
||||
const wxToolBarToolBase * const tool = FindById(toolid);
|
||||
if ( tool )
|
||||
help = tool->GetLongHelp();
|
||||
}
|
||||
|
||||
// call DoGiveHelp() even if help string is empty to avoid showing the
|
||||
// help for the previously selected tool when another one is selected
|
||||
frame->DoGiveHelp(help, id != wxID_ANY);
|
||||
frame->DoGiveHelp(help, toolid != wxID_ANY);
|
||||
}
|
||||
|
||||
(void)GetEventHandler()->ProcessEvent(event);
|
||||
@ -717,17 +717,17 @@ void wxToolBarBase::UpdateWindowUI(long flags)
|
||||
if ( tool->IsSeparator() )
|
||||
continue;
|
||||
|
||||
int id = tool->GetId();
|
||||
int toolid = tool->GetId();
|
||||
|
||||
wxUpdateUIEvent event(id);
|
||||
wxUpdateUIEvent event(toolid);
|
||||
event.SetEventObject(this);
|
||||
|
||||
if ( evtHandler->ProcessEvent(event) )
|
||||
{
|
||||
if ( event.GetSetEnabled() )
|
||||
EnableTool(id, event.GetEnabled());
|
||||
EnableTool(toolid, event.GetEnabled());
|
||||
if ( event.GetSetChecked() )
|
||||
ToggleTool(id, event.GetChecked());
|
||||
ToggleTool(toolid, event.GetChecked());
|
||||
#if 0
|
||||
if ( event.GetSetText() )
|
||||
// Set tooltip?
|
||||
@ -740,7 +740,7 @@ void wxToolBarBase::UpdateWindowUI(long flags)
|
||||
bool wxToolBarBase::SetDropdownMenu(int toolid, wxMenu* menu)
|
||||
{
|
||||
wxToolBarToolBase * const tool = FindById(toolid);
|
||||
wxCHECK_MSG( tool, false, wxT("invalid tool id") );
|
||||
wxCHECK_MSG( tool, false, wxT("invalid tool toolid") );
|
||||
|
||||
wxCHECK_MSG( tool->GetKind() == wxITEM_DROPDOWN, false,
|
||||
wxT("menu can be only associated with drop down tools") );
|
||||
|
||||
@ -470,7 +470,7 @@ void wxGenericDirCtrl::ExpandRoot()
|
||||
}
|
||||
|
||||
bool wxGenericDirCtrl::Create(wxWindow *parent,
|
||||
const wxWindowID id,
|
||||
const wxWindowID treeid,
|
||||
const wxString& dir,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
@ -479,7 +479,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
|
||||
int defaultFilter,
|
||||
const wxString& name)
|
||||
{
|
||||
if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
|
||||
if (!wxControl::Create(parent, treeid, pos, size, style, wxDefaultValidator, name))
|
||||
return false;
|
||||
|
||||
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
|
||||
@ -562,9 +562,9 @@ void wxGenericDirCtrl::Init()
|
||||
m_filterListCtrl = NULL;
|
||||
}
|
||||
|
||||
wxTreeCtrl* wxGenericDirCtrl::CreateTreeCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long treeStyle)
|
||||
wxTreeCtrl* wxGenericDirCtrl::CreateTreeCtrl(wxWindow *parent, wxWindowID treeid, const wxPoint& pos, const wxSize& size, long treeStyle)
|
||||
{
|
||||
return new wxTreeCtrl(parent, id, pos, size, treeStyle);
|
||||
return new wxTreeCtrl(parent, treeid, pos, size, treeStyle);
|
||||
}
|
||||
|
||||
void wxGenericDirCtrl::ShowHidden( bool show )
|
||||
@ -597,11 +597,11 @@ wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int ima
|
||||
{
|
||||
wxDirItemData *dir_item = new wxDirItemData(path,name,true);
|
||||
|
||||
wxTreeItemId id = AppendItem( m_rootId, name, imageId, -1, dir_item);
|
||||
wxTreeItemId treeid = AppendItem( m_rootId, name, imageId, -1, dir_item);
|
||||
|
||||
m_treeCtrl->SetItemHasChildren(id);
|
||||
m_treeCtrl->SetItemHasChildren(treeid);
|
||||
|
||||
return id;
|
||||
return treeid;
|
||||
}
|
||||
|
||||
void wxGenericDirCtrl::SetupSections()
|
||||
@ -665,8 +665,8 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
|
||||
return;
|
||||
}
|
||||
|
||||
wxTreeItemId id = event.GetItem();
|
||||
wxDirItemData *data = (wxDirItemData*)m_treeCtrl->GetItemData( id );
|
||||
wxTreeItemId treeid = event.GetItem();
|
||||
wxDirItemData *data = (wxDirItemData*)m_treeCtrl->GetItemData( treeid );
|
||||
wxASSERT( data );
|
||||
|
||||
wxString new_name( wxPathOnly( data->m_path ) );
|
||||
@ -843,9 +843,9 @@ void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId)
|
||||
path += eachFilename;
|
||||
|
||||
wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,true);
|
||||
wxTreeItemId id = AppendItem( parentId, eachFilename,
|
||||
wxTreeItemId treeid = AppendItem( parentId, eachFilename,
|
||||
wxFileIconsTable::folder, -1, dir_item);
|
||||
m_treeCtrl->SetItemImage( id, wxFileIconsTable::folder_open,
|
||||
m_treeCtrl->SetItemImage( treeid, wxFileIconsTable::folder_open,
|
||||
wxTreeItemIcon_Expanded );
|
||||
|
||||
// assume that it does have children by default as it can take a long
|
||||
@ -853,7 +853,7 @@ void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId)
|
||||
//
|
||||
// and if we're wrong, we'll correct the icon later if
|
||||
// the user really tries to open this item
|
||||
m_treeCtrl->SetItemHasChildren(id);
|
||||
m_treeCtrl->SetItemHasChildren(treeid);
|
||||
}
|
||||
|
||||
// Add the sorted filenames
|
||||
@ -960,15 +960,15 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
|
||||
bool wxGenericDirCtrl::ExpandPath(const wxString& path)
|
||||
{
|
||||
bool done = false;
|
||||
wxTreeItemId id = FindChild(m_rootId, path, done);
|
||||
wxTreeItemId lastId = id; // The last non-zero id
|
||||
while (id.IsOk() && !done)
|
||||
wxTreeItemId treeid = FindChild(m_rootId, path, done);
|
||||
wxTreeItemId lastId = treeid; // The last non-zero treeid
|
||||
while (treeid.IsOk() && !done)
|
||||
{
|
||||
ExpandDir(id);
|
||||
ExpandDir(treeid);
|
||||
|
||||
id = FindChild(id, path, done);
|
||||
if (id.IsOk())
|
||||
lastId = id;
|
||||
treeid = FindChild(treeid, path, done);
|
||||
if (treeid.IsOk())
|
||||
lastId = treeid;
|
||||
}
|
||||
if (!lastId.IsOk())
|
||||
return false;
|
||||
@ -1016,17 +1016,17 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
|
||||
bool wxGenericDirCtrl::CollapsePath(const wxString& path)
|
||||
{
|
||||
bool done = false;
|
||||
wxTreeItemId id = FindChild(m_rootId, path, done);
|
||||
wxTreeItemId lastId = id; // The last non-zero id
|
||||
wxTreeItemId treeid = FindChild(m_rootId, path, done);
|
||||
wxTreeItemId lastId = treeid; // The last non-zero treeid
|
||||
|
||||
while ( id.IsOk() && !done )
|
||||
while ( treeid.IsOk() && !done )
|
||||
{
|
||||
CollapseDir(id);
|
||||
CollapseDir(treeid);
|
||||
|
||||
id = FindChild(id, path, done);
|
||||
treeid = FindChild(treeid, path, done);
|
||||
|
||||
if ( id.IsOk() )
|
||||
lastId = id;
|
||||
if ( treeid.IsOk() )
|
||||
lastId = treeid;
|
||||
}
|
||||
|
||||
if ( !lastId.IsOk() )
|
||||
@ -1049,18 +1049,18 @@ wxString wxGenericDirCtrl::GetPath() const
|
||||
if (items.size() > 0)
|
||||
{
|
||||
// return first string only
|
||||
wxTreeItemId id = items[0];
|
||||
wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
|
||||
wxTreeItemId treeid = items[0];
|
||||
wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
|
||||
return data->m_path;
|
||||
}
|
||||
|
||||
return wxEmptyString;
|
||||
}
|
||||
|
||||
wxTreeItemId id = m_treeCtrl->GetSelection();
|
||||
if (id)
|
||||
wxTreeItemId treeid = m_treeCtrl->GetSelection();
|
||||
if (treeid)
|
||||
{
|
||||
wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
|
||||
wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
|
||||
return data->m_path;
|
||||
}
|
||||
else
|
||||
@ -1075,18 +1075,18 @@ void wxGenericDirCtrl::GetPaths(wxArrayString& paths) const
|
||||
m_treeCtrl->GetSelections(items);
|
||||
for ( unsigned n = 0; n < items.size(); n++ )
|
||||
{
|
||||
wxTreeItemId id = items[n];
|
||||
wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
|
||||
wxTreeItemId treeid = items[n];
|
||||
wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
|
||||
paths.Add(data->m_path);
|
||||
}
|
||||
}
|
||||
|
||||
wxString wxGenericDirCtrl::GetFilePath() const
|
||||
{
|
||||
wxTreeItemId id = m_treeCtrl->GetSelection();
|
||||
if (id)
|
||||
wxTreeItemId treeid = m_treeCtrl->GetSelection();
|
||||
if (treeid)
|
||||
{
|
||||
wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
|
||||
wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
|
||||
if (data->m_isDir)
|
||||
return wxEmptyString;
|
||||
else
|
||||
@ -1104,8 +1104,8 @@ void wxGenericDirCtrl::GetFilePaths(wxArrayString& paths) const
|
||||
m_treeCtrl->GetSelections(items);
|
||||
for ( unsigned n = 0; n < items.size(); n++ )
|
||||
{
|
||||
wxTreeItemId id = items[n];
|
||||
wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
|
||||
wxTreeItemId treeid = items[n];
|
||||
wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
|
||||
if ( !data->m_isDir )
|
||||
paths.Add(data->m_path);
|
||||
}
|
||||
@ -1121,20 +1121,20 @@ void wxGenericDirCtrl::SetPath(const wxString& path)
|
||||
void wxGenericDirCtrl::SelectPath(const wxString& path, bool select)
|
||||
{
|
||||
bool done = false;
|
||||
wxTreeItemId id = FindChild(m_rootId, path, done);
|
||||
wxTreeItemId lastId = id; // The last non-zero id
|
||||
while ( id.IsOk() && !done )
|
||||
wxTreeItemId treeid = FindChild(m_rootId, path, done);
|
||||
wxTreeItemId lastId = treeid; // The last non-zero treeid
|
||||
while ( treeid.IsOk() && !done )
|
||||
{
|
||||
id = FindChild(id, path, done);
|
||||
if ( id.IsOk() )
|
||||
lastId = id;
|
||||
treeid = FindChild(treeid, path, done);
|
||||
if ( treeid.IsOk() )
|
||||
lastId = treeid;
|
||||
}
|
||||
if ( !lastId.IsOk() )
|
||||
return;
|
||||
|
||||
if ( done )
|
||||
{
|
||||
m_treeCtrl->SelectItem(id, select);
|
||||
m_treeCtrl->SelectItem(treeid, select);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1157,9 +1157,9 @@ void wxGenericDirCtrl::UnselectAll()
|
||||
|
||||
// Not used
|
||||
#if 0
|
||||
void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayString& filenames)
|
||||
void wxGenericDirCtrl::FindChildFiles(wxTreeItemId treeid, int dirFlags, wxArrayString& filenames)
|
||||
{
|
||||
wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(id);
|
||||
wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(treeid);
|
||||
|
||||
// This may take a longish time. Go to busy cursor
|
||||
wxBusyCursor busy;
|
||||
@ -1315,7 +1315,7 @@ BEGIN_EVENT_TABLE(wxDirFilterListCtrl, wxChoice)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent,
|
||||
const wxWindowID id,
|
||||
const wxWindowID treeid,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style)
|
||||
@ -1329,7 +1329,7 @@ bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent,
|
||||
: wxBORDER_NONE;
|
||||
}
|
||||
|
||||
return wxChoice::Create(parent, id, pos, size, 0, NULL, style);
|
||||
return wxChoice::Create(parent, treeid, pos, size, 0, NULL, style);
|
||||
}
|
||||
|
||||
void wxDirFilterListCtrl::Init()
|
||||
@ -1484,9 +1484,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileIconsTableModule, wxModule)
|
||||
class wxFileIconEntry : public wxObject
|
||||
{
|
||||
public:
|
||||
wxFileIconEntry(int i) { id = i; }
|
||||
wxFileIconEntry(int i) { iconid = i; }
|
||||
|
||||
int id;
|
||||
int iconid;
|
||||
};
|
||||
|
||||
wxFileIconsTable::wxFileIconsTable()
|
||||
@ -1688,7 +1688,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
|
||||
if (!extension.empty())
|
||||
{
|
||||
wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable->Get(extension);
|
||||
if (entry) return (entry -> id);
|
||||
if (entry) return (entry -> iconid);
|
||||
}
|
||||
|
||||
wxFileType *ft = (mime.empty()) ?
|
||||
@ -1727,7 +1727,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
|
||||
|
||||
const unsigned int size = 16;
|
||||
|
||||
int id = m_smallImageList->GetImageCount();
|
||||
int treeid = m_smallImageList->GetImageCount();
|
||||
if ((bmp.GetWidth() == (int) size) && (bmp.GetHeight() == (int) size))
|
||||
{
|
||||
m_smallImageList->Add(bmp);
|
||||
@ -1745,8 +1745,8 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
|
||||
}
|
||||
#endif // wxUSE_IMAGE
|
||||
|
||||
m_HashTable->Put(extension, new wxFileIconEntry(id));
|
||||
return id;
|
||||
m_HashTable->Put(extension, new wxFileIconEntry(treeid));
|
||||
return treeid;
|
||||
|
||||
#else // !wxUSE_MIMETYPE
|
||||
|
||||
|
||||
@ -88,7 +88,7 @@ void wxMDIParentFrame::Init()
|
||||
}
|
||||
|
||||
bool wxMDIParentFrame::Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
wxWindowID winid,
|
||||
const wxString& title,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
@ -114,7 +114,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
|
||||
m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next"));
|
||||
}
|
||||
|
||||
if ( !wxFrame::Create( parent , id , title , pos , size , style , name ) )
|
||||
if ( !wxFrame::Create( parent , winid , title , pos , size , style , name ) )
|
||||
return false;
|
||||
|
||||
m_parentFrameActive = true;
|
||||
@ -328,7 +328,7 @@ void wxMDIChildFrame::Init()
|
||||
}
|
||||
|
||||
bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
|
||||
wxWindowID id,
|
||||
wxWindowID winid,
|
||||
const wxString& title,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
@ -339,10 +339,10 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
|
||||
|
||||
SetName(name);
|
||||
|
||||
if ( id == wxID_ANY )
|
||||
id = (int)NewControlId();
|
||||
if ( winid == wxID_ANY )
|
||||
winid = (int)NewControlId();
|
||||
|
||||
wxNonOwnedWindow::Create( parent, id, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
|
||||
wxNonOwnedWindow::Create( parent, winid, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
|
||||
|
||||
SetTitle( title );
|
||||
|
||||
|
||||
@ -43,7 +43,7 @@ wxMenuImpl::~wxMenuImpl()
|
||||
{
|
||||
}
|
||||
|
||||
// the (popup) menu title has this special id
|
||||
// the (popup) menu title has this special menuid
|
||||
static const int idMenuTitle = -3;
|
||||
|
||||
// ============================================================================
|
||||
@ -337,8 +337,8 @@ void wxMenu::DoRearrange()
|
||||
|
||||
bool wxMenu::HandleCommandUpdateStatus( wxMenuItem* item, wxWindow* senderWindow )
|
||||
{
|
||||
int id = item ? item->GetId() : 0;
|
||||
wxUpdateUIEvent event(id);
|
||||
int menuid = item ? item->GetId() : 0;
|
||||
wxUpdateUIEvent event(menuid);
|
||||
event.SetEventObject( this );
|
||||
|
||||
bool processed = false;
|
||||
@ -368,11 +368,11 @@ bool wxMenu::HandleCommandUpdateStatus( wxMenuItem* item, wxWindow* senderWindow
|
||||
{
|
||||
// if anything changed, update the changed attribute
|
||||
if (event.GetSetText())
|
||||
SetLabel(id, event.GetText());
|
||||
SetLabel(menuid, event.GetText());
|
||||
if (event.GetSetChecked())
|
||||
Check(id, event.GetChecked());
|
||||
Check(menuid, event.GetChecked());
|
||||
if (event.GetSetEnabled())
|
||||
Enable(id, event.GetEnabled());
|
||||
Enable(menuid, event.GetEnabled());
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -381,11 +381,11 @@ bool wxMenu::HandleCommandUpdateStatus( wxMenuItem* item, wxWindow* senderWindow
|
||||
// always reset them ourselves
|
||||
UInt32 cmd = 0;
|
||||
|
||||
if ( id == wxApp::s_macExitMenuItemId )
|
||||
if ( menuid == wxApp::s_macExitMenuItemId )
|
||||
{
|
||||
cmd = kHICommandQuit;
|
||||
}
|
||||
else if (id == wxApp::s_macPreferencesMenuItemId )
|
||||
else if (menuid == wxApp::s_macPreferencesMenuItemId )
|
||||
{
|
||||
cmd = kHICommandPreferences;
|
||||
}
|
||||
@ -406,18 +406,18 @@ bool wxMenu::HandleCommandUpdateStatus( wxMenuItem* item, wxWindow* senderWindow
|
||||
|
||||
bool wxMenu::HandleCommandProcess( wxMenuItem* item, wxWindow* senderWindow )
|
||||
{
|
||||
int id = item ? item->GetId() : 0;
|
||||
int menuid = item ? item->GetId() : 0;
|
||||
bool processed = false;
|
||||
if (item->IsCheckable())
|
||||
item->Check( !item->IsChecked() ) ;
|
||||
|
||||
if ( SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) )
|
||||
if ( SendEvent( menuid , item->IsCheckable() ? item->IsChecked() : -1 ) )
|
||||
processed = true ;
|
||||
else
|
||||
{
|
||||
if ( senderWindow != NULL )
|
||||
{
|
||||
wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED , id);
|
||||
wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED , menuid);
|
||||
event.SetEventObject(senderWindow);
|
||||
event.SetInt(item->IsCheckable() ? item->IsChecked() : -1);
|
||||
|
||||
@ -436,8 +436,8 @@ bool wxMenu::HandleCommandProcess( wxMenuItem* item, wxWindow* senderWindow )
|
||||
|
||||
void wxMenu::HandleMenuItemHighlighted( wxMenuItem* item )
|
||||
{
|
||||
int id = item ? item->GetId() : 0;
|
||||
wxMenuEvent wxevent(wxEVT_MENU_HIGHLIGHT, id, this);
|
||||
int menuid = item ? item->GetId() : 0;
|
||||
wxMenuEvent wxevent(wxEVT_MENU_HIGHLIGHT, menuid, this);
|
||||
DoHandleMenuEvent( wxevent );
|
||||
}
|
||||
|
||||
@ -598,13 +598,13 @@ void wxMenuBar::MacInstallMenuBar()
|
||||
|
||||
// hide items in the apple menu that don't exist in the wx menubar
|
||||
|
||||
int id = 0;
|
||||
int menuid = 0;
|
||||
wxMenuItem* appleItem = NULL;
|
||||
wxMenuItem* wxItem = NULL;
|
||||
|
||||
id = wxApp::s_macAboutMenuItemId;
|
||||
appleItem = m_appleMenu->FindItem(id);
|
||||
wxItem = FindItem(id);
|
||||
menuid = wxApp::s_macAboutMenuItemId;
|
||||
appleItem = m_appleMenu->FindItem(menuid);
|
||||
wxItem = FindItem(menuid);
|
||||
if ( appleItem != NULL )
|
||||
{
|
||||
if ( wxItem == NULL )
|
||||
@ -613,9 +613,9 @@ void wxMenuBar::MacInstallMenuBar()
|
||||
appleItem->SetItemLabel(wxItem->GetItemLabel());
|
||||
}
|
||||
|
||||
id = wxApp::s_macPreferencesMenuItemId;
|
||||
appleItem = m_appleMenu->FindItem(id);
|
||||
wxItem = FindItem(id);
|
||||
menuid = wxApp::s_macPreferencesMenuItemId;
|
||||
appleItem = m_appleMenu->FindItem(menuid);
|
||||
wxItem = FindItem(menuid);
|
||||
if ( appleItem != NULL )
|
||||
{
|
||||
if ( wxItem == NULL )
|
||||
|
||||
Loading…
Reference in New Issue
Block a user