{
wxCHECK_RET( command, _T("no command in wxCommandProcessor::Store") );
- if (m_commands.Number() == m_maxNoCommands)
+ if ( (int)m_commands.GetCount() == m_maxNoCommands )
{
- wxNode *firstNode = m_commands.First();
- wxCommand *firstCommand = (wxCommand *)firstNode->Data();
+ wxNode *firstNode = m_commands.GetFirst();
+ wxCommand *firstCommand = (wxCommand *)firstNode->GetData();
delete firstCommand;
delete firstNode;
}
ClearCommands();
else
{
- wxNode *node = m_currentCommand->Next();
+ wxNode *node = m_currentCommand->GetNext();
while (node)
{
- wxNode *next = node->Next();
- delete (wxCommand *)node->Data();
+ wxNode *next = node->GetNext();
+ delete (wxCommand *)node->GetData();
delete node;
node = next;
}
}
m_commands.Append(command);
- m_currentCommand = m_commands.Last();
+ m_currentCommand = m_commands.GetLast();
SetMenuStrings();
}
{
if ( UndoCommand(*command) )
{
- m_currentCommand = m_currentCommand->Previous();
+ m_currentCommand = m_currentCommand->GetPrevious();
SetMenuStrings();
return TRUE;
}
if ( m_currentCommand )
{
// is there anything to redo?
- if ( m_currentCommand->Next() )
+ if ( m_currentCommand->GetNext() )
{
- redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
- redoNode = m_currentCommand->Next();
+ redoCommand = (wxCommand *)m_currentCommand->GetNext()->GetData();
+ redoNode = m_currentCommand->GetNext();
}
}
else // no current command, redo the first one
{
- if (m_commands.Number() > 0)
+ if (m_commands.GetCount() > 0)
{
- redoCommand = (wxCommand *)m_commands.First()->Data();
- redoNode = m_commands.First();
+ redoCommand = (wxCommand *)m_commands.GetFirst()->GetData();
+ redoNode = m_commands.GetFirst();
}
}
bool wxCommandProcessor::CanRedo() const
{
- if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() == (wxNode*) NULL))
+ if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->GetNext() == (wxNode*) NULL))
return FALSE;
- if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() != (wxNode*) NULL))
+ if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->GetNext() != (wxNode*) NULL))
return TRUE;
- if ((m_currentCommand == (wxNode*) NULL) && (m_commands.Number() > 0))
+ if ((m_currentCommand == (wxNode*) NULL) && (m_commands.GetCount() > 0))
return TRUE;
return FALSE;
void wxCommandProcessor::Initialize()
{
- m_currentCommand = m_commands.Last();
+ m_currentCommand = m_commands.GetLast();
SetMenuStrings();
}
wxString buf;
if (m_currentCommand)
{
- wxCommand *command = (wxCommand *)m_currentCommand->Data();
+ wxCommand *command = (wxCommand *)m_currentCommand->GetData();
wxString commandName(command->GetName());
if (commandName == wxT("")) commandName = _("Unnamed command");
bool canUndo = command->CanUndo();
if (m_currentCommand)
{
// We can redo, if we're not at the end of the history.
- if (m_currentCommand->Next())
+ if (m_currentCommand->GetNext())
{
- wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
+ wxCommand *redoCommand = (wxCommand *)m_currentCommand->GetNext()->GetData();
wxString redoCommandName(redoCommand->GetName());
if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
}
else
{
- if (m_commands.Number() == 0)
+ if (m_commands.GetCount() == 0)
{
buf = _("&Redo") + m_redoAccelerator;
}
{
// currentCommand is NULL but there are commands: this means that
// we've undone to the start of the list, but can redo the first.
- wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data();
+ wxCommand *redoCommand = (wxCommand *)m_commands.GetFirst()->GetData();
wxString redoCommandName(redoCommand->GetName());
if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
void wxCommandProcessor::ClearCommands()
{
- wxNode *node = m_commands.First();
+ wxNode *node = m_commands.GetFirst();
while (node)
{
- wxCommand *command = (wxCommand *)node->Data();
+ wxCommand *command = (wxCommand *)node->GetData();
delete command;
delete node;
- node = m_commands.First();
+ node = m_commands.GetFirst();
}
m_currentCommand = (wxNode *) NULL;
}