projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Richtext interface fixes and additions for Phoenix
[wxWidgets.git]
/
include
/
wx
/
cmdproc.h
diff --git
a/include/wx/cmdproc.h
b/include/wx/cmdproc.h
index 9baf2338c2a31c937c719e1b631fe17a94c812c1..4fa3e34c192a94fe317160c26307d1ca0b31bdc5 100644
(file)
--- a/
include/wx/cmdproc.h
+++ b/
include/wx/cmdproc.h
@@
-5,32
+5,28
@@
// Modified by:
// Created: 05.11.00
// RCS-ID: $Id$
// Modified by:
// Created: 05.11.00
// RCS-ID: $Id$
-// Copyright: (c) wxWi
ndow
s team
+// Copyright: (c) wxWi
dget
s team
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CMDPROC_H_
#define _WX_CMDPROC_H_
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CMDPROC_H_
#define _WX_CMDPROC_H_
-#if defined(__GNUG__) && !defined(__APPLE__)
- #pragma interface "cmdproc.h"
-#endif
-
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/list.h"
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/list.h"
-class WXDLL
EXPORT
wxMenu;
+class WXDLL
IMPEXP_FWD_CORE
wxMenu;
// ----------------------------------------------------------------------------
// wxCommand: a single command capable of performing itself
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxCommand: a single command capable of performing itself
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxCommand : public wxObject
+class WXDLL
IMPEXP_CORE
wxCommand : public wxObject
{
public:
{
public:
- wxCommand(bool canUndoIt =
FALSE
, const wxString& name = wxEmptyString);
- ~wxCommand();
+ wxCommand(bool canUndoIt =
false
, const wxString& name = wxEmptyString);
+ virtual ~wxCommand(){}
// Override this to perform a command
virtual bool Do() = 0;
// Override this to perform a command
virtual bool Do() = 0;
@@
-53,7
+49,7
@@
private:
// wxCommandProcessor: wxCommand manager
// ----------------------------------------------------------------------------
// wxCommandProcessor: wxCommand manager
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxCommandProcessor : public wxObject
+class WXDLL
IMPEXP_CORE
wxCommandProcessor : public wxObject
{
public:
// if max number of commands is -1, it is unlimited
{
public:
// if max number of commands is -1, it is unlimited
@@
-61,8
+57,8
@@
public:
virtual ~wxCommandProcessor();
// Pass a command to the processor. The processor calls Do(); if
virtual ~wxCommandProcessor();
// Pass a command to the processor. The processor calls Do(); if
- // successful, is appended to the command history unless storeIt is
FALSE
.
- virtual bool Submit(wxCommand *command, bool storeIt =
TRUE
);
+ // successful, is appended to the command history unless storeIt is
false
.
+ virtual bool Submit(wxCommand *command, bool storeIt =
true
);
// just store the command without executing it
virtual void Store(wxCommand *command);
// just store the command without executing it
virtual void Store(wxCommand *command);
@@
-91,7
+87,8
@@
public:
#endif // wxUSE_MENUS
// command list access
#endif // wxUSE_MENUS
// command list access
- wxList& GetCommands() const { return (wxList&) m_commands; }
+ wxList& GetCommands() { return m_commands; }
+ const wxList& GetCommands() const { return m_commands; }
wxCommand *GetCurrentCommand() const
{
return (wxCommand *)(m_currentCommand ? m_currentCommand->GetData() : NULL);
wxCommand *GetCurrentCommand() const
{
return (wxCommand *)(m_currentCommand ? m_currentCommand->GetData() : NULL);
@@
-99,6
+96,16
@@
public:
int GetMaxCommands() const { return m_maxNoCommands; }
virtual void ClearCommands();
int GetMaxCommands() const { return m_maxNoCommands; }
virtual void ClearCommands();
+ // Has the current project been changed?
+ virtual bool IsDirty() const;
+
+ // Mark the current command as the one where the last save took place
+ void MarkAsSaved()
+ {
+ m_lastSavedCommand = m_currentCommand;
+ }
+
+
// By default, the accelerators are "\tCtrl+Z" and "\tCtrl+Y"
const wxString& GetUndoAccelerator() const { return m_undoAccelerator; }
const wxString& GetRedoAccelerator() const { return m_redoAccelerator; }
// By default, the accelerators are "\tCtrl+Z" and "\tCtrl+Y"
const wxString& GetUndoAccelerator() const { return m_undoAccelerator; }
const wxString& GetRedoAccelerator() const { return m_redoAccelerator; }
@@
-115,7
+122,8
@@
protected:
int m_maxNoCommands;
wxList m_commands;
int m_maxNoCommands;
wxList m_commands;
- wxList::compatibility_iterator m_currentCommand;
+ wxList::compatibility_iterator m_currentCommand,
+ m_lastSavedCommand;
#if wxUSE_MENUS
wxMenu* m_commandEditMenu;
#if wxUSE_MENUS
wxMenu* m_commandEditMenu;
@@
-126,7
+134,8
@@
protected:
private:
DECLARE_DYNAMIC_CLASS(wxCommandProcessor)
private:
DECLARE_DYNAMIC_CLASS(wxCommandProcessor)
- DECLARE_NO_COPY_CLASS(wxCommandProcessor)
+ wxDECLARE_NO_COPY_CLASS(wxCommandProcessor);
};
#endif // _WX_CMDPROC_H_
};
#endif // _WX_CMDPROC_H_
+