document On{Open,Save}Document()

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index a48c4c3b0436e7cbab5a6a483c1425b9cd62309e..55f2ac2921e5341df009bac67dbd5a8d63ea343c 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -25,142 +25,33 @@
 #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"

-
-// 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_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
-
-#define ACCEL_OBJECT        GtkWindow
-#define ACCEL_OBJECTS(a)    (a)->acceleratables
-#define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
+#include "wx/gtk/private/mnemonics.h"

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

 static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
 {
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();
 static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
 {
     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 );
-}
-
-extern "C" {
-
-static void
-gtk_menu_open_callback(GtkWidget * WXUNUSED(widget), wxMenu *menu)
-{
-    wxMenuEvent event(wxEVT_MENU_OPEN, -1, menu);
-
-    DoCommonMenuCallbackCode(menu, event);
-}
-
-static void
-gtk_menu_close_callback(GtkWidget * WXUNUSED(widget), wxMenuBar *menubar)
-{
-    if ( !menubar->GetMenuCount() )
-    {
-        // if menubar is empty we can't call GetMenu(0) below
-        return;
-    }
-
-    wxMenuEvent event( wxEVT_MENU_CLOSE, -1, NULL );
-
-    DoCommonMenuCallbackCode(menubar->GetMenu(0), event);
-}
-
+        win->HandleWindowEvent( event );

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


@@ -171,9 +62,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 
 void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
 {
 
 void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
 {

-    m_style = style;

     m_invokingWindow = NULL;
 
     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") ))
     {


@@ -197,17 +93,10 @@ 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]);

-
-    // VZ: for some reason connecting to menus "deactivate" doesn't work (we
-    //     don't get it when the menu is dismissed by clicking outside the
-    //     toolbar) so we connect to the global one, even if it means that we
-    //     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)


@@ -229,48 +118,50 @@ wxMenuBar::~wxMenuBar()
 {
 }
 
 {
 }
 

-static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
+static void
+wxMenubarUnsetInvokingWindow(wxMenu* menu, wxWindow* win, GtkWindow* tlw = NULL)

 {
     menu->SetInvokingWindow( (wxWindow*) NULL );
 
 {
     menu->SetInvokingWindow( (wxWindow*) NULL );
 

-    wxWindow *top_frame = win;
-    while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
-        top_frame = top_frame->GetParent();
-

     // support for native hot keys
     // 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 );
+    if (menu->m_accel)
+    {
+        if (tlw == NULL)
+            tlw = GTK_WINDOW(wxGetTopLevelParent(win)->m_widget);
+        if (g_slist_find(menu->m_accel->acceleratables, tlw))
+            gtk_window_remove_accel_group(tlw, menu->m_accel);
+    }

 
     wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
     while (node)
     {
         wxMenuItem *menuitem = node->GetData();
         if (menuitem->IsSubMenu())
 
     wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
     while (node)
     {
         wxMenuItem *menuitem = node->GetData();
         if (menuitem->IsSubMenu())

-            wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win );
+            wxMenubarUnsetInvokingWindow(menuitem->GetSubMenu(), win, tlw);

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

-static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
+static void
+wxMenubarSetInvokingWindow(wxMenu* menu, wxWindow* win, GtkWindow* tlw = NULL)

 {
     menu->SetInvokingWindow( win );
 
 {
     menu->SetInvokingWindow( win );
 

-    wxWindow *top_frame = win;
-    while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
-        top_frame = top_frame->GetParent();
-

     // support for native hot keys
     // support for native hot keys

-    ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget);
-    if ( !g_slist_find( ACCEL_OBJECTS(menu->m_accel), obj ) )
-        gtk_accel_group_attach( menu->m_accel, obj );
+    if (menu->m_accel)
+    {
+        if (tlw == NULL)
+            tlw = GTK_WINDOW(wxGetTopLevelParent(win)->m_widget);
+        if (!g_slist_find(menu->m_accel->acceleratables, tlw))
+            gtk_window_add_accel_group(tlw, menu->m_accel);
+    }

 
     wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
     while (node)
     {
         wxMenuItem *menuitem = node->GetData();
         if (menuitem->IsSubMenu())
 
     wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
     while (node)
     {
         wxMenuItem *menuitem = node->GetData();
         if (menuitem->IsSubMenu())

-            wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win );
+            wxMenubarSetInvokingWindow(menuitem->GetSubMenu(), win, tlw);

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


@@ -278,9 +169,6 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
 void wxMenuBar::SetInvokingWindow( wxWindow *win )
 {
     m_invokingWindow = win;
 void wxMenuBar::SetInvokingWindow( wxWindow *win )
 {
     m_invokingWindow = win;

-    wxWindow *top_frame = win;
-    while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
-        top_frame = top_frame->GetParent();

 
     wxMenuList::compatibility_iterator node = m_menus.GetFirst();
     while (node)
 
     wxMenuList::compatibility_iterator node = m_menus.GetFirst();
     while (node)


@@ -338,9 +226,6 @@ void wxMenuBar::Attach(wxFrame *frame)
 void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 {
     m_invokingWindow = (wxWindow*) NULL;
 void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 {
     m_invokingWindow = (wxWindow*) NULL;

-    wxWindow *top_frame = win;
-    while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
-        top_frame = top_frame->GetParent();

 
     wxMenuList::compatibility_iterator node = m_menus.GetFirst();
     while (node)
 
     wxMenuList::compatibility_iterator node = m_menus.GetFirst();
     while (node)


@@ -361,28 +246,48 @@ 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));

 
 

-    gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
+        // 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_widget_show( menu->m_owner );

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

-    g_signal_connect (menu->m_owner, "activate",
-                      G_CALLBACK (gtk_menu_open_callback),
-                      menu);
-

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


@@ -423,7 +328,7 @@ wxMenu *wxMenuBar::Remove(size_t pos)
     if ( !menu )
         return (wxMenu*) NULL;
 
     if ( !menu )
         return (wxMenu*) NULL;
 

-    gtk_menu_item_remove_submenu( GTK_MENU_ITEM(menu->m_owner) );
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu->m_owner), NULL);

     gtk_container_remove(GTK_CONTAINER(m_menubar), menu->m_owner);
 
     gtk_widget_destroy( menu->m_owner );
     gtk_container_remove(GTK_CONTAINER(m_menubar), menu->m_owner);
 
     gtk_widget_destroy( menu->m_owner );


@@ -437,7 +342,7 @@ wxMenu *wxMenuBar::Remove(size_t pos)
 
 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 (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)


@@ -530,7 +435,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 )


@@ -541,7 +446,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 );
 


@@ -612,7 +517,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
         if (item->IsCheckable())
             commandEvent.SetInt(item->IsChecked());
 
         if (item->IsCheckable())
             commandEvent.SetInt(item->IsChecked());
 

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

     }
     else
     {
     }
     else
     {


@@ -640,11 +545,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 );

 }
 }
 
 }
 }
 


@@ -666,12 +571,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 );

 }
 }
 
 }
 }
 


@@ -779,9 +684,9 @@ wxString wxMenuItemBase::GetLabelText(const wxString& text)
 
 wxString wxMenuItem::GetItemLabel() const
 {
 
 wxString wxMenuItem::GetItemLabel() const
 {

-    wxString label = wxConvertFromGTKToWXLabel(m_text);
+    wxString label = wxConvertMnemonicsFromGTK(m_text);

     if (!m_hotKey.IsEmpty())
     if (!m_hotKey.IsEmpty())

-        label = label + wxT("\t") + m_hotKey;
+        label << "\t" << m_hotKey;

     return label;
 }
 
     return label;
 }
 


@@ -798,11 +703,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;


@@ -877,6 +785,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()


@@ -998,15 +907,35 @@ bool wxMenuItem::IsChecked() const
 // wxMenu
 //-----------------------------------------------------------------------------
 
 // wxMenu
 //-----------------------------------------------------------------------------
 

+extern "C" {
+// "map" from m_menu
+static void menu_map(GtkWidget*, wxMenu* menu)
+{
+    wxMenuEvent event(wxEVT_MENU_OPEN, menu->m_popupShown ? -1 : 0, menu);
+    DoCommonMenuCallbackCode(menu, event);
+}
+
+// "hide" from m_menu
+static void menu_hide(GtkWidget*, wxMenu* menu)
+{
+    wxMenuEvent event(wxEVT_MENU_CLOSE, menu->m_popupShown ? -1 : 0, menu);
+    menu->m_popupShown = false;
+    DoCommonMenuCallbackCode(menu, event);
+}
+}
+

 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 void wxMenu::Init()
 {
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 void wxMenu::Init()
 {

+    m_popupShown = false;
+

     m_accel = gtk_accel_group_new();
     m_menu = gtk_menu_new();
     // NB: keep reference to the menu so that it is not destroyed behind
     //     our back by GTK+ e.g. when it is removed from menubar:
     m_accel = gtk_accel_group_new();
     m_menu = gtk_menu_new();
     // NB: keep reference to the menu so that it is not destroyed behind
     //     our back by GTK+ e.g. when it is removed from menubar:

-    gtk_widget_ref(m_menu);
+    g_object_ref(m_menu);
+    gtk_object_sink(GTK_OBJECT(m_menu));

 
     m_owner = (GtkWidget*) NULL;
 
 
     m_owner = (GtkWidget*) NULL;
 


@@ -1028,28 +957,23 @@ void wxMenu::Init()
         Append(wxGTK_TITLE_ID, m_title);
         AppendSeparator();
     }
         Append(wxGTK_TITLE_ID, m_title);
         AppendSeparator();
     }

+
+    // "show" occurs for sub-menus which are not showing, so use "map" instead
+    g_signal_connect(m_menu, "map", G_CALLBACK(menu_map), this);
+    g_signal_connect(m_menu, "hide", G_CALLBACK(menu_hide), this);

 }
 
 wxMenu::~wxMenu()
 {
 }
 
 wxMenu::~wxMenu()
 {

-   if ( GTK_IS_WIDGET( m_menu ))
-   {
-       // see wxMenu::Init
-       gtk_widget_unref( m_menu );
-       g_object_unref( m_accel );
-
-       // if the menu is inserted in another menu at this time, there was
-       // one more reference to it:
-       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);
+    // see wxMenu::Init
+    g_object_unref(m_menu);
+
+    // if the menu is inserted in another menu at this time, there was
+    // one more reference to it:
+    if (m_owner)
+       gtk_widget_destroy(m_menu);
+
+    g_object_unref(m_accel);

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


@@ -1089,6 +1013,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) )


@@ -1179,11 +1104,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);


@@ -1208,6 +1133,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);


@@ -1279,11 +1205,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;
 }


@@ -1582,123 +1516,6 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
 
 #endif // wxUSE_ACCEL
 
 
 #endif // wxUSE_ACCEL
 

-// ----------------------------------------------------------------------------
-// Pop-up menu stuff
-// ----------------------------------------------------------------------------
-
-#if wxUSE_MENUS_NATIVE
-
-extern "C" WXDLLIMPEXP_CORE
-void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting  )
-{
-    *is_waiting = false;
-}
-
-WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win )
-{
-    menu->SetInvokingWindow( win );
-
-    wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
-    while (node)
-    {
-        wxMenuItem *menuitem = node->GetData();
-        if (menuitem->IsSubMenu())
-        {
-            SetInvokingWindow( menuitem->GetSubMenu(), win );
-        }
-
-        node = node->GetNext();
-    }
-}
-
-extern "C" WXDLLIMPEXP_CORE
-void wxPopupMenuPositionCallback( GtkMenu *menu,
-                                  gint *x, gint *y,
-                                  gboolean * WXUNUSED(whatever),
-                                  gpointer user_data )
-{
-    // ensure that the menu appears entirely on screen
-    GtkRequisition req;
-    gtk_widget_get_child_requisition(GTK_WIDGET(menu), &req);
-
-    wxSize sizeScreen = wxGetDisplaySize();
-    wxPoint *pos = (wxPoint*)user_data;
-
-    gint xmax = sizeScreen.x - req.width,
-         ymax = sizeScreen.y - req.height;
-
-    *x = pos->x < xmax ? pos->x : xmax;
-    *y = pos->y < ymax ? pos->y : ymax;
-}
-
-bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
-{
-    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
-
-    wxCHECK_MSG( menu != NULL, false, wxT("invalid popup-menu") );
-
-    // NOTE: if you change this code, you need to update
-    //       the same code in taskbar.cpp as well. This
-    //       is ugly code duplication, I know.
-
-    SetInvokingWindow( menu, this );
-
-    menu->UpdateUI();
-
-    bool is_waiting = true;
-
-    gulong handler = g_signal_connect (menu->m_menu, "hide",
-                                       G_CALLBACK (gtk_pop_hide_callback),
-                                       &is_waiting);
-
-    wxPoint pos;
-    gpointer userdata;
-    GtkMenuPositionFunc posfunc;
-    if ( x == -1 && y == -1 )
-    {
-        // use GTK's default positioning algorithm
-        userdata = NULL;
-        posfunc = NULL;
-    }
-    else
-    {
-        pos = ClientToScreen(wxPoint(x, y));
-        userdata = &pos;
-        posfunc = wxPopupMenuPositionCallback;
-    }
-
-    wxMenuEvent eventOpen(wxEVT_MENU_OPEN, -1, menu);
-    DoCommonMenuCallbackCode(menu, eventOpen);
-
-    gtk_menu_popup(
-                  GTK_MENU(menu->m_menu),
-                  (GtkWidget *) NULL,           // parent menu shell
-                  (GtkWidget *) NULL,           // parent menu item
-                  posfunc,                      // function to position it
-                  userdata,                     // client data
-                  0,                            // button used to activate it
-                  gtk_get_current_event_time()
-                );
-
-    while (is_waiting)
-    {
-        gtk_main_iteration();
-    }
-
-    g_signal_handler_disconnect (menu->m_menu, handler);
-
-    wxMenuEvent eventClose(wxEVT_MENU_CLOSE, -1, menu);
-    DoCommonMenuCallbackCode(menu, eventClose);
-
-    return true;
-}
-
-#endif // wxUSE_MENUS_NATIVE
-
-#ifdef __WXGTK20__
-
-#include <gtk/gtk.h>
-

 const char *wxGetStockGtkID(wxWindowID id)
 {
     #define STOCKITEM(wx,gtk)      \
 const char *wxGetStockGtkID(wxWindowID id)
 {
     #define STOCKITEM(wx,gtk)      \


@@ -1795,6 +1612,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)


@@ -1814,7 +1633,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