first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
@@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: docview.cpp
|
||||
// Name: src/common/docview.cpp
|
||||
// Purpose: Document/view classes
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
@@ -57,6 +57,7 @@
|
||||
#include "wx/docview.h"
|
||||
#include "wx/confbase.h"
|
||||
#include "wx/file.h"
|
||||
#include "wx/cmdproc.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
@@ -76,20 +77,18 @@
|
||||
// wxWindows macros
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
|
||||
IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
|
||||
IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
|
||||
IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
|
||||
IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
|
||||
|
||||
#if wxUSE_PRINTING_ARCHITECTURE
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
|
||||
#endif
|
||||
#if wxUSE_PRINTING_ARCHITECTURE
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
|
||||
#endif
|
||||
|
||||
IMPLEMENT_CLASS(wxCommand, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// function prototypes
|
||||
@@ -1837,224 +1836,6 @@ void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, in
|
||||
|
||||
#endif // wxUSE_PRINTING_ARCHITECTURE
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Command processing framework
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
wxCommand::wxCommand(bool canUndoIt, const wxString& name)
|
||||
{
|
||||
m_canUndo = canUndoIt;
|
||||
m_commandName = name;
|
||||
}
|
||||
|
||||
wxCommand::~wxCommand()
|
||||
{
|
||||
}
|
||||
|
||||
// Command processor
|
||||
wxCommandProcessor::wxCommandProcessor(int maxCommands)
|
||||
{
|
||||
m_maxNoCommands = maxCommands;
|
||||
m_currentCommand = (wxNode *) NULL;
|
||||
m_commandEditMenu = (wxMenu *) NULL;
|
||||
m_undoAccelerator = wxT("\tCtrl+Z");
|
||||
m_redoAccelerator = wxT("\tCtrl+Y");
|
||||
}
|
||||
|
||||
wxCommandProcessor::~wxCommandProcessor()
|
||||
{
|
||||
ClearCommands();
|
||||
}
|
||||
|
||||
// Pass a command to the processor. The processor calls Do();
|
||||
// if successful, is appended to the command history unless
|
||||
// storeIt is FALSE.
|
||||
bool wxCommandProcessor::Submit(wxCommand *command, bool storeIt)
|
||||
{
|
||||
bool success = command->Do();
|
||||
if (success && storeIt)
|
||||
{
|
||||
if (m_commands.Number() == m_maxNoCommands)
|
||||
{
|
||||
wxNode *firstNode = m_commands.First();
|
||||
wxCommand *firstCommand = (wxCommand *)firstNode->Data();
|
||||
delete firstCommand;
|
||||
delete firstNode;
|
||||
}
|
||||
|
||||
// Correct a bug: we must chop off the current 'branch'
|
||||
// so that we're at the end of the command list.
|
||||
if (!m_currentCommand)
|
||||
ClearCommands();
|
||||
else
|
||||
{
|
||||
wxNode *node = m_currentCommand->Next();
|
||||
while (node)
|
||||
{
|
||||
wxNode *next = node->Next();
|
||||
delete (wxCommand *)node->Data();
|
||||
delete node;
|
||||
node = next;
|
||||
}
|
||||
}
|
||||
|
||||
m_commands.Append(command);
|
||||
m_currentCommand = m_commands.Last();
|
||||
SetMenuStrings();
|
||||
}
|
||||
return success;
|
||||
}
|
||||
|
||||
bool wxCommandProcessor::Undo()
|
||||
{
|
||||
if (m_currentCommand)
|
||||
{
|
||||
wxCommand *command = (wxCommand *)m_currentCommand->Data();
|
||||
if (command->CanUndo())
|
||||
{
|
||||
bool success = command->Undo();
|
||||
if (success)
|
||||
{
|
||||
m_currentCommand = m_currentCommand->Previous();
|
||||
SetMenuStrings();
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
bool wxCommandProcessor::Redo()
|
||||
{
|
||||
wxCommand *redoCommand = (wxCommand *) NULL;
|
||||
wxNode *redoNode = (wxNode *) NULL;
|
||||
if (m_currentCommand && m_currentCommand->Next())
|
||||
{
|
||||
redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
|
||||
redoNode = m_currentCommand->Next();
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m_commands.Number() > 0)
|
||||
{
|
||||
redoCommand = (wxCommand *)m_commands.First()->Data();
|
||||
redoNode = m_commands.First();
|
||||
}
|
||||
}
|
||||
|
||||
if (redoCommand)
|
||||
{
|
||||
bool success = redoCommand->Do();
|
||||
if (success)
|
||||
{
|
||||
m_currentCommand = redoNode;
|
||||
SetMenuStrings();
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
bool wxCommandProcessor::CanUndo() const
|
||||
{
|
||||
if (m_currentCommand)
|
||||
return ((wxCommand *)m_currentCommand->Data())->CanUndo();
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
bool wxCommandProcessor::CanRedo() const
|
||||
{
|
||||
if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() == (wxNode*) NULL))
|
||||
return FALSE;
|
||||
|
||||
if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() != (wxNode*) NULL))
|
||||
return TRUE;
|
||||
|
||||
if ((m_currentCommand == (wxNode*) NULL) && (m_commands.Number() > 0))
|
||||
return TRUE;
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void wxCommandProcessor::Initialize()
|
||||
{
|
||||
m_currentCommand = m_commands.Last();
|
||||
SetMenuStrings();
|
||||
}
|
||||
|
||||
void wxCommandProcessor::SetMenuStrings()
|
||||
{
|
||||
if (m_commandEditMenu)
|
||||
{
|
||||
wxString buf;
|
||||
if (m_currentCommand)
|
||||
{
|
||||
wxCommand *command = (wxCommand *)m_currentCommand->Data();
|
||||
wxString commandName(command->GetName());
|
||||
if (commandName == wxT("")) commandName = _("Unnamed command");
|
||||
bool canUndo = command->CanUndo();
|
||||
if (canUndo)
|
||||
buf = wxString(_("&Undo ")) + commandName + m_undoAccelerator;
|
||||
else
|
||||
buf = wxString(_("Can't &Undo ")) + commandName + m_undoAccelerator;
|
||||
|
||||
m_commandEditMenu->SetLabel(wxID_UNDO, buf);
|
||||
m_commandEditMenu->Enable(wxID_UNDO, canUndo);
|
||||
|
||||
// We can redo, if we're not at the end of the history.
|
||||
if (m_currentCommand->Next())
|
||||
{
|
||||
wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
|
||||
wxString redoCommandName(redoCommand->GetName());
|
||||
if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
|
||||
buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
|
||||
m_commandEditMenu->SetLabel(wxID_REDO, buf);
|
||||
m_commandEditMenu->Enable(wxID_REDO, TRUE);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo") + m_redoAccelerator);
|
||||
m_commandEditMenu->Enable(wxID_REDO, FALSE);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m_commandEditMenu->SetLabel(wxID_UNDO, _("&Undo") + m_undoAccelerator);
|
||||
m_commandEditMenu->Enable(wxID_UNDO, FALSE);
|
||||
|
||||
if (m_commands.Number() == 0)
|
||||
{
|
||||
m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo") + m_redoAccelerator);
|
||||
m_commandEditMenu->Enable(wxID_REDO, FALSE);
|
||||
}
|
||||
else
|
||||
{
|
||||
// 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();
|
||||
wxString redoCommandName(redoCommand->GetName());
|
||||
if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
|
||||
buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
|
||||
m_commandEditMenu->SetLabel(wxID_REDO, buf);
|
||||
m_commandEditMenu->Enable(wxID_REDO, TRUE);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void wxCommandProcessor::ClearCommands()
|
||||
{
|
||||
wxNode *node = m_commands.First();
|
||||
while (node)
|
||||
{
|
||||
wxCommand *command = (wxCommand *)node->Data();
|
||||
delete command;
|
||||
delete node;
|
||||
node = m_commands.First();
|
||||
}
|
||||
m_currentCommand = (wxNode *) NULL;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// File history processor
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user