X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1d4dd7add411ebff1ce4a8d1d992e0e43ee26b1..400a9e419b229cd511d73922bd5506aaab3b120e:/include/wx/cmdproc.h diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h index 0e5547a6b7..1200640d37 100644 --- a/include/wx/cmdproc.h +++ b/include/wx/cmdproc.h @@ -12,13 +12,16 @@ #ifndef _WX_CMDPROC_H_ #define _WX_CMDPROC_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#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; + // ---------------------------------------------------------------------------- // wxCommand: a single command capable of performing itself // ---------------------------------------------------------------------------- @@ -26,7 +29,7 @@ class WXDLLEXPORT wxCommand : public wxObject { public: - wxCommand(bool canUndoIt = FALSE, const wxString& name = wxT("")); + wxCommand(bool canUndoIt = FALSE, const wxString& name = wxEmptyString); ~wxCommand(); // Override this to perform a command @@ -112,7 +115,7 @@ protected: int m_maxNoCommands; wxList m_commands; - wxNode* m_currentCommand; + wxList::compatibility_iterator m_currentCommand; #if wxUSE_MENUS wxMenu* m_commandEditMenu;