Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correcting merge conflict

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-01-07 22:14:31 +00:00
parent 46b03af7ae
commit 38c69d200d
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/menucmn.cpp
View File

@@ -155,15 +155,6 @@ const wxMenuInfoHelperList& wxMenuBarBase::GetMenuInfos() const
#endif #endif
wxBEGIN_PROPERTIES_TABLE(wxMenuBar)
wxPROPERTY_COLLECTION( MenuInfos, wxMenuInfoList, wxMenuInfo*, AppendMenuInfo, \
GetMenuInfos, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
wxEND_PROPERTIES_TABLE()
wxEMPTY_HANDLERS_TABLE(wxMenuBar)
wxCONSTRUCTOR_DUMMY( wxMenuBar )
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// XTI for wxMenuItem // XTI for wxMenuItem
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------