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

Compile fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-11 18:39:49 +00:00
parent 808260ec32
commit 68bc148cac
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/menu.h
View File

@@ -512,19 +512,6 @@ protected:
DECLARE_NO_COPY_CLASS(wxMenuBarBase) DECLARE_NO_COPY_CLASS(wxMenuBarBase)
}; };
#if WXWIN_COMPATIBILITY_2_8
// get or change the label of the menu at given position
void wxMenuBarBase::SetLabelTop(size_t pos, const wxString& label)
{
SetMenuLabel(pos, label);
}
wxString wxMenuBarBase::GetLabelTop(size_t pos) const
{
return GetMenuLabel(pos);
}
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// include the real class declaration // include the real class declaration
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

3
samples/menu/menu.cpp
View File

@@ -858,8 +858,9 @@ void MyFrame::OnGetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
if ( item ) if ( item )
{ {
wxString label = item->GetItemLabel();
wxLogMessage(_T("The label of the last menu item is '%s'"), wxLogMessage(_T("The label of the last menu item is '%s'"),
item->GetLabel().c_str()); label.c_str());
} }
} }

16
src/common/menucmn.cpp
View File

@@ -307,7 +307,7 @@ int wxMenuBase::FindItem(const wxString& text) const
// name just like the ordinary items // name just like the ordinary items
if ( !item->IsSeparator() ) if ( !item->IsSeparator() )
{ {
if ( item->GetLabel() == label ) if ( item->GetItemLabelText() == label )
return item->GetId(); return item->GetId();
} }
} }
@@ -839,4 +839,18 @@ void wxMenuBarBase::UpdateMenus( void )
} }
} }
#if WXWIN_COMPATIBILITY_2_8
// get or change the label of the menu at given position
void wxMenuBarBase::SetLabelTop(size_t pos, const wxString& label)
{
SetMenuLabel(pos, label);
}
wxString wxMenuBarBase::GetLabelTop(size_t pos) const
{
return GetMenuLabel(pos);
}
#endif
#endif // wxUSE_MENUS #endif // wxUSE_MENUS