remove unnecessary gtk_widget_show(m_widget) calls, PostCreation() takes care of...

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index c89d45db0f73a02583d8f4f27636b7280afd19ee..83bece8ee67467671804f66003fe2629cc99ec99 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -27,34 +27,19 @@
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/mnemonics.h"
 
 #include "wx/gtk/private.h"
 #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))
-#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)
-

 // we use normal item but with a special id for the menu title
 static const int wxGTK_TITLE_ID = -3;
 
 // forward declare it as it's used by wxMenuBar too when using Hildon
 extern "C"
 {
 // we use normal item but with a special id for the menu title
 static const int wxGTK_TITLE_ID = -3;
 
 // 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);
+    static void menuitem_activate(GtkWidget*, wxMenuItem* item);

 }
 
 #if wxUSE_ACCEL
 }
 
 #if wxUSE_ACCEL

-static bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key);
-static wxString GetGtkHotKey( const wxMenuItem& item );
+static void wxGetGtkAccel(const wxMenuItem*, guint*, GdkModifierType*);

 #endif
 
 #endif
 

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

 static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
 {
     event.SetEventObject( menu );
 static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
 {
     event.SetEventObject( menu );


@@ -63,54 +48,24 @@ static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
     if (handler && handler->SafelyProcessEvent(event))
         return;
 
     if (handler && handler->SafelyProcessEvent(event))
         return;
 

-    wxWindow *win = menu->GetInvokingWindow();
-    if (win)
-        win->HandleWindowEvent( 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);
-}
+    wxWindow *win = menu->GetWindow();
+    wxCHECK_RET( win, "event for a menu without associated window?" );

 
 

+    win->HandleWindowEvent( event );

 }
 
 //-----------------------------------------------------------------------------
 // wxMenuBar
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxMenuBar
 //-----------------------------------------------------------------------------
 

-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;
-
-#if wxUSE_LIBHILDON
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2

     // 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();
     // 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
+#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2

     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") ))
     {


@@ -133,18 +88,13 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
 
     PostCreation();
 
 
     PostCreation();
 

-    ApplyWidgetStyle();
-#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+    GTKApplyWidgetStyle();
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+
+    g_object_ref(m_widget);

 
     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)


@@ -162,71 +112,56 @@ wxMenuBar::wxMenuBar()
     Init(0, NULL, NULL, 0);
 }
 
     Init(0, NULL, NULL, 0);
 }
 

-wxMenuBar::~wxMenuBar()
+// recursive helpers for wxMenuBar::Attach() and Detach(): they are called to
+// associate the menus with the frame they belong to or dissociate them from it
+namespace

 {
 {

-}

 
 

-static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
+void
+DetachFromFrame(wxMenu* menu, wxFrame* frame)

 {
 {

-    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)
+    {
+        // Note that wxGetTopLevelParent() is really needed because this frame
+        // can be an MDI child frame which is a fake frame and not a TLW at all
+        GtkWindow * const tlw = GTK_WINDOW(wxGetTopLevelParent(frame)->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 );
+            DetachFromFrame(menuitem->GetSubMenu(), frame);

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

-static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
+void
+AttachToFrame(wxMenu* menu, wxFrame* frame)

 {
 {

-    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)
+    {
+        GtkWindow * const tlw = GTK_WINDOW(wxGetTopLevelParent(frame)->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 );
+            AttachToFrame(menuitem->GetSubMenu(), frame);

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

-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)
-    {
-        wxMenu *menu = node->GetData();
-        wxMenubarSetInvokingWindow( menu, win );
-        node = node->GetNext();
-    }
-}
+} // anonymous namespace

 
 void wxMenuBar::SetLayoutDirection(wxLayoutDirection dir)
 {
 
 void wxMenuBar::SetLayoutDirection(wxLayoutDirection dir)
 {


@@ -269,38 +204,45 @@ void wxMenuBar::Attach(wxFrame *frame)
 {
     wxMenuBarBase::Attach(frame);
 
 {
     wxMenuBarBase::Attach(frame);
 

+    wxMenuList::compatibility_iterator node = m_menus.GetFirst();
+    while (node)
+    {
+        wxMenu *menu = node->GetData();
+        AttachToFrame( menu, frame );
+        node = node->GetNext();
+    }
+

     SetLayoutDirection(wxLayout_Default);
 }
 
     SetLayoutDirection(wxLayout_Default);
 }
 

-void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
+void wxMenuBar::Detach()

 {
 {

-    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)
     {
         wxMenu *menu = node->GetData();
     wxMenuList::compatibility_iterator node = m_menus.GetFirst();
     while (node)
     {
         wxMenu *menu = node->GetData();

-        wxMenubarUnsetInvokingWindow( menu, win );
+        DetachFromFrame( menu, m_menuBarFrame );

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

+
+    wxMenuBarBase::Detach();

 }
 
 bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {
 }
 
 bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {

-    if ( !wxMenuBarBase::Append( menu, title ) )
-        return false;
-
-    return GtkAppend(menu, title);
+    if (wxMenuBarBase::Append(menu, title))
+    {
+        GtkAppend(menu, title);
+        return true;
+    }
+    return false;

 }
 
 }
 

-bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
+void wxMenuBar::GtkAppend(wxMenu* menu, const wxString& title, int pos)

 {
     menu->SetLayoutDirection(GetLayoutDirection());
 
 {
     menu->SetLayoutDirection(GetLayoutDirection());
 

-#if wxUSE_LIBHILDON
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2

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


@@ -311,16 +253,19 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
         const wxString str(wxStripMenuCodes(item->GetItemLabel()));
 
         if ( item->IsSubMenu() )
         const wxString str(wxStripMenuCodes(item->GetItemLabel()));
 
         if ( item->IsSubMenu() )

-            return GtkAppend(item->GetSubMenu(), str, pos);
+        {
+            GtkAppend(item->GetSubMenu(), str, pos);
+            return;
+        }

 
         menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
 
         g_signal_connect(menu->m_owner, "activate",
 
         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);
+                         G_CALLBACK(menuitem_activate), item);

         item->SetMenuItem(menu->m_owner);
     }
     else
         item->SetMenuItem(menu->m_owner);
     }
     else

-#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2

     {
         const wxString str(wxConvertMnemonicsToGTK(title));
 
     {
         const wxString str(wxConvertMnemonicsToGTK(title));
 


@@ -340,29 +285,18 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
     else
         gtk_menu_shell_insert( GTK_MENU_SHELL(m_menubar), menu->m_owner, pos );
 
     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)
-        wxMenubarSetInvokingWindow( menu, m_invokingWindow );
-
-    return true;
+    if ( m_menuBarFrame )
+        AttachToFrame( menu, m_menuBarFrame );

 }
 
 bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 {
 }
 
 bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 {

-    if ( !wxMenuBarBase::Insert(pos, menu, title) )
-        return false;
-
-    // TODO
-
-    if ( !GtkAppend(menu, title, (int)pos) )
-        return false;
-
-    return true;
+    if (wxMenuBarBase::Insert(pos, menu, title))
+    {
+        GtkAppend(menu, title, int(pos));
+        return true;
+    }
+    return false;

 }
 
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 }
 
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)


@@ -371,7 +305,7 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
     wxMenu *menuOld = Remove(pos);
     if ( menuOld && !Insert(pos, menu, title) )
     {
     wxMenu *menuOld = Remove(pos);
     if ( menuOld && !Insert(pos, menu, title) )
     {

-        return (wxMenu*) NULL;
+        return NULL;

     }
 
     // either Insert() succeeded or Remove() failed and menuOld is NULL
     }
 
     // either Insert() succeeded or Remove() failed and menuOld is NULL


@@ -382,23 +316,22 @@ wxMenu *wxMenuBar::Remove(size_t pos)
 {
     wxMenu *menu = wxMenuBarBase::Remove(pos);
     if ( !menu )
 {
     wxMenu *menu = wxMenuBarBase::Remove(pos);
     if ( !menu )

-        return (wxMenu*) NULL;
+        return 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 );
     menu->m_owner = NULL;
 
     gtk_container_remove(GTK_CONTAINER(m_menubar), menu->m_owner);
 
     gtk_widget_destroy( menu->m_owner );
     menu->m_owner = NULL;
 

-    if (m_invokingWindow)
-        wxMenubarUnsetInvokingWindow( menu, m_invokingWindow );
+    DetachFromFrame( menu, m_menuBarFrame );

 
     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(wxConvertMnemonicsFromGTK(menu->GetTitle())) == wxMenuItem::GetLabelText(menuString))
+    if (wxMenuItem::GetLabelText(menu->GetTitle()) == wxMenuItem::GetLabelText(menuString))

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


@@ -465,7 +398,7 @@ wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const
 
     if ( menuForItem )
     {
 
     if ( menuForItem )
     {

-        *menuForItem = result ? result->GetMenu() : (wxMenu *)NULL;
+        *menuForItem = result ? result->GetMenu() : NULL;

     }
 
     return result;
     }
 
     return result;


@@ -483,6 +416,15 @@ void wxMenuBar::EnableTop( size_t pos, bool flag )
         gtk_widget_set_sensitive( menu->m_owner, flag );
 }
 
         gtk_widget_set_sensitive( menu->m_owner, flag );
 }
 

+bool wxMenuBar::IsEnabledTop(size_t pos) const
+{
+    wxMenuList::compatibility_iterator node = m_menus.Item( pos );
+    wxCHECK_MSG( node, false, wxS("invalid index in IsEnabledTop") );
+    wxMenu* const menu = node->GetData();
+    wxCHECK_MSG( menu->m_owner, true, wxS("no menu owner?") );
+    return gtk_widget_get_sensitive( menu->m_owner );
+}
+

 wxString wxMenuBar::GetMenuLabel( size_t pos ) const
 {
     wxMenuList::compatibility_iterator node = m_menus.Item( pos );
 wxString wxMenuBar::GetMenuLabel( size_t pos ) const
 {
     wxMenuList::compatibility_iterator node = m_menus.Item( pos );


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

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

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


@@ -507,7 +449,7 @@ void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label )
     menu->SetTitle( str );
 
     if (menu->m_owner)
     menu->SetTitle( str );
 
     if (menu->m_owner)

-        gtk_label_set_text_with_mnemonic( GTK_LABEL( GTK_BIN(menu->m_owner)->child), wxGTK_CONV(str) );
+        gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menu->m_owner))), wxGTK_CONV(str));

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


@@ -515,21 +457,13 @@ void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label )
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
+static void menuitem_activate(GtkWidget*, wxMenuItem* item)

 {
 {

-    int id = menu->FindMenuIdByMenuItem(widget);
-
-    /* should find it for normal (not popup) menu */
-    wxASSERT_MSG( (id != -1) || (menu->GetInvokingWindow() != NULL),
-                  _T("menu item not found in gtk_menu_clicked_callback") );
-
-    if (!menu->IsEnabled(id))
+    if (!item->IsEnabled())

         return;
 
         return;
 

-    wxMenuItem* item = menu->FindChildItem( id );
-    wxCHECK_RET( item, wxT("error in menu item callback") );
-
-    if ( item->GetId() == wxGTK_TITLE_ID )
+    int id = item->GetId();
+    if (id == wxGTK_TITLE_ID)

     {
         // ignore events from the menu title
         return;
     {
         // ignore events from the menu title
         return;


@@ -553,33 +487,8 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
         }
     }
 
         }
     }
 

-
-    // Is this menu on a menubar?  (possibly nested)
-    wxFrame* frame = NULL;
-    if(menu->IsAttached())
-        frame = menu->GetMenuBar()->GetFrame();
-
-    // FIXME: why do we have to call wxFrame::GetEventHandler() directly here?
-    //        normally wxMenu::SendEvent() should be enough, if it doesn't work
-    //        in wxGTK then we have a bug in wxMenu::GetInvokingWindow() which
-    //        should be fixed instead of working around it here...
-    if (frame)
-    {
-        // If it is attached then let the frame send the event.
-        // Don't call frame->ProcessCommand(id) because it toggles
-        // checkable items and we've already done that above.
-        wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
-        commandEvent.SetEventObject(frame);
-        if (item->IsCheckable())
-            commandEvent.SetInt(item->IsChecked());
-
-        frame->HandleWindowEvent(commandEvent);
-    }
-    else
-    {
-        // otherwise let the menu have it
-        menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
-    }
+    wxMenu* menu = item->GetMenu();
+    menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);

 }
 }
 
 }
 }
 


@@ -588,24 +497,13 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
+static void menuitem_select(GtkWidget*, wxMenuItem* item)

 {
 {

-    int id = menu->FindMenuIdByMenuItem(widget);
-
-    wxASSERT( id != -1 ); // should find it!
-
-    if (!menu->IsEnabled(id))
+    if (!item->IsEnabled())

         return;
 
         return;
 

-    wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
-    event.SetEventObject( menu );
-
-    wxEvtHandler* handler = menu->GetEventHandler();
-    if (handler && handler->SafelyProcessEvent(event))
-        return;
-
-    wxWindow *win = menu->GetInvokingWindow();
-    if (win) win->HandleWindowEvent( event );
+    wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item->GetId());
+    DoCommonMenuCallbackCode(item->GetMenu(), event);

 }
 }
 
 }
 }
 


@@ -614,25 +512,13 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
+static void menuitem_deselect(GtkWidget*, wxMenuItem* item)

 {
 {

-    int id = menu->FindMenuIdByMenuItem(widget);
-
-    wxASSERT( id != -1 ); // should find it!
-
-    if (!menu->IsEnabled(id))
+    if (!item->IsEnabled())

         return;
 
     wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
         return;
 
     wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );

-    event.SetEventObject( menu );
-
-    wxEvtHandler* handler = menu->GetEventHandler();
-    if (handler && handler->SafelyProcessEvent(event))
-        return;
-
-    wxWindow *win = menu->GetInvokingWindow();
-    if (win)
-        win->HandleWindowEvent( event );
+    DoCommonMenuCallbackCode(item->GetMenu(), event);

 }
 }
 
 }
 }
 


@@ -640,8 +526,6 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
 // wxMenuItem
 //-----------------------------------------------------------------------------
 
 // wxMenuItem
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-

 wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
                                 int id,
                                 const wxString& name,
 wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
                                 int id,
                                 const wxString& name,


@@ -660,9 +544,10 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        wxMenu *subMenu)
           : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
 {
                        wxMenu *subMenu)
           : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
 {

-    Init(text);
+    m_menuItem = NULL;

 }
 
 }
 

+#if WXWIN_COMPATIBILITY_2_8

 wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        int id,
                        const wxString& text,
 wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        int id,
                        const wxString& text,


@@ -672,254 +557,64 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
           : wxMenuItemBase(parentMenu, id, text, help,
                            isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
 {
           : wxMenuItemBase(parentMenu, id, text, help,
                            isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
 {

-    Init(text);
-}
-
-void wxMenuItem::Init(const wxString& text)
-{
-    m_labelWidget = (GtkWidget *) NULL;
-    m_menuItem = (GtkWidget *) NULL;
-
-    DoSetText(text);
+    m_menuItem = NULL;

 }
 }

+#endif

 
 wxMenuItem::~wxMenuItem()
 {
    // don't delete menu items, the menus take care of that
 }
 
 
 wxMenuItem::~wxMenuItem()
 {
    // don't delete menu items, the menus take care of that
 }
 

-// return the menu item text without any menu accels
-/* static */
-
-wxString wxMenuItemBase::GetLabelText(const wxString& text)
-{
-    // The argument to this function will now always be in wxWidgets standard label
-    // format, not GTK+ format, so we do what the other ports do.
-
-    return wxStripMenuCodes(text);
-
-#if 0
-    wxString label;
-
-    for ( const wxChar *pc = text.c_str(); *pc; pc++ )
-    {
-        if ( *pc == wxT('\t'))
-            break;
-
-        if ( *pc == wxT('_') )
-        {
-            // GTK 1.2 escapes "xxx_xxx" to "xxx__xxx"
-            pc++;
-            label += *pc;
-            continue;
-        }
-
-        if ( *pc == wxT('\\')  )
-        {
-            // GTK 2.0 escapes "xxx/xxx" to "xxx\/xxx"
-            pc++;
-            label += *pc;
-            continue;
-        }
-
-        if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) )
-        {
-            // wxMSW escapes "&"
-            // "&" is doubled to indicate "&" instead of accelerator
-            continue;
-        }
-
-        label += *pc;
-    }
-
-    // wxPrintf( wxT("GetLabelText(): text %s label %s\n"), text.c_str(), label.c_str() );
-
-    return label;
-#endif
-}
-
-wxString wxMenuItem::GetItemLabel() const
-{
-    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 )
 {

-    // cache some data which must be used later
-    bool isstock = wxIsStockID(GetId());
-    const char *stockid = NULL;
-    if (isstock)
-        stockid = wxGetStockGtkID(GetId());
-
-    // Some optimization to avoid flicker
-    wxString oldLabel = m_text;
-    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
-#endif // wxUSE_ACCEL
-
-    DoSetText(str);
-

 #if wxUSE_ACCEL
 #if wxUSE_ACCEL

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

     if (m_menuItem)
     {
     if (m_menuItem)
     {

-        GtkLabel *label;
-        if (m_labelWidget)
-            label = (GtkLabel*) m_labelWidget;
-        else
-            label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
-
-        // stock menu items can have empty labels:
-        wxString text = m_text;
-        if (text.IsEmpty() && !IsSeparator())
-        {
-            wxASSERT_MSG(isstock, wxT("A non-stock menu item with an empty label?"));
-            text = wxGetStockLabel(GetId());
-
-            // need & => _ conversion
-            text = GTKProcessMenuItemLabel(text, NULL);
-        }
-
-        gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV_SYS(text) );
-    }
-
-    // remove old accelerator from our parent's accelerator group, if present
-    guint accel_key;
-    GdkModifierType accel_mods;
-    if (oldbuf[(size_t)0] != '\0')
-    {
-        gtk_accelerator_parse( (const char*) oldbuf, &accel_key, &accel_mods);
-        if (accel_key != 0)
+        // remove old accelerator
+        guint accel_key;
+        GdkModifierType accel_mods;
+        wxGetGtkAccel(this, &accel_key, &accel_mods);
+        if (accel_key)

         {
         {

-            gtk_widget_remove_accelerator(m_menuItem,
-                                        m_parentMenu->m_accel,
-                                        accel_key,
-                                        accel_mods );
+            gtk_widget_remove_accelerator(
+                m_menuItem, m_parentMenu->m_accel, accel_key, accel_mods);

         }
     }
         }
     }

-    else if (isstock)
-    {
-        // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
-        if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
-            gtk_widget_remove_accelerator( m_menuItem,
-                                           m_parentMenu->m_accel,
-                                           accel_key,
-                                           accel_mods );
-    }
-
-    // add new accelerator to our parent's accelerator group
-    wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*this) );
-    if (buf[(size_t)0] != '\0')
-    {
-        gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
-        if (accel_key != 0)
-        {
-            gtk_widget_add_accelerator( m_menuItem,
-                                        "activate",
-                                        m_parentMenu->m_accel,
-                                        accel_key,
-                                        accel_mods,
-                                        GTK_ACCEL_VISIBLE);
-        }
-    }
-    else if (isstock)
-    {
-        // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
-        if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
-            gtk_widget_remove_accelerator( m_menuItem,
-                                           m_parentMenu->m_accel,
-                                           accel_key,
-                                           accel_mods );
-    }

 #endif // wxUSE_ACCEL
 #endif // wxUSE_ACCEL

+    wxMenuItemBase::SetItemLabel(str);
+    if (m_menuItem)
+        SetGtkLabel();

 }
 
 }
 

-// NOTE: this function is different from the similar functions GTKProcessMnemonics()
-//       implemented in control.cpp and from wxMenuItemBase::GetLabelText...
-//       so there's no real code duplication
-wxString wxMenuItem::GTKProcessMenuItemLabel(const wxString& str, wxString *hotKey)
+void wxMenuItem::SetGtkLabel()

 {
 {

-    wxString text;
-
-    // '\t' is the deliminator indicating a hot key
-    wxString::const_iterator pc = str.begin();
-    while ( pc != str.end() && *pc != wxT('\t') )
-    {
-        if (*pc == wxT('&'))
-        {
-            wxString::const_iterator next = pc + 1;
-            if (next != str.end() && *next == wxT('&'))
-            {
-                // "&" is doubled to indicate "&" instead of accelerator
-                ++pc;
-                text << wxT('&');
-            }
-            else
-            {
-                text << wxT('_');
-            }
-        }
-        else if ( *pc == wxT('_') )    // escape underscores
-        {
-            text << wxT("__");
-        }
-        else
-        {
-            text << *pc;
-        }
-        ++pc;
-    }
-
-    if (hotKey)
+    const wxString text = wxConvertMnemonicsToGTK(m_text.BeforeFirst('\t'));
+    GtkLabel* label = GTK_LABEL(gtk_bin_get_child(GTK_BIN(m_menuItem)));
+    gtk_label_set_text_with_mnemonic(label, wxGTK_CONV_SYS(text));
+#if wxUSE_ACCEL
+    guint accel_key;
+    GdkModifierType accel_mods;
+    wxGetGtkAccel(this, &accel_key, &accel_mods);
+    if (accel_key)

     {
     {

-        hotKey->Empty();
-        if(*pc == wxT('\t'))
-        {
-            pc++;
-            hotKey->assign(pc, str.end());
-        }
+        gtk_widget_add_accelerator(
+            m_menuItem, "activate", m_parentMenu->m_accel,
+            accel_key, accel_mods, GTK_ACCEL_VISIBLE);

     }
     }

-
-    return text;
-}
-
-// it's valid for this function to be called even if m_menuItem == NULL
-void wxMenuItem::DoSetText( const wxString& str )
-{
-    m_text.Empty();
-    m_text = GTKProcessMenuItemLabel(str, &m_hotKey);
+#endif // wxUSE_ACCEL

 }
 
 }
 

-#if wxUSE_ACCEL
-
-wxAcceleratorEntry *wxMenuItem::GetAccel() const
+void wxMenuItem::SetBitmap(const wxBitmap& bitmap)

 {
 {

-    if ( !GetHotKey() )
+    if (m_kind == wxITEM_NORMAL)
+        m_bitmap = bitmap;
+    else

     {
     {

-        // nothing
-        return NULL;
+        wxFAIL_MSG("only normal menu items can have bitmaps");

     }
     }

-
-    // accelerator parsing code looks for them after a TAB, so insert a dummy
-    // one here
-    wxString label;
-    label << wxT('\t') << GetHotKey();
-
-    return wxAcceleratorEntry::Create(label);

 }
 
 }
 

-#endif // wxUSE_ACCEL
-

 void wxMenuItem::Check( bool check )
 {
     wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
 void wxMenuItem::Check( bool check )
 {
     wxCHECK_RET( m_menuItem, wxT("invalid menu item") );


@@ -937,7 +632,7 @@ void wxMenuItem::Check( bool check )
             break;
 
         default:
             break;
 
         default:

-            wxFAIL_MSG( _T("can't check this item") );
+            wxFAIL_MSG( wxT("can't check this item") );

     }
 }
 
     }
 }
 


@@ -956,24 +651,51 @@ bool wxMenuItem::IsChecked() const
     wxCHECK_MSG( IsCheckable(), false,
                  wxT("can't get state of uncheckable item!") );
 
     wxCHECK_MSG( IsCheckable(), false,
                  wxT("can't get state of uncheckable item!") );
 

-    return ((GtkCheckMenuItem*)m_menuItem)->active != 0;
+    return gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(m_menuItem)) != 0;

 }
 
 //-----------------------------------------------------------------------------
 // wxMenu
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxMenu
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
+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);
+}
+}
+
+// "can_activate_accel" from menu item
+extern "C" {
+static gboolean can_activate_accel(GtkWidget*, guint, wxMenu* menu)
+{
+    menu->UpdateUI();
+    // always allow our "activate" handler to be called
+    return true;
+}
+}

 
 void wxMenu::Init()
 {
 
 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_sink(m_menu);

 
 

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

 
     // Tearoffs are entries, just like separators. So if we want this
     // menu to be a tear-off one, we just append a tearoff entry
 
     // Tearoffs are entries, just like separators. So if we want this
     // menu to be a tear-off one, we just append a tearoff entry


@@ -985,36 +707,34 @@ void wxMenu::Init()
         gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), tearoff);
     }
 
         gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), tearoff);
     }
 

-    m_prevRadio = NULL;
-

     // append the title as the very first entry if we have it
     if ( !m_title.empty() )
     {
         Append(wxGTK_TITLE_ID, m_title);
         AppendSeparator();
     }
     // append the title as the very first entry if we have it
     if ( !m_title.empty() )
     {
         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);
+    // Destroying a menu generates a "hide" signal even if it's not shown
+    // currently, so disconnect it to avoid dummy wxEVT_MENU_CLOSE events
+    // generation.
+    g_signal_handlers_disconnect_by_func(m_menu, (gpointer)menu_hide, this);
+
+    // 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)


@@ -1029,218 +749,136 @@ wxLayoutDirection wxMenu::GetLayoutDirection() const
     return wxWindow::GTKGetLayout(m_owner);
 }
 
     return wxWindow::GTKGetLayout(m_owner);
 }
 

-bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
+wxString wxMenu::GetTitle() const

 {
 {

-    GtkWidget *menuItem;
-
-    // cache some data used later
-    wxString text = mitem->wxMenuItemBase::GetItemLabel();
-    int id = mitem->GetId();
-    bool isstock = wxIsStockID(id);
-    const char *stockid = NULL;
-    if (isstock)
-        stockid = wxGetStockGtkID(mitem->GetId());
-
-    // stock menu items can have an empty label
-    if (text.IsEmpty() && !mitem->IsSeparator())
-    {
-        wxASSERT_MSG(isstock, wxT("A non-stock menu item with an empty label?"));
-        text = wxGetStockLabel(id);
-
-        // need & => _ conversion
-        text = wxMenuItem::GTKProcessMenuItemLabel(text, NULL);
-    }
+    return wxConvertMnemonicsFromGTK(wxMenuBase::GetTitle());
+}

 
 

-    if ( mitem->IsSeparator() )
-    {
-        menuItem = gtk_separator_menu_item_new();
-        m_prevRadio = NULL;
-    }
-    else if ( mitem->GetBitmap().Ok() ||
-                (mitem->GetKind() == wxITEM_NORMAL && isstock) )
+void wxMenu::GtkAppend(wxMenuItem* mitem, int pos)
+{
+    GtkWidget *menuItem;
+    switch (mitem->GetKind())

     {
     {

-        wxBitmap bitmap(mitem->GetBitmap());
-
-        menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );
-
-        GtkWidget *image;
-        if ( !bitmap.Ok() )
-        {
-            // use stock bitmap for this item if available on the assumption
-            // that it never hurts to follow GTK+ conventions more closely
-            image = stockid ? gtk_image_new_from_stock(stockid, GTK_ICON_SIZE_MENU)
-                            : NULL;
-        }
-        else // we have a custom bitmap
-        {
-            wxASSERT_MSG( mitem->GetKind() == wxITEM_NORMAL,
-                            _T("only normal menu items can have bitmaps") );
-
-            if ( bitmap.HasPixbuf() )
-            {
-                image = gtk_image_new_from_pixbuf(bitmap.GetPixbuf());
-            }
-            else
+        case wxITEM_SEPARATOR:
+            menuItem = gtk_separator_menu_item_new();
+            break;
+        case wxITEM_CHECK:
+            menuItem = gtk_check_menu_item_new_with_label("");
+            break;
+        case wxITEM_RADIO:

             {
             {

-                GdkPixmap *gdk_pixmap = bitmap.GetPixmap();
-                GdkBitmap *gdk_bitmap = bitmap.GetMask() ?
-                                            bitmap.GetMask()->GetBitmap() :
-                                            (GdkBitmap*) NULL;
-                image = gtk_image_new_from_pixmap( gdk_pixmap, gdk_bitmap );
-            }
-        }
-
-        if ( image )
-        {
-            gtk_widget_show(image);
-
-            gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(menuItem), image );
-        }
-
-        m_prevRadio = NULL;
-    }
-    else // a normal item
-    {
-        // NB: 'text' variable has "_" instead of "&" after mitem->SetItemLabel()
-        //     so don't use it
+                // See if we need to create a new radio group for this item or
+                // add it to an existing one.
+                wxMenuItem* radioGroupItem = NULL;

 
 

-        switch ( mitem->GetKind() )
-        {
-            case wxITEM_CHECK:
-            {
-                menuItem = gtk_check_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );
-                m_prevRadio = NULL;
-                break;
-            }
+                const size_t numItems = GetMenuItemCount();
+                const size_t n = pos == -1 ? numItems - 1 : size_t(pos);

 
 

-            case wxITEM_RADIO:
-            {
-                GSList *group = NULL;
-                if ( m_prevRadio == NULL )
+                if (n != 0)

                 {
                 {

-                    // start of a new radio group
-                    m_prevRadio = menuItem =
-                        gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV_SYS( text ) );
+                    wxMenuItem* const itemPrev = FindItemByPosition(n - 1);
+                    if ( itemPrev->GetKind() == wxITEM_RADIO )
+                    {
+                        // Appending an item after an existing radio item puts
+                        // it into the same radio group.
+                        radioGroupItem = itemPrev;
+                    }

                 }
                 }

-                else // continue the radio group
+
+                if (radioGroupItem == NULL && n != numItems - 1)

                 {
                 {

-                    group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (m_prevRadio));
-                    m_prevRadio = menuItem =
-                        gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV_SYS( text ) );
+                    wxMenuItem* const itemNext = FindItemByPosition(n + 1);
+                    if ( itemNext->GetKind() == wxITEM_RADIO )
+                    {
+                        // Inserting an item before an existing radio item
+                        // also puts it into the existing radio group.
+                        radioGroupItem = itemNext;
+                    }

                 }
                 }

-                break;
-            }

 
 

-            default:
-                wxFAIL_MSG( _T("unexpected menu item kind") );
-                // fall through
+                GSList* group = NULL;
+                if ( radioGroupItem )
+                {
+                    group = gtk_radio_menu_item_get_group(
+                              GTK_RADIO_MENU_ITEM(radioGroupItem->GetMenuItem())
+                            );
+                }

 
 

-            case wxITEM_NORMAL:
+                menuItem = gtk_radio_menu_item_new_with_label(group, "");
+            }
+            break;
+        default:
+            wxFAIL_MSG("unexpected menu item kind");
+            // fall through
+        case wxITEM_NORMAL:
+            const wxBitmap& bitmap = mitem->GetBitmap();
+            const char* stockid;
+            if (bitmap.IsOk())

             {
             {

-                menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );
-                m_prevRadio = NULL;
-                break;
+                // always use pixbuf, because pixmap mask does not
+                // work with disabled images in some themes
+                GtkWidget* image = gtk_image_new_from_pixbuf(bitmap.GetPixbuf());
+                menuItem = gtk_image_menu_item_new_with_label("");
+                gtk_widget_show(image);
+                gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuItem), image);

             }
             }

-        }
-
-    }
-
-#if wxUSE_ACCEL
-    guint accel_key;
-    GdkModifierType accel_mods;
-    wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*mitem) );
-
-    if (buf[(size_t)0] != '\0')
-    {
-        gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
-        if (accel_key != 0)
-        {
-            gtk_widget_add_accelerator (menuItem,
-                                        "activate",
-                                        m_accel,
-                                        accel_key,
-                                        accel_mods,
-                                        GTK_ACCEL_VISIBLE);
-        }
-    }
-    else if (isstock)
-    {
-        // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
-        if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
-            gtk_widget_add_accelerator( menuItem,
-                                        "activate",
-                                        m_accel,
-                                        accel_key,
-                                        accel_mods,
-                                        GTK_ACCEL_VISIBLE);
+            else if ((stockid = wxGetStockGtkID(mitem->GetId())) != NULL)
+                // use stock bitmap for this item if available on the assumption
+                // that it never hurts to follow GTK+ conventions more closely
+                menuItem = gtk_image_menu_item_new_from_stock(stockid, NULL);
+            else
+                menuItem = gtk_menu_item_new_with_label("");
+            break;

     }
     }

-#endif // wxUSE_ACCEL
+    mitem->SetMenuItem(menuItem);

 
 

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

 
     gtk_widget_show( menuItem );
 
     if ( !mitem->IsSeparator() )
     {
 
     gtk_widget_show( menuItem );
 
     if ( !mitem->IsSeparator() )
     {

-        wxASSERT_MSG( menuItem, wxT("invalid menuitem") );
-
+        mitem->SetGtkLabel();

         g_signal_connect (menuItem, "select",
         g_signal_connect (menuItem, "select",

-                          G_CALLBACK (gtk_menu_hilight_callback), this);
+                          G_CALLBACK(menuitem_select), mitem);

         g_signal_connect (menuItem, "deselect",
         g_signal_connect (menuItem, "deselect",

-                          G_CALLBACK (gtk_menu_nolight_callback), this);
+                          G_CALLBACK(menuitem_deselect), mitem);

 
         if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK )
         {
             gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
 
             gtk_widget_show( mitem->GetSubMenu()->m_menu );
 
         if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK )
         {
             gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
 
             gtk_widget_show( mitem->GetSubMenu()->m_menu );

-
-            // if adding a submenu to a menu already existing in the menu bar, we
-            // must set invoking window to allow processing events from this
-            // submenu
-            if ( m_invokingWindow )
-                wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);

         }
         else
         {
         }
         else
         {

+            g_signal_connect(menuItem, "can_activate_accel",
+                G_CALLBACK(can_activate_accel), this);

             g_signal_connect (menuItem, "activate",
             g_signal_connect (menuItem, "activate",

-                              G_CALLBACK (gtk_menu_clicked_callback),
-                              this);
+                              G_CALLBACK(menuitem_activate),
+                              mitem);

         }
     }
         }
     }

-
-    mitem->SetMenuItem(menuItem);
-
-    if (ms_locked)
-    {
-        // This doesn't even exist!
-        // gtk_widget_lock_accelerators(mitem->GetMenuItem());
-    }
-
-    return true;

 }
 
 wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem)
 {
 }
 
 wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem)
 {

-    if (!GtkAppend(mitem))
-        return NULL;
-
-    return wxMenuBase::DoAppend(mitem);
+    if (wxMenuBase::DoAppend(mitem))
+    {
+        GtkAppend(mitem);
+        return mitem;
+    }
+    return NULL;

 }
 
 wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
 {
 }
 
 wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
 {

-    if ( !wxMenuBase::DoInsert(pos, item) )
-        return NULL;
-
-    // TODO
-    if ( !GtkAppend(item, (int)pos) )
-        return NULL;
-
-    return item;
+    if (wxMenuBase::DoInsert(pos, item))
+    {
+        GtkAppend(item, int(pos));
+        return item;
+    }
+    return NULL;

 }
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 }
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)


@@ -1249,32 +887,25 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
         return NULL;
 
     GtkWidget * const mitem = item->GetMenuItem();
         return NULL;
 
     GtkWidget * const mitem = item->GetMenuItem();

-    if ( m_prevRadio == mitem )
+    if (!gtk_check_version(2,12,0))

     {
     {

-        // deleting an item starts a new radio group (has to as we shouldn't
-        // keep a deleted pointer anyhow)
-        m_prevRadio = NULL;
+        // gtk_menu_item_remove_submenu() is deprecated since 2.12, but
+        // gtk_menu_item_set_submenu() can now be used with NULL submenu now so
+        // just do use it.
+        gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL);

     }
     }

-
-    // TODO: this code doesn't delete the item factory item and this seems
-    //       impossible as of GTK 1.2.6.
-    gtk_widget_destroy( mitem );
-
-    return item;
-}
-
-int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
-{
-    wxMenuItemList::compatibility_iterator node = m_items.GetFirst();
-    while (node)
+    else // GTK+ < 2.12

     {
     {

-        wxMenuItem *item = node->GetData();
-        if (item->GetMenuItem() == menuItem)
-            return item->GetId();
-        node = node->GetNext();
+        // In 2.10 calling gtk_menu_item_set_submenu() with NULL submenu
+        // results in critical GTK+ error messages so use the old function
+        // instead.
+        gtk_menu_item_remove_submenu(GTK_MENU_ITEM(mitem));

     }
 
     }
 

-    return wxNOT_FOUND;
+    gtk_widget_destroy(mitem);
+    item->SetMenuItem(NULL);
+
+    return item;

 }
 
 void wxMenu::Attach(wxMenuBarBase *menubar)
 }
 
 void wxMenu::Attach(wxMenuBarBase *menubar)


@@ -1555,122 +1186,25 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
     return hotkey;
 }
 
     return hotkey;
 }
 

-#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 )
+static void
+wxGetGtkAccel(const wxMenuItem* item, guint* accel_key, GdkModifierType* accel_mods)

 {
 {

-    menu->SetInvokingWindow( win );
-
-    wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
-    while (node)
+    *accel_key = 0;
+    const wxString string = GetGtkHotKey(*item);
+    if (!string.empty())
+        gtk_accelerator_parse(wxGTK_CONV_SYS(string), accel_key, accel_mods);
+    else

     {
     {

-        wxMenuItem *menuitem = node->GetData();
-        if (menuitem->IsSubMenu())
+        GtkStockItem stock_item;
+        const char* stockid = wxGetStockGtkID(item->GetId());
+        if (stockid && gtk_stock_lookup(stockid, &stock_item))

         {
         {

-            SetInvokingWindow( menuitem->GetSubMenu(), win );
+            *accel_key = stock_item.keyval;
+            *accel_mods = stock_item.modifier;

         }
         }

-
-        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
-
-#include <gtk/gtk.h>
+#endif // wxUSE_ACCEL

 
 const char *wxGetStockGtkID(wxWindowID id)
 {
 
 const char *wxGetStockGtkID(wxWindowID id)
 {


@@ -1678,26 +1212,22 @@ const char *wxGetStockGtkID(wxWindowID id)
         case wx:                   \
             return gtk;
 
         case wx:                   \
             return gtk;
 

-    #define STOCKITEM_MISSING(wx)  \
-        case wx:                 \
-            return NULL;
-
-    #if GTK_CHECK_VERSION(2,4,0)
-        #define STOCKITEM_24(wx,gtk) STOCKITEM(wx,gtk)
+    #if GTK_CHECK_VERSION(2,6,0)
+        #define STOCKITEM_26(wx,gtk) STOCKITEM(wx,gtk)

     #else
     #else

-        #define STOCKITEM_24(wx,gtk) STOCKITEM_MISSING(wx)
+        #define STOCKITEM_26(wx,gtk)

     #endif
 
     #endif
 

-    #if GTK_CHECK_VERSION(2,6,0)
-        #define STOCKITEM_26(wx,gtk) STOCKITEM(wx,gtk)
+    #if GTK_CHECK_VERSION(2,8,0)
+        #define STOCKITEM_28(wx,gtk) STOCKITEM(wx,gtk)

     #else
     #else

-        #define STOCKITEM_26(wx,gtk) STOCKITEM_MISSING(wx)
+        #define STOCKITEM_28(wx,gtk)

     #endif
 
     #if GTK_CHECK_VERSION(2,10,0)
         #define STOCKITEM_210(wx,gtk) STOCKITEM(wx,gtk)
     #else
     #endif
 
     #if GTK_CHECK_VERSION(2,10,0)
         #define STOCKITEM_210(wx,gtk) STOCKITEM(wx,gtk)
     #else

-        #define STOCKITEM_210(wx,gtk) STOCKITEM_MISSING(wx)
+        #define STOCKITEM_210(wx,gtk)

     #endif
 
 
     #endif
 
 


@@ -1706,52 +1236,70 @@ const char *wxGetStockGtkID(wxWindowID id)
         STOCKITEM_26(wxID_ABOUT,         GTK_STOCK_ABOUT)
         STOCKITEM(wxID_ADD,              GTK_STOCK_ADD)
         STOCKITEM(wxID_APPLY,            GTK_STOCK_APPLY)
         STOCKITEM_26(wxID_ABOUT,         GTK_STOCK_ABOUT)
         STOCKITEM(wxID_ADD,              GTK_STOCK_ADD)
         STOCKITEM(wxID_APPLY,            GTK_STOCK_APPLY)

+        STOCKITEM(wxID_BACKWARD,         GTK_STOCK_GO_BACK)

         STOCKITEM(wxID_BOLD,             GTK_STOCK_BOLD)
         STOCKITEM(wxID_BOLD,             GTK_STOCK_BOLD)

+        STOCKITEM(wxID_BOTTOM,           GTK_STOCK_GOTO_BOTTOM)

         STOCKITEM(wxID_CANCEL,           GTK_STOCK_CANCEL)
         STOCKITEM(wxID_CANCEL,           GTK_STOCK_CANCEL)

+        STOCKITEM(wxID_CDROM,            GTK_STOCK_CDROM)

         STOCKITEM(wxID_CLEAR,            GTK_STOCK_CLEAR)
         STOCKITEM(wxID_CLOSE,            GTK_STOCK_CLOSE)
         STOCKITEM(wxID_CLEAR,            GTK_STOCK_CLEAR)
         STOCKITEM(wxID_CLOSE,            GTK_STOCK_CLOSE)

+        STOCKITEM(wxID_CONVERT,          GTK_STOCK_CONVERT)

         STOCKITEM(wxID_COPY,             GTK_STOCK_COPY)
         STOCKITEM(wxID_CUT,              GTK_STOCK_CUT)
         STOCKITEM(wxID_DELETE,           GTK_STOCK_DELETE)
         STOCKITEM(wxID_COPY,             GTK_STOCK_COPY)
         STOCKITEM(wxID_CUT,              GTK_STOCK_CUT)
         STOCKITEM(wxID_DELETE,           GTK_STOCK_DELETE)

+        STOCKITEM(wxID_DOWN,             GTK_STOCK_GO_DOWN)

         STOCKITEM_26(wxID_EDIT,          GTK_STOCK_EDIT)
         STOCKITEM_26(wxID_EDIT,          GTK_STOCK_EDIT)

-        STOCKITEM(wxID_FIND,             GTK_STOCK_FIND)
+        STOCKITEM(wxID_EXECUTE,          GTK_STOCK_EXECUTE)
+        STOCKITEM(wxID_EXIT,             GTK_STOCK_QUIT)

         STOCKITEM_26(wxID_FILE,          GTK_STOCK_FILE)
         STOCKITEM_26(wxID_FILE,          GTK_STOCK_FILE)

-        STOCKITEM(wxID_REPLACE,          GTK_STOCK_FIND_AND_REPLACE)
-        STOCKITEM(wxID_BACKWARD,         GTK_STOCK_GO_BACK)
-        STOCKITEM(wxID_DOWN,             GTK_STOCK_GO_DOWN)
+        STOCKITEM(wxID_FIND,             GTK_STOCK_FIND)
+        STOCKITEM(wxID_FIRST,            GTK_STOCK_GOTO_FIRST)
+        STOCKITEM(wxID_FLOPPY,           GTK_STOCK_FLOPPY)

         STOCKITEM(wxID_FORWARD,          GTK_STOCK_GO_FORWARD)
         STOCKITEM(wxID_FORWARD,          GTK_STOCK_GO_FORWARD)

-        STOCKITEM(wxID_UP,               GTK_STOCK_GO_UP)
+        STOCKITEM(wxID_HARDDISK,         GTK_STOCK_HARDDISK)

         STOCKITEM(wxID_HELP,             GTK_STOCK_HELP)
         STOCKITEM(wxID_HOME,             GTK_STOCK_HOME)
         STOCKITEM(wxID_HELP,             GTK_STOCK_HELP)
         STOCKITEM(wxID_HOME,             GTK_STOCK_HOME)

-        STOCKITEM_24(wxID_INDENT,        GTK_STOCK_INDENT)
+        STOCKITEM(wxID_INDENT,           GTK_STOCK_INDENT)

         STOCKITEM(wxID_INDEX,            GTK_STOCK_INDEX)
         STOCKITEM(wxID_INDEX,            GTK_STOCK_INDEX)

+        STOCKITEM_28(wxID_INFO,           GTK_STOCK_INFO)

         STOCKITEM(wxID_ITALIC,           GTK_STOCK_ITALIC)
         STOCKITEM(wxID_ITALIC,           GTK_STOCK_ITALIC)

+        STOCKITEM(wxID_JUMP_TO,          GTK_STOCK_JUMP_TO)

         STOCKITEM(wxID_JUSTIFY_CENTER,   GTK_STOCK_JUSTIFY_CENTER)
         STOCKITEM(wxID_JUSTIFY_FILL,     GTK_STOCK_JUSTIFY_FILL)
         STOCKITEM(wxID_JUSTIFY_LEFT,     GTK_STOCK_JUSTIFY_LEFT)
         STOCKITEM(wxID_JUSTIFY_RIGHT,    GTK_STOCK_JUSTIFY_RIGHT)
         STOCKITEM(wxID_JUSTIFY_CENTER,   GTK_STOCK_JUSTIFY_CENTER)
         STOCKITEM(wxID_JUSTIFY_FILL,     GTK_STOCK_JUSTIFY_FILL)
         STOCKITEM(wxID_JUSTIFY_LEFT,     GTK_STOCK_JUSTIFY_LEFT)
         STOCKITEM(wxID_JUSTIFY_RIGHT,    GTK_STOCK_JUSTIFY_RIGHT)

+        STOCKITEM(wxID_LAST,             GTK_STOCK_GOTO_LAST)
+        STOCKITEM(wxID_NETWORK,          GTK_STOCK_NETWORK)

         STOCKITEM(wxID_NEW,              GTK_STOCK_NEW)
         STOCKITEM(wxID_NO,               GTK_STOCK_NO)
         STOCKITEM(wxID_OK,               GTK_STOCK_OK)
         STOCKITEM(wxID_OPEN,             GTK_STOCK_OPEN)
         STOCKITEM(wxID_PASTE,            GTK_STOCK_PASTE)
         STOCKITEM(wxID_PREFERENCES,      GTK_STOCK_PREFERENCES)
         STOCKITEM(wxID_NEW,              GTK_STOCK_NEW)
         STOCKITEM(wxID_NO,               GTK_STOCK_NO)
         STOCKITEM(wxID_OK,               GTK_STOCK_OK)
         STOCKITEM(wxID_OPEN,             GTK_STOCK_OPEN)
         STOCKITEM(wxID_PASTE,            GTK_STOCK_PASTE)
         STOCKITEM(wxID_PREFERENCES,      GTK_STOCK_PREFERENCES)

-        STOCKITEM(wxID_PRINT,            GTK_STOCK_PRINT)

         STOCKITEM(wxID_PREVIEW,          GTK_STOCK_PRINT_PREVIEW)
         STOCKITEM(wxID_PREVIEW,          GTK_STOCK_PRINT_PREVIEW)

+        STOCKITEM(wxID_PRINT,            GTK_STOCK_PRINT)

         STOCKITEM(wxID_PROPERTIES,       GTK_STOCK_PROPERTIES)
         STOCKITEM(wxID_PROPERTIES,       GTK_STOCK_PROPERTIES)

-        STOCKITEM(wxID_EXIT,             GTK_STOCK_QUIT)

         STOCKITEM(wxID_REDO,             GTK_STOCK_REDO)
         STOCKITEM(wxID_REFRESH,          GTK_STOCK_REFRESH)
         STOCKITEM(wxID_REMOVE,           GTK_STOCK_REMOVE)
         STOCKITEM(wxID_REDO,             GTK_STOCK_REDO)
         STOCKITEM(wxID_REFRESH,          GTK_STOCK_REFRESH)
         STOCKITEM(wxID_REMOVE,           GTK_STOCK_REMOVE)

+        STOCKITEM(wxID_REPLACE,          GTK_STOCK_FIND_AND_REPLACE)

         STOCKITEM(wxID_REVERT_TO_SAVED,  GTK_STOCK_REVERT_TO_SAVED)
         STOCKITEM(wxID_SAVE,             GTK_STOCK_SAVE)
         STOCKITEM(wxID_SAVEAS,           GTK_STOCK_SAVE_AS)
         STOCKITEM_210(wxID_SELECTALL,    GTK_STOCK_SELECT_ALL)
         STOCKITEM(wxID_REVERT_TO_SAVED,  GTK_STOCK_REVERT_TO_SAVED)
         STOCKITEM(wxID_SAVE,             GTK_STOCK_SAVE)
         STOCKITEM(wxID_SAVEAS,           GTK_STOCK_SAVE_AS)
         STOCKITEM_210(wxID_SELECTALL,    GTK_STOCK_SELECT_ALL)

+        STOCKITEM(wxID_SELECT_COLOR,     GTK_STOCK_SELECT_COLOR)
+        STOCKITEM(wxID_SELECT_FONT,      GTK_STOCK_SELECT_FONT)
+        STOCKITEM(wxID_SORT_ASCENDING,   GTK_STOCK_SORT_ASCENDING)
+        STOCKITEM(wxID_SORT_DESCENDING,  GTK_STOCK_SORT_DESCENDING)
+        STOCKITEM(wxID_SPELL_CHECK,      GTK_STOCK_SPELL_CHECK)

         STOCKITEM(wxID_STOP,             GTK_STOCK_STOP)
         STOCKITEM(wxID_STOP,             GTK_STOCK_STOP)

+        STOCKITEM(wxID_STRIKETHROUGH,    GTK_STOCK_STRIKETHROUGH)
+        STOCKITEM(wxID_TOP,              GTK_STOCK_GOTO_TOP)

         STOCKITEM(wxID_UNDELETE,         GTK_STOCK_UNDELETE)
         STOCKITEM(wxID_UNDERLINE,        GTK_STOCK_UNDERLINE)
         STOCKITEM(wxID_UNDO,             GTK_STOCK_UNDO)
         STOCKITEM(wxID_UNDELETE,         GTK_STOCK_UNDELETE)
         STOCKITEM(wxID_UNDERLINE,        GTK_STOCK_UNDERLINE)
         STOCKITEM(wxID_UNDO,             GTK_STOCK_UNDO)

-        STOCKITEM_24(wxID_UNINDENT,      GTK_STOCK_UNINDENT)
+        STOCKITEM(wxID_UNINDENT,         GTK_STOCK_UNINDENT)
+        STOCKITEM(wxID_UP,               GTK_STOCK_GO_UP)

         STOCKITEM(wxID_YES,              GTK_STOCK_YES)
         STOCKITEM(wxID_ZOOM_100,         GTK_STOCK_ZOOM_100)
         STOCKITEM(wxID_ZOOM_FIT,         GTK_STOCK_ZOOM_FIT)
         STOCKITEM(wxID_YES,              GTK_STOCK_YES)
         STOCKITEM(wxID_ZOOM_100,         GTK_STOCK_ZOOM_100)
         STOCKITEM(wxID_ZOOM_FIT,         GTK_STOCK_ZOOM_FIT)


@@ -1759,7 +1307,6 @@ const char *wxGetStockGtkID(wxWindowID id)
         STOCKITEM(wxID_ZOOM_OUT,         GTK_STOCK_ZOOM_OUT)
 
         default:
         STOCKITEM(wxID_ZOOM_OUT,         GTK_STOCK_ZOOM_OUT)
 
         default:

-            wxFAIL_MSG( _T("invalid stock item ID") );

             break;
     };
 
             break;
     };
 


@@ -1768,27 +1315,4 @@ const char *wxGetStockGtkID(wxWindowID id)
     return NULL;
 }
 
     return NULL;
 }
 

-#if wxUSE_ACCEL
-static
-bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key)
-{
-    if (!id)
-        return false;
-
-    GtkStockItem stock_item;
-    if (gtk_stock_lookup (id, &stock_item))
-    {
-        if (key) *key = stock_item.keyval;
-        if (mod) *mod = stock_item.modifier;
-
-        // some GTK stock items have zero values for the keyval;
-        // it means that they do not have an accelerator...
-        if (stock_item.keyval)
-            return true;
-    }
-
-    return false;
-}
-#endif // wxUSE_ACCEL
-

 #endif // wxUSE_MENUS
 #endif // wxUSE_MENUS