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

STL-ification patch for wxMSW and wxGTK.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-10 19:55:12 +00:00
parent 6992d326eb
commit 222ed1d678
73 changed files with 668 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/cmdproc.cpp
View File

@@ -64,7 +64,6 @@ wxCommand::~wxCommand()
wxCommandProcessor::wxCommandProcessor(int maxCommands)
{
m_maxNoCommands = maxCommands;
m_currentCommand = (wxNode *) NULL;
#if wxUSE_MENUS
m_commandEditMenu = (wxMenu *) NULL;
#endif // wxUSE_MENUS
@@ -114,10 +113,10 @@ void wxCommandProcessor::Store(wxCommand *command)
if ( (int)m_commands.GetCount() == m_maxNoCommands )
{
wxNode *firstNode = m_commands.GetFirst();
wxList::compatibility_iterator firstNode = m_commands.GetFirst();
wxCommand *firstCommand = (wxCommand *)firstNode->GetData();
delete firstCommand;
delete firstNode;
m_commands.Erase(firstNode);
}
// Correct a bug: we must chop off the current 'branch'
@@ -126,12 +125,12 @@ void wxCommandProcessor::Store(wxCommand *command)
ClearCommands();
else
{
wxNode *node = m_currentCommand->GetNext();
wxList::compatibility_iterator node = m_currentCommand->GetNext();
while (node)
{
wxNode *next = node->GetNext();
wxList::compatibility_iterator next = node->GetNext();
delete (wxCommand *)node->GetData();
delete node;
m_commands.Erase(node);
node = next;
}
}
@@ -160,7 +159,7 @@ bool wxCommandProcessor::Undo()
bool wxCommandProcessor::Redo()
{
wxCommand *redoCommand = (wxCommand *) NULL;
wxNode *redoNode = (wxNode *) NULL;
wxList::compatibility_iterator redoNode;
if ( m_currentCommand )
{
@@ -202,13 +201,13 @@ bool wxCommandProcessor::CanUndo() const
bool wxCommandProcessor::CanRedo() const
{
if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->GetNext() == (wxNode*) NULL))
if (m_currentCommand && !m_currentCommand->GetNext())
return FALSE;
if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->GetNext() != (wxNode*) NULL))
if (m_currentCommand && m_currentCommand->GetNext())
return TRUE;
if ((m_currentCommand == (wxNode*) NULL) && (m_commands.GetCount() > 0))
if (!m_currentCommand && (m_commands.GetCount() > 0))
return TRUE;
return FALSE;
@@ -300,15 +299,15 @@ wxString wxCommandProcessor::GetRedoMenuLabel() const
void wxCommandProcessor::ClearCommands()
{
wxNode *node = m_commands.GetFirst();
wxList::compatibility_iterator node = m_commands.GetFirst();
while (node)
{
wxCommand *command = (wxCommand *)node->GetData();
delete command;
delete node;
m_commands.Erase(node);
node = m_commands.GetFirst();
}
m_currentCommand = (wxNode *) NULL;
m_currentCommand = wxList::compatibility_iterator();
}