X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bad93b357fa3e94a6e69bb8db803979eb492e0cf..f148f2bac3fb0fa6d984050fb940112da150aeff:/include/wx/cmdproc.h diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h index 13523e077e..1200640d37 100644 --- a/include/wx/cmdproc.h +++ b/include/wx/cmdproc.h @@ -12,10 +12,11 @@ #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" @@ -28,7 +29,7 @@ class WXDLLEXPORT wxMenu; 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 @@ -114,7 +115,7 @@ protected: int m_maxNoCommands; wxList m_commands; - wxNode* m_currentCommand; + wxList::compatibility_iterator m_currentCommand; #if wxUSE_MENUS wxMenu* m_commandEditMenu;