call OnExec() taking wxString argument from OnExecute() by default

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 51fa71566cbdfef088f762cfe4b8035b8126d833..c89d45db0f73a02583d8f4f27636b7280afd19ee 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -25,15 +25,12 @@
 #include "wx/accel.h"
 #include "wx/stockitem.h"
 #include "wx/gtk/private.h"
 #include "wx/accel.h"
 #include "wx/stockitem.h"
 #include "wx/gtk/private.h"

-
-#ifdef __WXGTK20__
-#include <gdk/gdktypes.h>
-#endif
+#include "wx/gtk/private/mnemonics.h"

 
 // FIXME: is this right? somehow I don't think so (VZ)
 
 #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
 
 // FIXME: is this right? somehow I don't think so (VZ)
 
 #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))

-//#define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
+#define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))

 //#define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
 
 #define ACCEL_OBJECT        GtkWindow
 //#define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
 
 #define ACCEL_OBJECT        GtkWindow


@@ -43,87 +40,17 @@
 // we use normal item but with a special id for the menu title
 static const int wxGTK_TITLE_ID = -3;
 
 // we use normal item but with a special id for the menu title
 static const int wxGTK_TITLE_ID = -3;
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+// forward declare it as it's used by wxMenuBar too when using Hildon
+extern "C"
+{
+    static void gtk_menu_clicked_callback(GtkWidget *widget, wxMenu *menu);
+}

 
 #if wxUSE_ACCEL
 
 #if wxUSE_ACCEL

+static bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key);

 static wxString GetGtkHotKey( const wxMenuItem& item );
 #endif
 
 static wxString GetGtkHotKey( const wxMenuItem& item );
 #endif
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-static wxString wxReplaceUnderscore( const wxString& title )
-{
-    // GTK 1.2 wants to have "_" instead of "&" for accelerators
-    wxString str;
-
-    for ( wxString::const_iterator pc = title.begin(); pc != title.end(); ++pc )
-    {
-        if ((*pc == wxT('&')) && (pc+1 != title.end()) && (*(pc+1) == wxT('&')))
-        {
-            // "&" is doubled to indicate "&" instead of accelerator
-            ++pc;
-            str << wxT('&');
-        }
-        else if (*pc == wxT('&'))
-        {
-            str << wxT('_');
-        }
-        else
-        {
-            if ( *pc == wxT('_') )
-            {
-                // underscores must be doubled to prevent them from being
-                // interpreted as accelerator character prefix by GTK
-                str << *pc;
-            }
-
-            str << *pc;
-        }
-    }
-
-    // wxPrintf( wxT("before %s after %s\n"), title.c_str(), str.c_str() );
-
-    return str;
-}
-
-static wxString wxConvertFromGTKToWXLabel(const wxString& gtkLabel)
-{
-    wxString label;
-    for ( const wxChar *pc = gtkLabel.c_str(); *pc; pc++ )
-    {
-        // '_' is the escape character for GTK+.
-
-        if ( *pc == wxT('_') && *(pc+1) == wxT('_'))
-        {
-            // An underscore was escaped.
-            label += wxT('_');
-            pc++;
-        }
-        else if ( *pc == wxT('_') )
-        {
-            // Convert GTK+ hotkey symbol to wxWidgets/Windows standard
-            label += wxT('&');
-        }
-        else if ( *pc == wxT('&') )
-        {
-            // Double the ampersand to escape it as far as wxWidgets is concerned
-            label += wxT("&&");
-        }
-        else
-        {
-            // don't remove ampersands '&' since if we have them in the menu title
-            // it means that they were doubled to indicate "&" instead of accelerator
-            label += *pc;
-        }
-    }
-
-    return label;
-}
-

 //-----------------------------------------------------------------------------
 // activate message from GTK
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // activate message from GTK
 //-----------------------------------------------------------------------------


@@ -133,24 +60,26 @@ static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();

-    if (handler && handler->ProcessEvent(event))
+    if (handler && handler->SafelyProcessEvent(event))

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

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

 }
 
 extern "C" {
 
 }
 
 extern "C" {
 

-static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu )
+static void
+gtk_menu_open_callback(GtkWidget * WXUNUSED(widget), wxMenu *menu)

 {
     wxMenuEvent event(wxEVT_MENU_OPEN, -1, menu);
 
     DoCommonMenuCallbackCode(menu, event);
 }
 
 {
     wxMenuEvent event(wxEVT_MENU_OPEN, -1, menu);
 
     DoCommonMenuCallbackCode(menu, event);
 }
 

-static void gtk_menu_close_callback( GtkWidget *widget, wxMenuBar *menubar )
+static void
+gtk_menu_close_callback(GtkWidget * WXUNUSED(widget), wxMenuBar *menubar)

 {
     if ( !menubar->GetMenuCount() )
     {
 {
     if ( !menubar->GetMenuCount() )
     {


@@ -176,6 +105,12 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
     m_style = style;
     m_invokingWindow = NULL;
 
     m_style = style;
     m_invokingWindow = NULL;
 

+#if wxUSE_LIBHILDON
+    // Hildon window uses a single menu instead of a menu bar, so wxMenuBar is
+    // the same as menu in this case
+    m_widget =
+    m_menubar = gtk_menu_new();
+#else // !wxUSE_LIBHILDON

     if (!PreCreation( NULL, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") ))
     {
     if (!PreCreation( NULL, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") ))
     {


@@ -199,6 +134,7 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
     PostCreation();
 
     ApplyWidgetStyle();
     PostCreation();
 
     ApplyWidgetStyle();

+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON

 
     for (size_t i = 0; i < n; ++i )
         Append(menus[i], titles[i]);
 
     for (size_t i = 0; i < n; ++i )
         Append(menus[i], titles[i]);


@@ -209,7 +145,6 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
     //     can't pass the menu which was closed in wxMenuEvent object
     g_signal_connect (m_menubar, "deactivate",
                       G_CALLBACK (gtk_menu_close_callback), this);
     //     can't pass the menu which was closed in wxMenuEvent object
     g_signal_connect (m_menubar, "deactivate",
                       G_CALLBACK (gtk_menu_close_callback), this);

-

 }
 
 wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style)
 }
 
 wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style)


@@ -239,6 +174,11 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();
 
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();
 

+    // support for native hot keys
+    ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget);
+    if ( menu->m_accel && g_slist_find( ACCEL_OBJECTS(menu->m_accel), obj ) )
+        gtk_accel_group_detach( menu->m_accel, obj );
+

     wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
     while (node)
     {
     wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
     while (node)
     {


@@ -358,18 +298,42 @@ bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
 
 bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
 {
 
 bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
 {

-    wxString str( wxReplaceUnderscore( title ) );
+    menu->SetLayoutDirection(GetLayoutDirection());

 
 

-    // This doesn't have much effect right now.
-    menu->SetTitle( str );
+#if wxUSE_LIBHILDON
+    // if the menu has only one item, append it directly to the top level menu
+    // instead of inserting a useless submenu
+    if ( menu->GetMenuItemCount() == 1 )
+    {
+        wxMenuItem * const item = menu->FindItemByPosition(0);

 
 

-    // The "m_owner" is the "menu item"
-    menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
-    menu->SetLayoutDirection(GetLayoutDirection());
+        // remove both mnemonics and accelerator: neither is useful under Maemo
+        const wxString str(wxStripMenuCodes(item->GetItemLabel()));

 
 

-    gtk_widget_show( menu->m_owner );
+        if ( item->IsSubMenu() )
+            return GtkAppend(item->GetSubMenu(), str, pos);
+
+        menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
+
+        g_signal_connect(menu->m_owner, "activate",
+                          G_CALLBACK(gtk_menu_clicked_callback), menu);
+        item->SetMenuItem(menu->m_owner);
+    }
+    else
+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+    {
+        const wxString str(wxConvertMnemonicsToGTK(title));
+
+        // This doesn't have much effect right now.
+        menu->SetTitle( str );
+
+        // The "m_owner" is the "menu item"
+        menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );

 
 

-    gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
+        gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
+    }
+
+    gtk_widget_show( menu->m_owner );

 
     if (pos == -1)
         gtk_menu_shell_append( GTK_MENU_SHELL(m_menubar), menu->m_owner );
 
     if (pos == -1)
         gtk_menu_shell_append( GTK_MENU_SHELL(m_menubar), menu->m_owner );


@@ -383,21 +347,8 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
     // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
     // addings menu later on.
     if (m_invokingWindow)
     // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
     // addings menu later on.
     if (m_invokingWindow)

-    {

         wxMenubarSetInvokingWindow( menu, m_invokingWindow );
 
         wxMenubarSetInvokingWindow( menu, m_invokingWindow );
 

-            // OPTIMISE ME:  we should probably cache this, or pass it
-            //               directly, but for now this is a minimal
-            //               change to validate the new dynamic sizing.
-            //               see (and refactor :) similar code in Remove
-            //               below.
-
-        wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
-
-        if( frame )
-            frame->UpdateMenuBarSize();
-    }
-

     return true;
 }
 
     return true;
 }
 


@@ -440,20 +391,14 @@ wxMenu *wxMenuBar::Remove(size_t pos)
     menu->m_owner = NULL;
 
     if (m_invokingWindow)
     menu->m_owner = NULL;
 
     if (m_invokingWindow)

-    {
-        // OPTIMISE ME:  see comment in GtkAppend
-        wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
-
-        if( frame )
-            frame->UpdateMenuBarSize();
-    }
+        wxMenubarUnsetInvokingWindow( menu, m_invokingWindow );

 
     return menu;
 }
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
 {
 
     return menu;
 }
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
 {

-    if (wxMenuItem::GetLabelText(wxConvertFromGTKToWXLabel(menu->GetTitle())) == wxMenuItem::GetLabelText(menuString))
+    if (wxMenuItem::GetLabelText(wxConvertMnemonicsFromGTK(menu->GetTitle())) == wxMenuItem::GetLabelText(menuString))

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


@@ -546,7 +491,7 @@ wxString wxMenuBar::GetMenuLabel( size_t pos ) const
 
     wxMenu* menu = node->GetData();
 
 
     wxMenu* menu = node->GetData();
 

-    return wxConvertFromGTKToWXLabel(menu->GetTitle());
+    return wxConvertMnemonicsFromGTK(menu->GetTitle());

 }
 
 void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label )
 }
 
 void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label )


@@ -557,7 +502,7 @@ void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label )
 
     wxMenu* menu = node->GetData();
 
 
     wxMenu* menu = node->GetData();
 

-    const wxString str( wxReplaceUnderscore( label ) );
+    const wxString str(wxConvertMnemonicsToGTK(label));

 
     menu->SetTitle( str );
 
 
     menu->SetTitle( str );
 


@@ -627,9 +572,8 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
         commandEvent.SetEventObject(frame);
         if (item->IsCheckable())
             commandEvent.SetInt(item->IsChecked());
         commandEvent.SetEventObject(frame);
         if (item->IsCheckable())
             commandEvent.SetInt(item->IsChecked());

-        commandEvent.SetEventObject(menu);

 
 

-        frame->GetEventHandler()->ProcessEvent(commandEvent);
+        frame->HandleWindowEvent(commandEvent);

     }
     else
     {
     }
     else
     {


@@ -657,11 +601,11 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();

-    if (handler && handler->ProcessEvent(event))
+    if (handler && handler->SafelyProcessEvent(event))

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

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

 }
 }
 
 }
 }
 


@@ -683,12 +627,12 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();

-    if (handler && handler->ProcessEvent(event))
+    if (handler && handler->SafelyProcessEvent(event))

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

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

 }
 }
 
 }
 }
 


@@ -747,10 +691,6 @@ wxMenuItem::~wxMenuItem()
 // return the menu item text without any menu accels
 /* static */
 
 // return the menu item text without any menu accels
 /* static */
 

-// TODO: this is now wrong, because it will be used by public APIs
-// to convert from label-with-wxWidgets-hotkeys to plain text,
-// and this function converts from GTK+ hotkeys to plain text.
-

 wxString wxMenuItemBase::GetLabelText(const wxString& text)
 {
     // The argument to this function will now always be in wxWidgets standard label
 wxString wxMenuItemBase::GetLabelText(const wxString& text)
 {
     // The argument to this function will now always be in wxWidgets standard label


@@ -800,7 +740,10 @@ wxString wxMenuItemBase::GetLabelText(const wxString& text)
 
 wxString wxMenuItem::GetItemLabel() const
 {
 
 wxString wxMenuItem::GetItemLabel() const
 {

-    return wxConvertFromGTKToWXLabel(m_text);
+    wxString label = wxConvertMnemonicsFromGTK(m_text);
+    if (!m_hotKey.IsEmpty())
+        label << "\t" << m_hotKey;
+    return label;

 }
 
 void wxMenuItem::SetItemLabel( const wxString& str )
 }
 
 void wxMenuItem::SetItemLabel( const wxString& str )


@@ -816,11 +759,14 @@ void wxMenuItem::SetItemLabel( const wxString& str )
     oldLabel = wxStripMenuCodes(oldLabel);
     oldLabel.Replace(wxT("_"), wxT(""));
     wxString label1 = wxStripMenuCodes(str);
     oldLabel = wxStripMenuCodes(oldLabel);
     oldLabel.Replace(wxT("_"), wxT(""));
     wxString label1 = wxStripMenuCodes(str);

+#if wxUSE_ACCEL

     wxString oldhotkey = GetHotKey();    // Store the old hotkey in Ctrl-foo format
     wxCharBuffer oldbuf = wxGTK_CONV_SYS( GetGtkHotKey(*this) );  // and as <control>foo
     wxString oldhotkey = GetHotKey();    // Store the old hotkey in Ctrl-foo format
     wxCharBuffer oldbuf = wxGTK_CONV_SYS( GetGtkHotKey(*this) );  // and as <control>foo

+#endif // wxUSE_ACCEL

 
     DoSetText(str);
 
 
     DoSetText(str);
 

+#if wxUSE_ACCEL

     if (oldLabel == label1 &&
         oldhotkey == GetHotKey())    // Make sure we can change a hotkey even if the label is unaltered
         return;
     if (oldLabel == label1 &&
         oldhotkey == GetHotKey())    // Make sure we can change a hotkey even if the label is unaltered
         return;


@@ -895,6 +841,7 @@ void wxMenuItem::SetItemLabel( const wxString& str )
                                            accel_key,
                                            accel_mods );
     }
                                            accel_key,
                                            accel_mods );
     }

+#endif // wxUSE_ACCEL

 }
 
 // NOTE: this function is different from the similar functions GTKProcessMnemonics()
 }
 
 // NOTE: this function is different from the similar functions GTKProcessMnemonics()


@@ -1050,8 +997,6 @@ void wxMenu::Init()
 
 wxMenu::~wxMenu()
 {
 
 wxMenu::~wxMenu()
 {

-   WX_CLEAR_LIST(wxMenuItemList, m_items);
-

    if ( GTK_IS_WIDGET( m_menu ))
    {
        // see wxMenu::Init
    if ( GTK_IS_WIDGET( m_menu ))
    {
        // see wxMenu::Init


@@ -1063,6 +1008,13 @@ wxMenu::~wxMenu()
        if ( m_owner )
            gtk_widget_destroy( m_menu );
    }
        if ( m_owner )
            gtk_widget_destroy( m_menu );
    }

+
+   // This must come after we release GTK resources above. Otherwise, GTK will
+   // give warnings/errors when attempting to free accelerator resources from
+   // child items that just were destroyed (the m_menu widget can contain
+   // references to accelerators in child items. Problem detected when removing
+   // a menu from a wxMenuBar, and the removed menu had submenus with accelerators.)
+   WX_CLEAR_LIST(wxMenuItemList, m_items);

 }
 
 void wxMenu::SetLayoutDirection(const wxLayoutDirection dir)
 }
 
 void wxMenu::SetLayoutDirection(const wxLayoutDirection dir)


@@ -1082,7 +1034,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
     GtkWidget *menuItem;
 
     // cache some data used later
     GtkWidget *menuItem;
 
     // cache some data used later

-    wxString text = mitem->GetItemLabel();
+    wxString text = mitem->wxMenuItemBase::GetItemLabel();

     int id = mitem->GetId();
     bool isstock = wxIsStockID(id);
     const char *stockid = NULL;
     int id = mitem->GetId();
     bool isstock = wxIsStockID(id);
     const char *stockid = NULL;


@@ -1102,6 +1054,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
     if ( mitem->IsSeparator() )
     {
         menuItem = gtk_separator_menu_item_new();
     if ( mitem->IsSeparator() )
     {
         menuItem = gtk_separator_menu_item_new();

+        m_prevRadio = NULL;

     }
     else if ( mitem->GetBitmap().Ok() ||
                 (mitem->GetKind() == wxITEM_NORMAL && isstock) )
     }
     else if ( mitem->GetBitmap().Ok() ||
                 (mitem->GetKind() == wxITEM_NORMAL && isstock) )


@@ -1192,11 +1145,11 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
 
     }
 
 
     }
 

+#if wxUSE_ACCEL

     guint accel_key;
     GdkModifierType accel_mods;
     wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*mitem) );
 
     guint accel_key;
     GdkModifierType accel_mods;
     wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*mitem) );
 

-    // wxPrintf( wxT("item: %s hotkey %s\n"), mitem->GetItemLabel().c_str(), GetGtkHotKey(*mitem).c_str() );

     if (buf[(size_t)0] != '\0')
     {
         gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
     if (buf[(size_t)0] != '\0')
     {
         gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);


@@ -1221,6 +1174,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
                                         accel_mods,
                                         GTK_ACCEL_VISIBLE);
     }
                                         accel_mods,
                                         GTK_ACCEL_VISIBLE);
     }

+#endif // wxUSE_ACCEL

 
     if (pos == -1)
         gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem);
 
     if (pos == -1)
         gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem);


@@ -1292,11 +1246,19 @@ wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 {
     if ( !wxMenuBase::DoRemove(item) )
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 {
     if ( !wxMenuBase::DoRemove(item) )

-        return (wxMenuItem *)NULL;
+        return NULL;
+
+    GtkWidget * const mitem = item->GetMenuItem();
+    if ( m_prevRadio == mitem )
+    {
+        // deleting an item starts a new radio group (has to as we shouldn't
+        // keep a deleted pointer anyhow)
+        m_prevRadio = NULL;
+    }

 
     // TODO: this code doesn't delete the item factory item and this seems
     //       impossible as of GTK 1.2.6.
 
     // TODO: this code doesn't delete the item factory item and this seems
     //       impossible as of GTK 1.2.6.

-    gtk_widget_destroy( item->GetMenuItem() );
+    gtk_widget_destroy( mitem );

 
     return item;
 }
 
     return item;
 }


@@ -1708,8 +1670,6 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
 
 #endif // wxUSE_MENUS_NATIVE
 
 
 #endif // wxUSE_MENUS_NATIVE
 

-#ifdef __WXGTK20__
-

 #include <gtk/gtk.h>
 
 const char *wxGetStockGtkID(wxWindowID id)
 #include <gtk/gtk.h>
 
 const char *wxGetStockGtkID(wxWindowID id)


@@ -1808,6 +1768,8 @@ const char *wxGetStockGtkID(wxWindowID id)
     return NULL;
 }
 
     return NULL;
 }
 

+#if wxUSE_ACCEL
+static

 bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key)
 {
     if (!id)
 bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key)
 {
     if (!id)


@@ -1827,7 +1789,6 @@ bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key)
 
     return false;
 }
 
     return false;
 }

-
-#endif // __WXGTK20__
+#endif // wxUSE_ACCEL

 
 #endif // wxUSE_MENUS
 
 #endif // wxUSE_MENUS