From: Mart Raudsepp <leio@gentoo.org>
Date: Fri, 3 Feb 2006 23:38:01 +0000 (+0000)
Subject: GTK2: gtk_check_menu_item_set_state -> _set_active; gtk_label_{parse_uline,set_text... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8394218c1365ae262862efe96089f31ee89b881b

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
---

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 10763c9f01..0178cad93d 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -511,17 +511,7 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
     menu->SetTitle( str );
 
     if (menu->m_owner)
-    {
-        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) );
-    }
-
+        gtk_label_set_text_with_mnemonic( GTK_LABEL( GTK_BIN(menu->m_owner)->child), wxGTK_CONV(str) );
 }
 
 //-----------------------------------------------------------------------------
@@ -875,7 +865,7 @@ void wxMenuItem::Check( bool check )
     {
         case wxITEM_CHECK:
         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;
 
         default: