projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
XRC needs wxXML, check it
[wxWidgets.git]
/
include
/
wx
/
cmdproc.h
diff --git
a/include/wx/cmdproc.h
b/include/wx/cmdproc.h
index b5b8b88b10a7867f92ac91858dd90102cab5ab55..563c8480d206c7d6316159883b8f302594546084 100644
(file)
--- a/
include/wx/cmdproc.h
+++ b/
include/wx/cmdproc.h
@@
-5,20
+5,23
@@
// 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__
)
+#if defined(__GNUG__) && !defined(
NO_GCC_PRAGMA
)
#pragma interface "cmdproc.h"
#endif
#pragma interface "cmdproc.h"
#endif
+#include "wx/defs.h"
#include "wx/object.h"
#include "wx/list.h"
#include "wx/object.h"
#include "wx/list.h"
+class WXDLLEXPORT wxMenu;
+
// ----------------------------------------------------------------------------
// wxCommand: a single command capable of performing itself
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxCommand: a single command capable of performing itself
// ----------------------------------------------------------------------------
@@
-26,7
+29,7
@@
class WXDLLEXPORT wxCommand : public wxObject
{
public:
class WXDLLEXPORT wxCommand : public wxObject
{
public:
- wxCommand(bool canUndoIt =
FALSE, const wxString& name = wxT("")
);
+ wxCommand(bool canUndoIt =
false, const wxString& name = wxEmptyString
);
~wxCommand();
// Override this to perform a command
~wxCommand();
// Override this to perform a command
@@
-58,8
+61,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);
@@
-69,9
+72,18
@@
public:
virtual bool CanUndo() const;
virtual bool CanRedo() const;
virtual bool CanUndo() const;
virtual bool CanRedo() const;
+ // Initialises the current command and menu strings.
virtual void Initialize();
virtual void Initialize();
+
+ // Sets the Undo/Redo menu strings for the current menu.
virtual void SetMenuStrings();
virtual void SetMenuStrings();
+ // Gets the current Undo menu label.
+ wxString GetUndoMenuLabel() const;
+
+ // Gets the current Undo menu label.
+ wxString GetRedoMenuLabel() const;
+
#if wxUSE_MENUS
// Call this to manage an edit menu.
void SetEditMenu(wxMenu *menu) { m_commandEditMenu = menu; }
#if wxUSE_MENUS
// Call this to manage an edit menu.
void SetEditMenu(wxMenu *menu) { m_commandEditMenu = menu; }
@@
-82,7
+94,7
@@
public:
wxList& GetCommands() const { return (wxList&) m_commands; }
wxCommand *GetCurrentCommand() const
{
wxList& GetCommands() const { return (wxList&) m_commands; }
wxCommand *GetCurrentCommand() const
{
- return (wxCommand *)(m_currentCommand ? m_currentCommand->Data() : NULL);
+ return (wxCommand *)(m_currentCommand ? m_currentCommand->
Get
Data() : NULL);
}
int GetMaxCommands() const { return m_maxNoCommands; }
virtual void ClearCommands();
}
int GetMaxCommands() const { return m_maxNoCommands; }
virtual void ClearCommands();
@@
-103,7
+115,7
@@
protected:
int m_maxNoCommands;
wxList m_commands;
int m_maxNoCommands;
wxList m_commands;
- wx
Node*
m_currentCommand;
+ wx
List::compatibility_iterator
m_currentCommand;
#if wxUSE_MENUS
wxMenu* m_commandEditMenu;
#if wxUSE_MENUS
wxMenu* m_commandEditMenu;
@@
-114,6
+126,7
@@
protected:
private:
DECLARE_DYNAMIC_CLASS(wxCommandProcessor)
private:
DECLARE_DYNAMIC_CLASS(wxCommandProcessor)
+ DECLARE_NO_COPY_CLASS(wxCommandProcessor)
};
#endif // _WX_CMDPROC_H_
};
#endif // _WX_CMDPROC_H_