X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/289532452089421ddadbd4726a8469511a19ab76..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/menu.h?ds=sidebyside

diff --git a/include/wx/menu.h b/include/wx/menu.h
index 50bdda2796..f392729270 100644
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -398,11 +398,11 @@ protected:
 // XTI accessor
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMenuInfo : public wxObject
+class WXDLLEXPORT wxMenuInfoHelper : public wxObject
 {
 public:
-    wxMenuInfo() { m_menu = NULL; }
-    virtual ~wxMenuInfo() { }
+    wxMenuInfoHelper() { m_menu = NULL; }
+    virtual ~wxMenuInfoHelper() { }
     
     bool Create( wxMenu *menu, const wxString &title )
     { 
@@ -418,10 +418,10 @@ private:
     wxMenu *m_menu;
     wxString m_title;
     
-    DECLARE_DYNAMIC_CLASS(wxMenuInfo)
+    DECLARE_DYNAMIC_CLASS(wxMenuInfoHelper)
 };
 
-WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList );
+WX_DECLARE_EXPORTED_LIST(wxMenuInfoHelper, wxMenuInfoHelperList );
 
 #endif
 
@@ -543,9 +543,9 @@ public:
 
 #if wxUSE_EXTENDED_RTTI    
     // XTI helpers:
-    bool AppendMenuInfo( const wxMenuInfo *info )
+    bool AppendMenuInfo( const wxMenuInfoHelper *info )
     { return Append( info->GetMenu(), info->GetTitle() ); }
-    const wxMenuInfoList& GetMenuInfos() const;
+    const wxMenuInfoHelperList& GetMenuInfos() const;
 #endif
     
 #if WXWIN_COMPATIBILITY_2_8
@@ -562,7 +562,7 @@ protected:
 
 #if wxUSE_EXTENDED_RTTI    
     // used by XTI
-    wxMenuInfoList m_menuInfos;
+    wxMenuInfoHelperList m_menuInfos;
 #endif
     
     // the frame we are attached to (may be NULL)
@@ -580,8 +580,6 @@ protected:
 #else // !wxUSE_BASE_CLASSES_ONLY
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/menu.h"
-#elif defined(__WXPALMOS__)
-    #include "wx/palmos/menu.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/menu.h"
 #elif defined(__WXMOTIF__)