GTK2: gtk_check_menu_item_set_state -> _set_active; gtk_label_{parse_uline,set_text} and co ->
gtk_label_set_text_with_mnenomics git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -511,17 +511,7 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
|
|||||||
menu->SetTitle( str );
|
menu->SetTitle( str );
|
||||||
|
|
||||||
if (menu->m_owner)
|
if (menu->m_owner)
|
||||||
{
|
gtk_label_set_text_with_mnemonic( GTK_LABEL( GTK_BIN(menu->m_owner)->child), wxGTK_CONV(str) );
|
||||||
GtkLabel *glabel = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
|
|
||||||
|
|
||||||
/* set new text */
|
|
||||||
gtk_label_set_text( glabel, wxGTK_CONV( str ) );
|
|
||||||
|
|
||||||
/* reparse key accel */
|
|
||||||
(void)gtk_label_parse_uline (GTK_LABEL(glabel), wxGTK_CONV( str ) );
|
|
||||||
gtk_accel_label_refetch( GTK_ACCEL_LABEL(glabel) );
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
@@ -875,7 +865,7 @@ void wxMenuItem::Check( bool check )
|
|||||||
{
|
{
|
||||||
case wxITEM_CHECK:
|
case wxITEM_CHECK:
|
||||||
case wxITEM_RADIO:
|
case wxITEM_RADIO:
|
||||||
gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
|
gtk_check_menu_item_set_active( (GtkCheckMenuItem*)m_menuItem, (gint)check );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
Reference in New Issue
Block a user