native apple event support for osx cocoa

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 4f203d694dc45d2db155c4146626195a726b3834..299de20d547afb18c67a87254faa856881d14696 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -33,12 +33,11 @@ static const int wxGTK_TITLE_ID = -3;
 // forward declare it as it's used by wxMenuBar too when using Hildon
 extern "C"
 {
 // 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
 
 static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
 #endif
 
 static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)


@@ -95,6 +94,8 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
     ApplyWidgetStyle();
 #endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
 
     ApplyWidgetStyle();
 #endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
 

+    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]);
 }


@@ -264,7 +265,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
         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


@@ -459,21 +460,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;


@@ -497,33 +490,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);

 }
 }
 
 }
 }
 


@@ -532,16 +500,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 );
+    wxMenu* menu = item->GetMenu();
+    wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item->GetId());

     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();


@@ -558,15 +523,12 @@ 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;
 
         return;
 

+    wxMenu* menu = item->GetMenu();

     wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
     event.SetEventObject( menu );
 
     wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
     event.SetEventObject( menu );
 


@@ -604,9 +566,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,


@@ -616,254 +579,62 @@ 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(m_menuItem)->child);
+    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() )
-    {
-        // nothing
-        return NULL;
-    }
-
-    // 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);
+    if (m_kind == wxITEM_NORMAL)
+        m_bitmap = bitmap;
+    else
+        wxFAIL_MSG("only normal menu items can have bitmaps");

 }
 
 }
 

-#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") );


@@ -924,6 +695,16 @@ static void menu_hide(GtkWidget*, wxMenu* menu)
 }
 }
 
 }
 }
 

+// "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;
+}
+}
+

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


@@ -991,165 +772,61 @@ wxLayoutDirection wxMenu::GetLayoutDirection() const
 bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
 {
     GtkWidget *menuItem;
 bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
 {
     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);
-    }
-
-    if ( mitem->IsSeparator() )
-    {
-        menuItem = gtk_separator_menu_item_new();
-        m_prevRadio = NULL;
-    }
-    else if ( mitem->GetBitmap().Ok() ||
-                (mitem->GetKind() == wxITEM_NORMAL && isstock) )
-    {
-        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
-            {
-                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
+    GtkWidget* prevRadio = m_prevRadio;
+    m_prevRadio = NULL;
+    switch (mitem->GetKind())

     {
     {

-        // NB: 'text' variable has "_" instead of "&" after mitem->SetItemLabel()
-        //     so don't use it
-
-        switch ( mitem->GetKind() )
-        {
-            case wxITEM_CHECK:
-            {
-                menuItem = gtk_check_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );
-                m_prevRadio = NULL;
-                break;
-            }
-
-            case wxITEM_RADIO:
+        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:

             {
             {

-                GSList *group = NULL;
-                if ( m_prevRadio == NULL )
-                {
-                    // start of a new radio group
-                    m_prevRadio = menuItem =
-                        gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV_SYS( text ) );
-                }
-                else // continue the radio group
-                {
-                    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 ) );
-                }
-                break;
+                GSList* group = NULL;
+                if (prevRadio)
+                    group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(prevRadio));
+                menuItem = gtk_radio_menu_item_new_with_label(group, "");
+                m_prevRadio = menuItem;

             }
             }

-
-            default:
-                wxFAIL_MSG( _T("unexpected menu item kind") );
-                // fall through
-
-            case wxITEM_NORMAL:
+            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 )
         {
 
         if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK )
         {


@@ -1165,20 +842,14 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
         }
         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;
 }
 
     return true;
 }
 


@@ -1222,20 +893,6 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
     return item;
 }
 
     return item;
 }
 

-int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
-{
-    wxMenuItemList::compatibility_iterator node = m_items.GetFirst();
-    while (node)
-    {
-        wxMenuItem *item = node->GetData();
-        if (item->GetMenuItem() == menuItem)
-            return item->GetId();
-        node = node->GetNext();
-    }
-
-    return wxNOT_FOUND;
-}
-

 void wxMenu::Attach(wxMenuBarBase *menubar)
 {
     wxMenuBase::Attach(menubar);
 void wxMenu::Attach(wxMenuBarBase *menubar)
 {
     wxMenuBase::Attach(menubar);


@@ -1514,6 +1171,24 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
     return hotkey;
 }
 
     return hotkey;
 }
 

+static void
+wxGetGtkAccel(const wxMenuItem* item, guint* accel_key, GdkModifierType* accel_mods)
+{
+    *accel_key = 0;
+    const wxString string = GetGtkHotKey(*item);
+    if (!string.empty())
+        gtk_accelerator_parse(wxGTK_CONV_SYS(string), accel_key, accel_mods);
+    else
+    {
+        GtkStockItem stock_item;
+        const char* stockid = wxGetStockGtkID(item->GetId());
+        if (stockid && gtk_stock_lookup(stockid, &stock_item))
+        {
+            *accel_key = stock_item.keyval;
+            *accel_mods = stock_item.modifier;
+        }
+    }
+}

 #endif // wxUSE_ACCEL
 
 const char *wxGetStockGtkID(wxWindowID id)
 #endif // wxUSE_ACCEL
 
 const char *wxGetStockGtkID(wxWindowID id)


@@ -1522,26 +1197,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
 
 


@@ -1550,52 +1221,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)


@@ -1603,7 +1292,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;
     };
 


@@ -1612,27 +1300,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