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

fixed variable shadowing icc warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-26 00:29:42 +00:00
parent 8226a05440
commit 4e115ed2c7
18 changed files with 161 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk1/menu.cpp
View File

@@ -558,20 +558,20 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
wxMenu* menu = node->GetData();
wxString str( wxReplaceUnderscore( label ) );
const wxString str( wxReplaceUnderscore( label ) );
menu->SetTitle( str );
if (menu->m_owner)
{
GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
GtkLabel *glabel = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
/* set new text */
gtk_label_set( label, wxGTK_CONV( str ) );
gtk_label_set( glabel, wxGTK_CONV( str ) );
/* reparse key accel */
(void)gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( str ) );
gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );
(void)gtk_label_parse_uline (GTK_LABEL(glabel), wxGTK_CONV( str ) );
gtk_accel_label_refetch( GTK_ACCEL_LABEL(glabel) );
}
}