The usual amount of trash over my telephone fixed

[wxWidgets.git] / src / gtk / menu.cpp

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index f0c5335454b49e4db5f085ee8f7107d4ed96deaf..4696faeb11a73dd4df88c5214ecb175de663c88f 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -155,14 +155,38 @@ bool wxMenuBar::Enabled( int id ) const
     return FALSE;
 }
 
     return FALSE;
 }
 

+wxString wxMenuBar::GetLabel( int id ) const
+{
+    wxMenuItem* item = FindMenuItemById( id );
+    if (item) return item->GetText();
+    return "";
+}
+
+void wxMenuBar::SetLabel( int id, const wxString &label )
+{
+    wxMenuItem* item = FindMenuItemById( id );
+    if (item) return item->SetText( label );
+}
+
+void wxMenuBar::EnableTop( int WXUNUSED(pos), bool WXUNUSED(flag) )
+{
+}
+
+wxString wxMenuBar::GetLabelTop( int WXUNUSED(pos) ) const
+{
+  return "menu";
+}
+
+void wxMenuBar::SetLabelTop( int WXUNUSED(pos), const wxString& WXUNUSED(label) )
+{
+}
+

 //-----------------------------------------------------------------------------
 // "activate"
 //-----------------------------------------------------------------------------
 
 static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 {
 //-----------------------------------------------------------------------------
 // "activate"
 //-----------------------------------------------------------------------------
 
 static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 {

-    wxYield();
-

     int id = menu->FindMenuIdByMenuItem(widget);
 
     /* should find it for normal (not popup) menu */
     int id = menu->FindMenuIdByMenuItem(widget);
 
     /* should find it for normal (not popup) menu */