From 54912101ff14f15942ffaaf4a13ad31f9486fa8a Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 7 Jan 2011 21:51:19 +0000 Subject: [PATCH] avoid type conflict with univ wxMenuInfo git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/menu.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wx/menu.h b/include/wx/menu.h index 50bdda2796..7525bc763f 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)