X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88d197753d7595709727d9b6a79f1772c2f12a39..34097680c05edc672b61dd413022cd8b9ad0294f:/src/gtk/menu.cpp?ds=inline diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 4b1f261f3c..1be1da30ef 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -7,11 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "menu.h" - #pragma implementation "menuitem.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -563,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) ); } }