wxTopLevelWindows is now a wxWindowList, better compatibility with the old

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 4696faeb11a73dd4df88c5214ecb175de663c88f..90abef63048be29680aaecdbdc4282a22b6ce3e3 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -26,6 +26,32 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 

+wxMenuBar::wxMenuBar( long style )
+{
+    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
 wxMenuBar::wxMenuBar()
 {
     m_needParent = FALSE; // hmmm


@@ -46,41 +72,57 @@ wxMenuBar::wxMenuBar()
 void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {
     m_menus.Append( menu );
 void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {
     m_menus.Append( menu );

-    menu->m_title = title; 
+    wxString title2 = title;

 
     int pos;
 
     int pos;

-    do 
+    do

     {
     {

-        pos = menu->m_title.First( '&' );
-        if (pos != -1) menu->m_title.Remove( pos, 1 );
-    } while (pos != -1);
+        pos = title2.First( '&' );
+        if (pos != wxNOT_FOUND)
+            title2.Remove( pos, 1 );
+    } while (pos != wxNOT_FOUND);
+
+    menu->SetTitle(title2);

 
 

-    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 );
+    menu->m_owner = gtk_menu_item_new_with_label( WXSTRINGCAST(title2) );
+    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), root_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 )
 {
 }
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
 {

-    if (menu->m_title == menuString)
+    if (menu->GetTitle() == menuString)

     {
         int res = menu->FindItem( itemString );
     {
         int res = menu->FindItem( itemString );

-        if (res != -1) return res;
+        if (res != wxNOT_FOUND)
+            return res;

     }
     }

-    
-    wxNode *node = menu->m_items.First();
+
+    wxNode *node = ((wxMenu *)menu)->GetItems().First();    // const_cast

     while (node)
     {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->IsSubMenu())
             return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
     while (node)
     {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->IsSubMenu())
             return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);

+

         node = node->Next();
     }
 
         node = node->Next();
     }
 

-    return -1;
+    return wxNOT_FOUND;
+}
+
+wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem = NULL) const
+{
+    if ( menuForItem )
+    {
+        // TODO return the pointer to the menu
+
+        *menuForItem = NULL;
+    }
+
+    return FindItem(itemId);

 }
 
 int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
 }
 
 int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const


@@ -96,26 +138,26 @@ int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemStr
     return -1;
 }
 
     return -1;
 }
 

-/* Find a wxMenuItem using its id. Recurses down into sub-menus */
+// Find a wxMenuItem using its id. Recurses down into sub-menus

 static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
 {
     wxMenuItem* result = menu->FindItem(id);
 
 static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
 {
     wxMenuItem* result = menu->FindItem(id);
 

-    wxNode *node = menu->m_items.First();
-    while ( node && result == NULL ) 
+    wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast
+    while ( node && result == NULL )

     {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->IsSubMenu())
     {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->IsSubMenu())

-       {
+        {

             result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
             result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );

-       }
+        }

         node = node->Next();
     }
 
     return result;
 }
 
         node = node->Next();
     }
 
     return result;
 }
 

-wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const
+wxMenuItem* wxMenuBar::FindItem( int id ) const

 {
     wxMenuItem* result = 0;
     wxNode *node = m_menus.First();
 {
     wxMenuItem* result = 0;
     wxNode *node = m_menus.First();


@@ -125,60 +167,114 @@ wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const
         result = FindMenuItemByIdRecursive( menu, id );
         node = node->Next();
     }
         result = FindMenuItemByIdRecursive( menu, id );
         node = node->Next();
     }

-    
+

     return result;
 }
 
 void wxMenuBar::Check( int id, bool check )
 {
     wxMenuItem* item = FindMenuItemById( id );
     return result;
 }
 
 void wxMenuBar::Check( int id, bool check )
 {
     wxMenuItem* item = FindMenuItemById( id );

-    if (item) item->Check(check);
+
+    wxCHECK_RET( item, "wxMenuBar::Check: no such item" );
+
+    item->Check(check);

 }
 
 }
 

-bool wxMenuBar::Checked( int id ) const
+bool wxMenuBar::IsChecked( int id ) const

 {
     wxMenuItem* item = FindMenuItemById( id );
 {
     wxMenuItem* item = FindMenuItemById( id );

-    if (item) return item->IsChecked();
-    return FALSE;
+
+    wxCHECK_MSG( item, FALSE, "wxMenuBar::IsChecked: no such item" );
+
+    return item->IsChecked();

 }
 
 void wxMenuBar::Enable( int id, bool enable )
 {
     wxMenuItem* item = FindMenuItemById( id );
 }
 
 void wxMenuBar::Enable( int id, bool enable )
 {
     wxMenuItem* item = FindMenuItemById( id );

-    if (item) item->Enable(enable);
+
+    wxCHECK_RET( item, "wxMenuBar::Enable: no such item" );
+
+    item->Enable(enable);

 }
 
 }
 

-bool wxMenuBar::Enabled( int id ) const
+bool wxMenuBar::IsEnabled( int id ) const

 {
     wxMenuItem* item = FindMenuItemById( id );
 {
     wxMenuItem* item = FindMenuItemById( id );

-    if (item) return item->IsEnabled();
-    return FALSE;
+
+    wxCHECK_MSG( item, FALSE, "wxMenuBar::IsEnabled: no such item" );
+
+    return item->IsEnabled();

 }
 
 wxString wxMenuBar::GetLabel( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 }
 
 wxString wxMenuBar::GetLabel( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );

-    if (item) return item->GetText();
-    return "";
+
+    wxCHECK_MSG( item, "", "wxMenuBar::GetLabel: no such item" );
+
+    return item->GetText();

 }
 
 void wxMenuBar::SetLabel( int id, const wxString &label )
 {
     wxMenuItem* item = FindMenuItemById( id );
 }
 
 void wxMenuBar::SetLabel( int id, const wxString &label )
 {
     wxMenuItem* item = FindMenuItemById( id );

-    if (item) return item->SetText( label );
+
+    wxCHECK_RET( item, "wxMenuBar::SetLabel: no such item" );
+
+    item->SetText( label );

 }
 
 }
 

-void wxMenuBar::EnableTop( int WXUNUSED(pos), bool WXUNUSED(flag) )
+void wxMenuBar::EnableTop( int pos, bool flag )

 {
 {

+    wxNode *node = m_menus.Nth( pos );
+
+    wxCHECK_RET( node, "menu not found" );
+
+    wxMenu* menu = (wxMenu*)node->Data();
+
+    if (menu->m_owner)
+        gtk_widget_set_sensitive( menu->m_owner, flag );

 }
 
 }
 

-wxString wxMenuBar::GetLabelTop( int WXUNUSED(pos) ) const
+wxString wxMenuBar::GetLabelTop( int pos ) const

 {
 {

-  return "menu";
+    wxNode *node = m_menus.Nth( pos );
+
+    wxCHECK_MSG( node, "invalid", "menu not found" );
+
+    wxMenu* menu = (wxMenu*)node->Data();
+
+    return menu->GetTitle();
+}
+
+void wxMenuBar::SetLabelTop( int pos, const wxString& label )
+{
+    wxNode *node = m_menus.Nth( pos );
+
+    wxCHECK_RET( node, "menu not found" );
+
+    wxMenu* menu = (wxMenu*)node->Data();
+
+    menu->SetTitle( label );
+}
+
+void wxMenuBar::SetHelpString( int id, const wxString& helpString )
+{
+    wxMenuItem* item = FindMenuItemById( id );
+
+    wxCHECK_RET( item, "wxMenuBar::SetHelpString: no such item" );
+
+    item->SetHelp( helpString );

 }
 
 }
 

-void wxMenuBar::SetLabelTop( int WXUNUSED(pos), const wxString& WXUNUSED(label) )
+wxString wxMenuBar::GetHelpString( int id ) const

 {
 {

+    wxMenuItem* item = FindMenuItemById( id );
+
+    wxCHECK_MSG( item, "", "wxMenuBar::GetHelpString: no such item" );
+
+    return item->GetHelp();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -190,41 +286,44 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
     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 */

-    wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) ); 
+    wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) );

 
 

-    if (!menu->IsEnabled(id)) return;
+    if (!menu->IsEnabled(id))
+        return;

 
     wxMenuItem* item = menu->FindItem( id );
     wxCHECK_RET( item, "error in menu item callback" );
 
     wxMenuItem* item = menu->FindItem( id );
     wxCHECK_RET( item, "error in menu item callback" );

-    
-    if (item->m_isCheckMenu)
+
+    if (item->IsCheckable())

     {
     {

-        if (item->m_isChecked == item->IsChecked())
+        if (item->GetCheckedFlag() == item->IsChecked())

         {
         {

-           /* the menu item has been checked by calling wxMenuItem->Check() */
+            /* the menu item has been checked by calling wxMenuItem->Check() */

             return;
             return;

-       }
-       else
-       {
-           /* the user pressed on the menu item -> report */
-           item->m_isChecked = item->IsChecked();  /* make consistent again */
-       }
+        }
+        else
+        {
+            /* the user pressed on the menu item -> report */
+            item->SetCheckedFlag(item->IsChecked());  /* make consistent again */
+        }

     }
 
     wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id );
     event.SetEventObject( menu );
     event.SetInt(id );
 
     }
 
     wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id );
     event.SetEventObject( menu );
     event.SetInt(id );
 

-    if (menu->m_callback)
+    if (menu->GetCallback())

     {
     {

-        (void) (*(menu->m_callback)) (*menu, event);
+        (void) (*(menu->GetCallback())) (*menu, event);

         return;
     }
 
         return;
     }
 

-    if (menu->GetEventHandler()->ProcessEvent(event)) return;
+    if (menu->GetEventHandler()->ProcessEvent(event))
+        return;

 
     wxWindow *win = menu->GetInvokingWindow();
 
     wxWindow *win = menu->GetInvokingWindow();

-    if (win) win->GetEventHandler()->ProcessEvent( event );
+    if (win)
+        win->GetEventHandler()->ProcessEvent( event );

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -237,11 +336,11 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
 
     wxASSERT( id != -1 ); // should find it!
 
 
     wxASSERT( id != -1 ); // should find it!
 

-    if (!menu->IsEnabled(id)) return;
+    if (!menu->IsEnabled(id))
+        return;

 
 

-    wxCommandEvent event( wxEVT_MENU_HIGHLIGHT, id );
+    wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );

     event.SetEventObject( menu );
     event.SetEventObject( menu );

-    event.SetInt(id );

 
 /*   wxMSW doesn't call callback here either
 
 
 /*   wxMSW doesn't call callback here either
 


@@ -252,12 +351,37 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
      }
 */
 
      }
 */
 

-    if (menu->GetEventHandler()->ProcessEvent(event)) return;
+    if (menu->GetEventHandler()->ProcessEvent(event))
+        return;

 
     wxWindow *win = menu->GetInvokingWindow();
     if (win) win->GetEventHandler()->ProcessEvent( event );
 }
 
 
     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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxMenuItem
 //-----------------------------------------------------------------------------


@@ -274,7 +398,7 @@ wxMenuItem::wxMenuItem()
     m_menuItem = (GtkWidget *) NULL;
 }
 
     m_menuItem = (GtkWidget *) NULL;
 }
 

-/* it's valid for this function to be called even if m_menuItem == NULL */
+// it's valid for this function to be called even if m_menuItem == NULL

 void wxMenuItem::SetName( const wxString& str )
 {
     m_text = "";
 void wxMenuItem::SetName( const wxString& str )
 {
     m_text = "";


@@ -345,11 +469,13 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func )
         Append(-2, m_title);
         AppendSeparator();
     }
         Append(-2, m_title);
         AppendSeparator();
     }

+
+    m_owner = (GtkWidget*) NULL;

 }
 
 void wxMenu::SetTitle( const wxString& title )
 {
 }
 
 void wxMenu::SetTitle( const wxString& title )
 {

-    /* Waiting for something better. */
+    // TODO Waiting for something better

     m_title = title;
 }
 
     m_title = title;
 }
 


@@ -391,6 +517,10 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
                         GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
                         (gpointer*)this );
 
                         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_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
     m_items.Append( mitem );
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
     m_items.Append( mitem );


@@ -401,24 +531,69 @@ void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxStri
     wxMenuItem *mitem = new wxMenuItem();
     mitem->SetId(id);
     mitem->SetText(text);
     wxMenuItem *mitem = new wxMenuItem();
     mitem->SetId(id);
     mitem->SetText(text);

+    mitem->SetHelp(helpStr);

 
     GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText());
 
     GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText());

-    mitem->SetHelp(helpStr);

     mitem->SetMenuItem(menuItem);
     mitem->SetSubMenu(subMenu);
 
     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 );
 }
 
     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 );
 }
 

+void wxMenu::Append( wxMenuItem *item )
+{
+    m_items.Append( item );
+
+    GtkWidget *menuItem = (GtkWidget*) NULL;
+
+    if (item->IsSeparator())
+        menuItem = gtk_menu_item_new();
+    else if (item->IsSubMenu())
+        menuItem = gtk_menu_item_new_with_label(item->GetText());
+    else
+        menuItem = item->IsCheckable() ? gtk_check_menu_item_new_with_label(item->GetText())
+                                       : gtk_menu_item_new_with_label(item->GetText());
+
+    if (!item->IsSeparator())
+    {
+        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 );
+
+        if (!item->IsSubMenu())
+        {
+            gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
+                                GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
+                                (gpointer*)this );
+        }
+    }
+
+    gtk_menu_append( GTK_MENU(m_menu), menuItem );
+    gtk_widget_show( menuItem );
+    item->SetMenuItem(menuItem);
+}
+

 int wxMenu::FindItem( const wxString itemString ) const
 {
     wxString s( itemString );
 
     int pos;
 int wxMenu::FindItem( const wxString itemString ) const
 {
     wxString s( itemString );
 
     int pos;

-    do 
+    do

     {
         pos = s.First( '&' );
         if (pos != -1) s.Remove( pos, 1 );
     {
         pos = s.First( '&' );
         if (pos != -1) s.Remove( pos, 1 );


@@ -429,98 +604,85 @@ int wxMenu::FindItem( const wxString itemString ) const
     {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->GetText() == s)
     {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->GetText() == s)

-       {
+        {

             return item->GetId();
             return item->GetId();

-       }
+        }

         node = node->Next();
     }
 
         node = node->Next();
     }
 

-    return -1;
+    return wxNOT_FOUND;

 }
 
 void wxMenu::Enable( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
 }
 
 void wxMenu::Enable( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);

-    if (item)
-    { 
-        item->Enable(enable);
-    }
+
+    wxCHECK_RET( item, "wxMenu::Enable: no such item" );
+
+    item->Enable(enable);

 }
 
 bool wxMenu::IsEnabled( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 }
 
 bool wxMenu::IsEnabled( int id ) const
 {
     wxMenuItem *item = FindItem(id);

-    if (item)
-    {
-        return item->IsEnabled();
-    }
-    else
-    {
-        return FALSE;
-    }
+
+    wxCHECK_MSG( item, FALSE, "wxMenu::IsEnabled: no such item" );
+
+    return item->IsEnabled();

 }
 
 void wxMenu::Check( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
 }
 
 void wxMenu::Check( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);

-    if (item)
-    {
-        item->Check(enable);
-    }
+
+    wxCHECK_RET( item, "wxMenu::Check: no such item" );
+
+    item->Check(enable);

 }
 
 bool wxMenu::IsChecked( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 }
 
 bool wxMenu::IsChecked( int id ) const
 {
     wxMenuItem *item = FindItem(id);

-    if (item)
-    {
-        return item->IsChecked();
-    }
-    else
-    {
-        return FALSE;
-    }
+
+    wxCHECK_MSG( item, FALSE, "wxMenu::IsChecked: no such item" );
+
+    return item->IsChecked();

 }
 
 void wxMenu::SetLabel( int id, const wxString &label )
 {
     wxMenuItem *item = FindItem(id);
 }
 
 void wxMenu::SetLabel( int id, const wxString &label )
 {
     wxMenuItem *item = FindItem(id);

-    if (item)
-    {
-        item->SetText(label);
-    }
+
+    wxCHECK_RET( item, "wxMenu::SetLabel: no such item" );
+
+    item->SetText(label);

 }
 
 wxString wxMenu::GetLabel( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 }
 
 wxString wxMenu::GetLabel( int id ) const
 {
     wxMenuItem *item = FindItem(id);

-    if (item)
-    { 
-        return item->GetText();
-    }
-    else
-    {
-        return "";
-    }
+
+    wxCHECK_MSG( item, "", "wxMenu::GetLabel: no such item" );
+
+    return item->GetText();

 }
 
 void wxMenu::SetHelpString( int id, const wxString& helpString )
 {
     wxMenuItem *item = FindItem(id);
 }
 
 void wxMenu::SetHelpString( int id, const wxString& helpString )
 {
     wxMenuItem *item = FindItem(id);

-    if (item) item->SetHelp( helpString );
+
+    wxCHECK_RET( item, "wxMenu::SetHelpString: no such item" );
+
+    item->SetHelp( helpString );

 }
 
 wxString wxMenu::GetHelpString( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 }
 
 wxString wxMenu::GetHelpString( int id ) const
 {
     wxMenuItem *item = FindItem(id);

-    if (item)
-    { 
-        return item->GetHelp();
-    }
-    else
-    {
-        return "";
-    }
+
+    wxCHECK_MSG( item, "", "wxMenu::GetHelpString: no such item" );
+
+    return item->GetHelp();

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


@@ -534,19 +696,19 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
         node = node->Next();
     }
 
         node = node->Next();
     }
 

-    return -1;
+    return wxNOT_FOUND;

 }
 
 wxMenuItem *wxMenu::FindItem(int id) const
 {
     wxNode *node = m_items.First();
 }
 
 wxMenuItem *wxMenu::FindItem(int id) const
 {
     wxNode *node = m_items.First();

-    while (node) 
+    while (node)

     {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->GetId() == id)
     {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->GetId() == id)

-       {
+        {

             return item;
             return item;

-       }
+        }

         node = node->Next();
     }
 
         node = node->Next();
     }
 


@@ -567,4 +729,42 @@ 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();
+  }
+}