X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f260c476e46c2b1a5e192133707a137db010908e..96defed03c190cb602ed4f7ca6e962a49e10dddd:/include/wx/cmdproc.h

diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h
index ace9465d26..6072e7fda0 100644
--- a/include/wx/cmdproc.h
+++ b/include/wx/cmdproc.h
@@ -12,25 +12,21 @@
 #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"
 
-class WXDLLEXPORT wxMenu;
+class WXDLLIMPEXP_FWD_CORE wxMenu;
 
 // ----------------------------------------------------------------------------
 // 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);
-    ~wxCommand(){}
+    virtual ~wxCommand(){}
 
     // Override this to perform a command
     virtual bool Do() = 0;
@@ -53,7 +49,7 @@ private:
 // 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
@@ -91,7 +87,8 @@ public:
 #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);
@@ -140,7 +137,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxCommandProcessor)
-    DECLARE_NO_COPY_CLASS(wxCommandProcessor)
+    wxDECLARE_NO_COPY_CLASS(wxCommandProcessor);
 };
 
 #endif // _WX_CMDPROC_H_