Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h
index ef5929870f6953abf5a117c53d47900623231e54..c6125096a01650c56de62e494991a5b03a745cf4 100644 (file)
--- a/include/wx/cmdproc.h
+++ b/include/wx/cmdproc.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart (extracted from docview.h by VZ)
 // Modified by:
 // Created:     05.11.00
 // Author:      Julian Smart (extracted from docview.h by VZ)
 // Modified by:
 // Created:     05.11.00

-// RCS-ID:      $Id$

 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -22,7 +21,7 @@ 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:
     wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString);
 {
 public:
     wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString);


@@ -49,7 +48,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


@@ -97,10 +96,7 @@ public:
     virtual void ClearCommands();
 
     // Has the current project been changed?
     virtual void ClearCommands();
 
     // Has the current project been changed?

-    virtual bool IsDirty() const
-    {
-        return m_currentCommand && (m_lastSavedCommand != m_currentCommand);
-    }
+    virtual bool IsDirty() const;

 
     // Mark the current command as the one where the last save took place
     void MarkAsSaved()
 
     // Mark the current command as the one where the last save took place
     void MarkAsSaved()


@@ -137,7 +133,7 @@ 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_