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

Fixed undo batching

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2008-02-13 16:28:00 +00:00
parent 815399d5bb
commit 0745f36410
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/richtext/richtextbuffer.cpp
View File

@@ -5091,7 +5091,7 @@ bool wxRichTextBuffer::BeginBatchUndo(const wxString& cmdName)
wxASSERT(m_batchedCommand == NULL);
if (m_batchedCommand)
{
GetCommandProcessor()->Submit(m_batchedCommand);
GetCommandProcessor()->Store(m_batchedCommand);
}
m_batchedCommand = new wxRichTextCommand(cmdName);
}
@@ -5111,7 +5111,7 @@ bool wxRichTextBuffer::EndBatchUndo()
if (m_batchedCommandDepth == 0)
{
GetCommandProcessor()->Submit(m_batchedCommand);
GetCommandProcessor()->Store(m_batchedCommand);
m_batchedCommand = NULL;
}
@@ -5122,7 +5122,15 @@ bool wxRichTextBuffer::EndBatchUndo()
bool wxRichTextBuffer::SubmitAction(wxRichTextAction* action)
{
if (BatchingUndo() && m_batchedCommand && !SuppressingUndo())
{
wxRichTextCommand* cmd = new wxRichTextCommand(action->GetName());
cmd->AddAction(action);
cmd->Do();
cmd->GetActions().Clear();
delete cmd;
m_batchedCommand->AddAction(action);
}
else
{
wxRichTextCommand* cmd = new wxRichTextCommand(action->GetName());