No real changes, just refactoring.

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

diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h
index d630a152241bfdcade9d61bf5994a7112092cbe4..1200640d372e0f74def296cbf8051fa100a08770 100644 (file)
--- a/include/wx/cmdproc.h
+++ b/include/wx/cmdproc.h
@@ -12,10 +12,11 @@
 #ifndef _WX_CMDPROC_H_
 #define _WX_CMDPROC_H_
 
 #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
 
     #pragma interface "cmdproc.h"
 #endif
 

+#include "wx/defs.h"

 #include "wx/object.h"
 #include "wx/list.h"
 
 #include "wx/object.h"
 #include "wx/list.h"
 


@@ -114,7 +115,7 @@ protected:
 
     int           m_maxNoCommands;
     wxList        m_commands;
 
     int           m_maxNoCommands;
     wxList        m_commands;

-    wxNode*       m_currentCommand;
+    wxList::compatibility_iterator m_currentCommand;

 
 #if wxUSE_MENUS
     wxMenu*       m_commandEditMenu;
 
 #if wxUSE_MENUS
     wxMenu*       m_commandEditMenu;