compilation fixes for gcc 2.7.2.1 under FreeBSD

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

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 6df21c5987d8db737ad35ce988553a2baa8d17ec..aff2211922fa246801ac7cd44f134b303dd956dc 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -2,18 +2,23 @@
 // Name:        menu.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        menu.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifdef __GNUG__
 #pragma implementation "menu.h"
 #ifdef __GNUG__
 #pragma implementation "menu.h"

+#pragma implementation "menuitem.h"

 #endif
 
 #include "wx/menu.h"
 #endif
 
 #include "wx/menu.h"

+#include "wx/log.h"
+#include "wx/intl.h"
+#include "wx/app.h"
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"

 
 //-----------------------------------------------------------------------------
 // wxMenuBar
 
 //-----------------------------------------------------------------------------
 // wxMenuBar


@@ -21,273 +26,686 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 

-wxMenuBar::wxMenuBar(void)
+wxMenuBar::wxMenuBar( long style )

 {
 {

-  m_needParent = FALSE; // hmmm
-  
-  PreCreation( NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
+    m_needParent = FALSE; // hmmm
+
+    PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
+
+    m_menus.DeleteContents( TRUE );
+
+    m_menubar = gtk_menu_bar_new();
+
+    if (style & wxMB_DOCKABLE)
+    {
+        m_widget = gtk_handle_box_new();
+       gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_menubar) );
+       gtk_widget_show( GTK_WIDGET(m_menubar) );
+    }
+    else
+    {
+        m_widget = GTK_WIDGET(m_menubar);
+    }
+
+    PostCreation();
+
+    Show( TRUE );
+}
+
+wxMenuBar::wxMenuBar()
+{
+    m_needParent = FALSE; // hmmm
+
+    PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
+
+    m_menus.DeleteContents( TRUE );
+
+    m_menubar = gtk_menu_bar_new();
+
+        m_widget = GTK_WIDGET(m_menubar);
+
+    PostCreation();
+
+    Show( TRUE );
+}
+
+void wxMenuBar::Append( wxMenu *menu, const wxString &title )
+{
+    m_menus.Append( menu );
+    menu->m_title = title; 
+
+    int pos;
+    do 
+    {
+        pos = menu->m_title.First( '&' );
+        if (pos != -1) menu->m_title.Remove( pos, 1 );
+    } while (pos != -1);
+
+    menu->m_owner = gtk_menu_item_new_with_label( WXSTRINGCAST(menu->m_title) );
+    gtk_widget_show( menu->m_owner );
+    gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
+
+    gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner );
+}
+
+static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
+{
+    if (menu->m_title == menuString)
+    {
+        int res = menu->FindItem( itemString );
+        if (res != -1) return res;
+    }
+    
+    wxNode *node = menu->m_items.First();
+    while (node)
+    {
+        wxMenuItem *item = (wxMenuItem*)node->Data();
+        if (item->IsSubMenu())
+            return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
+
+        node = node->Next();
+    }
+
+    return -1;
+}
+
+int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
+{
+    wxNode *node = m_menus.First();
+    while (node)
+    {
+        wxMenu *menu = (wxMenu*)node->Data();
+        int res = FindMenuItemRecursive( menu, menuString, itemString);
+        if (res != -1) return res;
+        node = node->Next();
+    }
+    return -1;
+}
+
+/* Find a wxMenuItem using its id. Recurses down into sub-menus */
+static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
+{
+    wxMenuItem* result = menu->FindItem(id);
+
+    wxNode *node = menu->m_items.First();
+    while ( node && result == NULL ) 
+    {
+        wxMenuItem *item = (wxMenuItem*)node->Data();
+        if (item->IsSubMenu())
+       {
+            result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
+       }
+        node = node->Next();
+    }
+
+    return result;
+}
+
+wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const
+{
+    wxMenuItem* result = 0;
+    wxNode *node = m_menus.First();
+    while (node && result == 0)
+    {
+        wxMenu *menu = (wxMenu*)node->Data();
+        result = FindMenuItemByIdRecursive( menu, id );
+        node = node->Next();
+    }
+    
+    return result;
+}
+
+void wxMenuBar::Check( int id, bool check )
+{
+    wxMenuItem* item = FindMenuItemById( id );
+    if (item) item->Check(check);
+}
+
+bool wxMenuBar::Checked( int id ) const
+{
+    wxMenuItem* item = FindMenuItemById( id );
+    if (item) return item->IsChecked();
+    return FALSE;
+}
+
+void wxMenuBar::Enable( int id, bool enable )
+{
+    wxMenuItem* item = FindMenuItemById( id );
+    if (item) item->Enable(enable);
+}
+
+bool wxMenuBar::Enabled( int id ) const
+{
+    wxMenuItem* item = FindMenuItemById( id );
+    if (item) return item->IsEnabled();
+    
+    return FALSE;
+}

 
 

-  m_menus.DeleteContents( TRUE );
+wxString wxMenuBar::GetLabel( int id ) const
+{
+    wxMenuItem* item = FindMenuItemById( id );
+    
+    if (item) return item->GetText();
+    
+    return wxString("");
+}
+
+void wxMenuBar::SetLabel( int id, const wxString &label )
+{
+    wxMenuItem* item = FindMenuItemById( id );
+    
+    if (item) item->SetText( label );
+}
+
+void wxMenuBar::EnableTop( int pos, bool flag )
+{
+    wxNode *node = m_menus.Nth( pos );

   
   

-  m_widget = gtk_handle_box_new();
+    wxCHECK_RET( node, "menu not found" );

   
   

-  m_menubar = gtk_menu_bar_new();
+    wxMenu* menu = (wxMenu*)node->Data();

   
   

-  gtk_container_add( GTK_CONTAINER(m_widget), m_menubar );
+    if (menu->m_owner) gtk_widget_set_sensitive( menu->m_owner, flag );
+}
+
+wxString wxMenuBar::GetLabelTop( int pos ) const
+{
+    wxNode *node = m_menus.Nth( pos );

   
   

-  gtk_widget_show( m_menubar );
+    wxCHECK_MSG( node, "invalid", "menu not found" );

   
   

-  PostCreation();
-
-  Show( TRUE );
-};
+    wxMenu* menu = (wxMenu*)node->Data();
+  
+    return menu->GetTitle();
+}

 
 

-void wxMenuBar::Append( wxMenu *menu, const wxString &title )
+void wxMenuBar::SetLabelTop( int pos, const wxString& label )

 {
 {

-  m_menus.Append( menu );
-  menu->m_title = title;    // ??????
+    wxNode *node = m_menus.Nth( pos );

   
   

-  size_t pos;
-  do {
-    pos = menu->m_title.First( '&' );
-    if (pos != wxString::npos) menu->m_title.Remove( pos, 1 );
-  } while (pos != wxString::npos);
+    wxCHECK_RET( node, "menu not found" );

   
   

-  GtkWidget *root_menu;
-  root_menu = gtk_menu_item_new_with_label( WXSTRINGCAST(menu->m_title) );
-  gtk_widget_show( root_menu );
-  gtk_menu_item_set_submenu( GTK_MENU_ITEM(root_menu), menu->m_menu );
+    wxMenu* menu = (wxMenu*)node->Data();

   
   

-  gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), root_menu );
-};
+    menu->SetTitle( label );
+}
+
+void wxMenuBar::SetHelpString( int id, const wxString& helpString )
+{
+    wxMenuItem* item = FindMenuItemById( id );

     
     

-int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
+    if (item) item->SetHelp( helpString );
+}
+
+wxString wxMenuBar::GetHelpString( int id ) const

 {
 {

-  if (menu->m_title == menuString)
-  {
-    int res = menu->FindItem( itemString );
-    if (res != -1) return res;
-  };
-  wxNode *node = menu->m_items.First();
-  while (node)
-  {
-    wxMenuItem *item = (wxMenuItem*)node->Data();
-    if (item->m_subMenu) return FindMenuItemRecursive( item->m_subMenu, menuString, itemString );
-    node = node->Next();
-  };
-  return -1;
-};
+    wxMenuItem* item = FindMenuItemById( id );
+    
+    if (item) 
+        return item->GetHelp();
+    else
+        return wxString("");
+}

 
 

-int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
+//-----------------------------------------------------------------------------
+// "activate"
+//-----------------------------------------------------------------------------
+
+static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )

 {
 {

-  wxNode *node = m_menus.First();
-  while (node)
-  {
-    wxMenu *menu = (wxMenu*)node->Data();
-    int res = FindMenuItemRecursive( menu, menuString, itemString);
-    if (res != -1) return res;
-    node = node->Next();
-  };
-  return -1;
-};
+    int id = menu->FindMenuIdByMenuItem(widget);

 
 

+    /* should find it for normal (not popup) menu */
+    wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) ); 
+
+    if (!menu->IsEnabled(id)) return;
+
+    wxMenuItem* item = menu->FindItem( id );
+    wxCHECK_RET( item, "error in menu item callback" );

     
     

+    if (item->m_isCheckMenu)
+    {
+        if (item->m_isChecked == item->IsChecked())
+        {
+           /* the menu item has been checked by calling wxMenuItem->Check() */
+            return;
+       }
+       else
+       {
+           /* the user pressed on the menu item -> report */
+           item->m_isChecked = item->IsChecked();  /* make consistent again */
+       }
+    }
+
+    wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id );
+    event.SetEventObject( menu );
+    event.SetInt(id );
+
+    if (menu->m_callback)
+    {
+        (void) (*(menu->m_callback)) (*menu, event);
+        return;
+    }
+
+    if (menu->GetEventHandler()->ProcessEvent(event)) return;
+
+    wxWindow *win = menu->GetInvokingWindow();
+    if (win) win->GetEventHandler()->ProcessEvent( event );
+}
+

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// wxMenu
+// "select"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-void gtk_menu_clicked_callback( GtkWidget *widget, gpointer data )
+static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )

 {
 {

-  wxMenu *menu = (wxMenu*)data;
-  int id = menu->FindMenuIdByMenuItem(widget);
-  
-  if (!menu->Enabled(id)) return;
-  
-  wxCommandEvent event( wxEVENT_TYPE_MENU_COMMAND, id );
-  event.SetEventObject( menu );
-  event.SetInt(id );
-  wxWindow *win = menu->GetInvokingWindow();
-  if (win) win->ProcessEvent( event );
-};
+    int id = menu->FindMenuIdByMenuItem(widget);
+
+    wxASSERT( id != -1 ); // should find it!
+
+    if (!menu->IsEnabled(id)) return;
+
+    wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
+    event.SetEventObject( menu );
+
+/*   wxMSW doesn't call callback here either
+
+     if (menu->m_callback)
+     {
+        (void) (*(menu->m_callback)) (*menu, event);
+        return;
+     }
+*/
+
+    if (menu->GetEventHandler()->ProcessEvent(event)) return;
+
+    wxWindow *win = menu->GetInvokingWindow();
+    if (win) win->GetEventHandler()->ProcessEvent( event );
+}
+
+//-----------------------------------------------------------------------------
+// "deselect"
+//-----------------------------------------------------------------------------
+
+static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
+{
+    int id = menu->FindMenuIdByMenuItem(widget);
+
+    wxASSERT( id != -1 ); // should find it!
+
+    if (!menu->IsEnabled(id)) return;
+
+    wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
+    event.SetEventObject( menu );
+
+    if (menu->GetEventHandler()->ProcessEvent(event)) return;
+
+    wxWindow *win = menu->GetInvokingWindow();
+    if (win) win->GetEventHandler()->ProcessEvent( event );
+}
+
+//-----------------------------------------------------------------------------
+// wxMenuItem
+//-----------------------------------------------------------------------------

 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)

-  
-wxMenuItem::wxMenuItem(void)
-{
-  m_id = 0;
-  m_text = "";
-  m_isCheckMenu = FALSE;
-  m_checked = FALSE;
-  m_isSubMenu = FALSE; 
-  m_subMenu = NULL;
-  m_helpStr = "";
-  m_menuItem = NULL;
-};
+
+wxMenuItem::wxMenuItem()
+{
+    m_id = ID_SEPARATOR;
+    m_isCheckMenu = FALSE;
+    m_isChecked = FALSE;
+    m_isEnabled = TRUE;
+    m_subMenu = (wxMenu *) NULL;
+    m_menuItem = (GtkWidget *) NULL;
+}
+
+/* it's valid for this function to be called even if m_menuItem == NULL */
+void wxMenuItem::SetName( const wxString& str )
+{
+    m_text = "";
+    for ( const char *pc = str; *pc != '\0'; pc++ )
+    {
+        if (*pc == '&') pc++; /* skip it */
+        m_text << *pc;
+    }
+
+    if (m_menuItem)
+    {
+        GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
+        gtk_label_set( label, m_text.c_str());
+    }
+}
+
+void wxMenuItem::Check( bool check )
+{
+    wxCHECK_RET( m_menuItem, "invalid menu item" );
+
+    wxCHECK_RET( IsCheckable(), "Can't check uncheckable item!" )
+
+    if (check == m_isChecked) return;
+
+    m_isChecked = check;
+    gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
+}
+
+void wxMenuItem::Enable( bool enable )
+{
+    wxCHECK_RET( m_menuItem, "invalid menu item" );
+
+    gtk_widget_set_sensitive( m_menuItem, enable );
+    m_isEnabled = enable;
+}
+
+bool wxMenuItem::IsChecked() const
+{
+    wxCHECK_MSG( m_menuItem, FALSE, "invalid menu item" );
+
+    wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
+
+    bool bIsChecked = ((GtkCheckMenuItem*)m_menuItem)->active != 0;
+
+    return bIsChecked;
+}
+
+//-----------------------------------------------------------------------------
+// wxMenu
+//-----------------------------------------------------------------------------

 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 

-wxMenu::wxMenu( const wxString &title )
+wxMenu::wxMenu( const wxString& title, const wxFunction func )
+{
+    m_title = title;
+    m_items.DeleteContents( TRUE );
+    m_invokingWindow = (wxWindow *) NULL;
+    m_menu = gtk_menu_new();  // Do not show!
+
+    m_callback = func;
+    m_eventHandler = this;
+    m_clientData = (void*) NULL;
+
+    if (m_title.IsNull()) m_title = "";
+    if (m_title != "")
+    {
+        Append(-2, m_title);
+        AppendSeparator();
+    }
+    
+    m_owner = (GtkWidget*) NULL;
+}
+
+void wxMenu::SetTitle( const wxString& title )
+{
+    /* Waiting for something better. */
+    m_title = title;
+}
+
+const wxString wxMenu::GetTitle() const

 {
 {

-  m_title = title;
-  m_items.DeleteContents( TRUE );
-  m_invokingWindow = NULL;
-  m_menu = gtk_menu_new();  // Do not show!
-};
+    return m_title;
+}

 
 

-void wxMenu::AppendSeparator(void)
+void wxMenu::AppendSeparator()

 {
 {

-  wxMenuItem *mitem = new wxMenuItem();
-  mitem->m_id = -1;
-  mitem->m_text = "";
-  mitem->m_helpStr = "";
-  mitem->m_isCheckMenu = FALSE;
-  mitem->m_isEnabled = TRUE;
-  mitem->m_menuItem = gtk_menu_item_new();
-  gtk_menu_append( GTK_MENU(m_menu), mitem->m_menuItem );
-  gtk_widget_show( mitem->m_menuItem );
-  m_items.Append( mitem );
-};
+    wxMenuItem *mitem = new wxMenuItem();
+    mitem->SetId(ID_SEPARATOR);
+
+    GtkWidget *menuItem = gtk_menu_item_new();
+    gtk_menu_append( GTK_MENU(m_menu), menuItem );
+    gtk_widget_show( menuItem );
+    mitem->SetMenuItem(menuItem);
+    m_items.Append( mitem );
+}

 
 void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
 {
 
 void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
 {

-  wxMenuItem *mitem = new wxMenuItem();
-  mitem->m_id = id;
-  
-  mitem->m_text = item;
-  size_t pos;
-  do {
-    pos = mitem->m_text.First( '&' );
-    if (pos != wxString::npos) mitem->m_text.Remove( pos, 1 );
-  } while (pos != wxString::npos);
-  
-  mitem->m_helpStr = helpStr;
-  mitem->m_isCheckMenu = checkable;
-  mitem->m_isEnabled = TRUE;
-  if (checkable)
-    mitem->m_menuItem = gtk_check_menu_item_new_with_label( WXSTRINGCAST(mitem->m_text) );
-  else
-    mitem->m_menuItem = gtk_menu_item_new_with_label( WXSTRINGCAST(mitem->m_text) );
-    
-  gtk_signal_connect( GTK_OBJECT(mitem->m_menuItem), "activate", 
-    GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), (gpointer*)this );
-  
-  gtk_menu_append( GTK_MENU(m_menu), mitem->m_menuItem );
-  gtk_widget_show( mitem->m_menuItem );
-  m_items.Append( mitem );
-};
+    wxMenuItem *mitem = new wxMenuItem();
+    mitem->SetId(id);
+    mitem->SetText(item);
+    mitem->SetHelp(helpStr);
+    mitem->SetCheckable(checkable);
+    const char *text = mitem->GetText();
+    GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label(text)
+                                    : gtk_menu_item_new_with_label(text);
+
+    mitem->SetMenuItem(menuItem);
+
+    gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
+                        GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
+                        (gpointer*)this );
+
+    gtk_signal_connect( GTK_OBJECT(menuItem), "select",
+                        GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
+                        (gpointer*)this );

 
 

-void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr )
+    gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
+                        GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
+                        (gpointer*)this );
+
+    gtk_menu_append( GTK_MENU(m_menu), menuItem );
+    gtk_widget_show( menuItem );
+    m_items.Append( mitem );
+}
+
+void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxString &helpStr )

 {
 {

-  wxMenuItem *mitem = new wxMenuItem();
-  mitem->m_id = id;
-  mitem->m_text = item;
-  mitem->m_isEnabled = TRUE;
-  
-  size_t pos;
-  do {
-    pos = mitem->m_text.First( '&' );
-    if (pos != wxString::npos) mitem->m_text.Remove( pos, 1 );
-  } while (pos != wxString::npos);
-  
-  mitem->m_helpStr = helpStr;
-  mitem->m_menuItem = gtk_menu_item_new_with_label( WXSTRINGCAST(mitem->m_text) );
-  
-  mitem->m_subMenu = subMenu;
-  gtk_menu_item_set_submenu( GTK_MENU_ITEM(mitem->m_menuItem), subMenu->m_menu );
-  gtk_menu_append( GTK_MENU(m_menu), mitem->m_menuItem );
-  gtk_widget_show( mitem->m_menuItem );
-  m_items.Append( mitem );
-};
+    wxMenuItem *mitem = new wxMenuItem();
+    mitem->SetId(id);
+    mitem->SetText(text);
+
+    GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText());
+    mitem->SetHelp(helpStr);
+    mitem->SetMenuItem(menuItem);
+    mitem->SetSubMenu(subMenu);
+
+    gtk_signal_connect( GTK_OBJECT(menuItem), "select",
+                        GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
+                        (gpointer*)this );
+
+    gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
+                        GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
+                        (gpointer*)this );
+
+    gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
+    gtk_menu_append( GTK_MENU(m_menu), menuItem );
+    gtk_widget_show( menuItem );
+    m_items.Append( mitem );
+}

 
 int wxMenu::FindItem( const wxString itemString ) const
 {
 
 int wxMenu::FindItem( const wxString itemString ) const
 {

-  wxString s( itemString );
-  
-  size_t pos;
-  do {
-    pos = s.First( '&' );
-    if (pos != wxString::npos) s.Remove( pos, 1 );
-  } while (pos != wxString::npos);
-  
-  wxNode *node = m_items.First();
-  while (node)
-  {
-    wxMenuItem *item = (wxMenuItem*)node->Data();
-    if (item->m_text == s) return item->m_id;
-    node = node->Next();
-  };
-  return -1;
-};
+    wxString s( itemString );
+
+    int pos;
+    do 
+    {
+        pos = s.First( '&' );
+        if (pos != -1) s.Remove( pos, 1 );
+    } while (pos != -1);
+
+    wxNode *node = m_items.First();
+    while (node)
+    {
+        wxMenuItem *item = (wxMenuItem*)node->Data();
+        if (item->GetText() == s)
+       {
+            return item->GetId();
+       }
+        node = node->Next();
+    }
+
+    return -1;
+}

 
 void wxMenu::Enable( int id, bool enable )
 {
 
 void wxMenu::Enable( int id, bool enable )
 {

-  wxNode *node = m_items.First();
-  while (node)
-  {
-    wxMenuItem *item = (wxMenuItem*)node->Data();
-    if (item->m_id == id)
+    wxMenuItem *item = FindItem(id);
+    if (item)
+    { 
+        item->Enable(enable);
+    }
+}
+
+bool wxMenu::IsEnabled( int id ) const
+{
+    wxMenuItem *item = FindItem(id);
+    if (item)

     {
     {

-      item->m_isEnabled = enable;
-      return;
-    };
-    node = node->Next();
-  };
-};
+        return item->IsEnabled();
+    }
+    else
+    {
+        return FALSE;
+    }
+}

 
 

-bool wxMenu::Enabled( int id ) const
+void wxMenu::Check( int id, bool enable )

 {
 {

-  wxNode *node = m_items.First();
-  while (node)
-  {
-    wxMenuItem *item = (wxMenuItem*)node->Data();
-    if (item->m_id == id) return item->m_isEnabled;
-    node = node->Next();
-  };
-  return FALSE;
-};
+    wxMenuItem *item = FindItem(id);
+    if (item)
+    {
+        item->Check(enable);
+    }
+}
+
+bool wxMenu::IsChecked( int id ) const
+{
+    wxMenuItem *item = FindItem(id);
+    if (item)
+    {
+        return item->IsChecked();
+    }
+    else
+    {
+        return FALSE;
+    }
+}

 
 void wxMenu::SetLabel( int id, const wxString &label )
 {
 
 void wxMenu::SetLabel( int id, const wxString &label )
 {

-  wxString s( label );
-  size_t pos;
-  do {
-    pos = s.First( '&' );
-    if (pos != wxString::npos) s.Remove( pos, 1 );
-  } while (pos != wxString::npos);
-  
-  wxNode *node = m_items.First();
-  while (node)
-  {
-    wxMenuItem *item = (wxMenuItem*)node->Data();
-    item->m_text = s;
-    if (item->m_id == id)
+    wxMenuItem *item = FindItem(id);
+    if (item)

     {
     {

-      gtk_label_set( GTK_LABEL( GTK_BIN(item->m_menuItem)->child ), WXSTRINGCAST(s) );
-    };
-    node = node->Next();
-  };
-};
+        item->SetText(label);
+    }
+}
+
+wxString wxMenu::GetLabel( int id ) const
+{
+    wxMenuItem *item = FindItem(id);
+    if (item)
+    { 
+        return item->GetText();
+    }
+    else
+    {
+        return "";
+    }
+}
+
+void wxMenu::SetHelpString( int id, const wxString& helpString )
+{
+    wxMenuItem *item = FindItem(id);
+    if (item) item->SetHelp( helpString );
+}
+
+wxString wxMenu::GetHelpString( int id ) const
+{
+    wxMenuItem *item = FindItem(id);
+    if (item)
+    { 
+        return item->GetHelp();
+    }
+    else
+    {
+        return "";
+    }
+}

 
 int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
 {
 
 int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
 {

-  wxNode *node = m_items.First();
-  while (node)
-  {
-    wxMenuItem *item = (wxMenuItem*)node->Data();
-    if (item->m_menuItem == menuItem) return item->m_id;
-    node = node->Next();
-  };
-  return -1;
-};
+    wxNode *node = m_items.First();
+    while (node)
+    {
+        wxMenuItem *item = (wxMenuItem*)node->Data();
+        if (item->GetMenuItem() == menuItem)
+           return item->GetId();
+        node = node->Next();
+    }
+
+    return -1;
+}
+
+wxMenuItem *wxMenu::FindItem(int id) const
+{
+    wxNode *node = m_items.First();
+    while (node) 
+    {
+        wxMenuItem *item = (wxMenuItem*)node->Data();
+        if (item->GetId() == id)
+       {
+            return item;
+       }
+        node = node->Next();
+    }
+
+    /* Not finding anything here can be correct
+     * when search the entire menu system for
+     * an entry -> no error message. */
+
+    return (wxMenuItem *) NULL;
+}

 
 void wxMenu::SetInvokingWindow( wxWindow *win )
 {
 
 void wxMenu::SetInvokingWindow( wxWindow *win )
 {

-  m_invokingWindow = win;
-};
+    m_invokingWindow = win;
+}

 
 

-wxWindow *wxMenu::GetInvokingWindow(void)
+wxWindow *wxMenu::GetInvokingWindow()

 {
 {

-  return m_invokingWindow;
-};
+    return m_invokingWindow;
+}
+
+// Update a menu and all submenus recursively.
+// source is the object that has the update event handlers
+// defined for it. If NULL, the menu or associated window
+// will be used.
+void wxMenu::UpdateUI(wxEvtHandler* source)
+{
+  if (!source && GetInvokingWindow())
+    source = GetInvokingWindow()->GetEventHandler();
+  if (!source)
+    source = GetEventHandler();
+  if (!source)
+    source = this;
+
+  wxNode* node = GetItems().First();
+  while (node)
+  {
+    wxMenuItem* item = (wxMenuItem*) node->Data();
+    if ( !item->IsSeparator() )
+    {
+      wxWindowID id = item->GetId();
+      wxUpdateUIEvent event(id);
+      event.SetEventObject( source );
+
+      if (source->ProcessEvent(event))
+      {
+        if (event.GetSetText())
+          SetLabel(id, event.GetText());
+        if (event.GetSetChecked())
+          Check(id, event.GetChecked());
+        if (event.GetSetEnabled())
+          Enable(id, event.GetEnabled());
+      }
+
+      if (item->GetSubMenu())
+        item->GetSubMenu()->UpdateUI(source);
+    }
+    node = node->Next();
+  }
+}