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

Split this out from other changes to keep things sane..

Browse Source 
wxDeprecated KeyCode.
wxDeprecated old wxList compat methods.
Replaced a large number of them in the gtk build already, but there are
still plenty more so feel free to help nuke them as you find them.
s/^I/    / and s/TRUE/true/ etc. a couple of these too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2003-01-13 05:17:41 +00:00
parent 5797172366
commit b1d4dd7add
59 changed files with 1099 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/common/cmdproc.cpp
View File

@@ -112,10 +112,10 @@ void wxCommandProcessor::Store(wxCommand *command)
{
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;
}
@@ -126,18 +126,18 @@ void wxCommandProcessor::Store(wxCommand *command)
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();
}
@@ -148,7 +148,7 @@ bool wxCommandProcessor::Undo()
{
if ( UndoCommand(*command) )
{
m_currentCommand = m_currentCommand->Previous();
m_currentCommand = m_currentCommand->GetPrevious();
SetMenuStrings();
return TRUE;
}
@@ -165,18 +165,18 @@ bool wxCommandProcessor::Redo()
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();
}
}
@@ -202,13 +202,13 @@ bool wxCommandProcessor::CanUndo() const
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;
@@ -216,7 +216,7 @@ bool wxCommandProcessor::CanRedo() const
void wxCommandProcessor::Initialize()
{
m_currentCommand = m_commands.Last();
m_currentCommand = m_commands.GetLast();
SetMenuStrings();
}
@@ -243,7 +243,7 @@ wxString wxCommandProcessor::GetUndoMenuLabel() const
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();
@@ -267,9 +267,9 @@ wxString wxCommandProcessor::GetRedoMenuLabel() const
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;
@@ -281,7 +281,7 @@ wxString wxCommandProcessor::GetRedoMenuLabel() const
}
else
{
if (m_commands.Number() == 0)
if (m_commands.GetCount() == 0)
{
buf = _("&Redo") + m_redoAccelerator;
}
@@ -289,7 +289,7 @@ wxString wxCommandProcessor::GetRedoMenuLabel() const
{
// 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;
@@ -300,13 +300,13 @@ wxString wxCommandProcessor::GetRedoMenuLabel() const
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;
}