Rebake from clean wx tree.

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

diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h
index a74a3df5bf5eadc1178b100d5459d0dab07a82cf..6072e7fda0fe222fc6d7bb490fbfbde39c99451e 100644 (file)
--- a/include/wx/cmdproc.h
+++ b/include/wx/cmdproc.h
@@ -16,17 +16,17 @@
 #include "wx/object.h"
 #include "wx/list.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:
     wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString);
 {
 public:
     wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString);

-    ~wxCommand(){}
+    virtual ~wxCommand(){}

 
     // Override this to perform a command
     virtual bool Do() = 0;
 
     // Override this to perform a command
     virtual bool Do() = 0;


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


@@ -87,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);


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