X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f260c476e46c2b1a5e192133707a137db010908e..8257d7cd478c54532cc7d8fd0ace9faf5e9efb23:/include/wx/cmdproc.h diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h index ace9465d26..ef5929870f 100644 --- a/include/wx/cmdproc.h +++ b/include/wx/cmdproc.h @@ -12,15 +12,11 @@ #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 @@ -30,7 +26,7 @@ class WXDLLEXPORT 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; @@ -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);