Fix warnings in the MSW IE backend.

[wxWidgets.git] / include / wx / cmdproc.h

diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h
index 7062fdcae3f7e8833ff8ad38685711f9b0b09c08..6072e7fda0fe222fc6d7bb490fbfbde39c99451e 100644 (file)
--- a/include/wx/cmdproc.h
+++ b/include/wx/cmdproc.h
@@ -6,31 +6,27 @@
 // Created:     05.11.00
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Created:     05.11.00
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CMDPROC_H_
 #define _WX_CMDPROC_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CMDPROC_H_
 #define _WX_CMDPROC_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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 WXDLLEXPORT wxMenu;
+class WXDLLIMPEXP_FWD_CORE wxMenu;

 
 // ----------------------------------------------------------------------------
 // wxCommand: a single command capable of performing itself
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxCommand: a single command capable of performing itself
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxCommand : public wxObject
+class WXDLLIMPEXP_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 WXDLLEXPORT wxCommandProcessor : public wxObject
+class WXDLLIMPEXP_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,19 @@ 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
+    {
+        return m_currentCommand && (m_lastSavedCommand != m_currentCommand);
+    }
+
+    // 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 +125,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 +137,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_

+