X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9739d9ee8090965862ba623b09a8fba731dc3d5c..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/gtk/menu.cpp?ds=sidebyside diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 750593b533..acd8d29e73 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -1,336 +1,359 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.cpp -// Purpose: +// Name: src/gtk/menu.cpp +// Purpose: implementation of wxMenuBar and wxMenu classes for wxGTK // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "menu.h" -#pragma implementation "menuitem.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if wxUSE_MENUS -#include "wx/log.h" -#include "wx/intl.h" -#include "wx/app.h" #include "wx/menu.h" -#if wxUSE_ACCEL - #include "wx/accel.h" -#endif // wxUSE_ACCEL +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/frame.h" + #include "wx/bitmap.h" + #include "wx/app.h" +#endif -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include "wx/accel.h" +#include "wx/stockitem.h" -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +#include +#include "wx/gtk/private.h" +#include "wx/gtk/private/gtk2-compat.h" +#include "wx/gtk/private/mnemonics.h" + +// we use normal item but with a special id for the menu title +static const int wxGTK_TITLE_ID = -3; -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +// forward declare it as it's used by wxMenuBar too when using Hildon +extern "C" +{ + static void menuitem_activate(GtkWidget*, wxMenuItem* item); +} -#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL -static wxString GetHotKey( const wxMenuItem& item ); +#if wxUSE_ACCEL +static void wxGetGtkAccel(const wxMenuItem*, guint*, GdkModifierType*); #endif +static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event) +{ + event.SetEventObject( menu ); + + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->SafelyProcessEvent(event)) + return; + + wxWindow *win = menu->GetWindow(); + wxCHECK_RET( win, "event for a menu without associated window?" ); + + win->HandleWindowEvent( event ); +} + //----------------------------------------------------------------------------- // wxMenuBar //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow) - -wxMenuBar::wxMenuBar( long style ) +wxMenuBar::~wxMenuBar() { - /* the parent window is known after wxFrame::SetMenu() */ - m_needParent = FALSE; - m_style = style; - m_invokingWindow = (wxWindow*) NULL; + if (m_widget) + { + // Work around a probable bug in Ubuntu 12.04 which causes a warning if + // gtk_widget_destroy() is called on a wxMenuBar attached to a frame + GtkWidget* widget = m_widget; + m_widget = NULL; + g_object_unref(widget); + } +} - if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) || - !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") )) +void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style) +{ +#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(); +#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 + if (!PreCreation( NULL, wxDefaultPosition, wxDefaultSize ) || + !CreateBase( NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") )) { wxFAIL_MSG( wxT("wxMenuBar creation failed") ); return; } - m_menus.DeleteContents( TRUE ); - - /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */ -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) - m_accel = gtk_accel_group_new(); - m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "
", m_accel ); - m_menubar = gtk_item_factory_get_widget( m_factory, "
" ); -#else m_menubar = gtk_menu_bar_new(); -#endif if (style & wxMB_DOCKABLE) { m_widget = gtk_handle_box_new(); - gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_menubar) ); - gtk_widget_show( GTK_WIDGET(m_menubar) ); + gtk_container_add(GTK_CONTAINER(m_widget), m_menubar); + gtk_widget_show(m_menubar); } else { - m_widget = GTK_WIDGET(m_menubar); + m_widget = m_menubar; } PostCreation(); -} -wxMenuBar::wxMenuBar() -{ - /* the parent window is known after wxFrame::SetMenu() */ - m_needParent = FALSE; - m_style = 0; - m_invokingWindow = (wxWindow*) NULL; + GTKApplyWidgetStyle(); +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 - if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) || - !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("menubar") )) - { - wxFAIL_MSG( wxT("wxMenuBar creation failed") ); - return; - } + g_object_ref_sink(m_widget); - m_menus.DeleteContents( TRUE ); - - /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */ -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) - m_accel = gtk_accel_group_new(); - m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "
", m_accel ); - m_menubar = gtk_item_factory_get_widget( m_factory, "
" ); -#else - m_menubar = gtk_menu_bar_new(); -#endif - - m_widget = GTK_WIDGET(m_menubar); + for (size_t i = 0; i < n; ++i ) + Append(menus[i], titles[i]); +} - PostCreation(); +wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style) +{ + Init(n, menus, titles, style); } -wxMenuBar::~wxMenuBar() +wxMenuBar::wxMenuBar(long style) { -// gtk_object_unref( GTK_OBJECT(m_factory) ); why not ? + Init(0, NULL, NULL, style); } -static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win ) +wxMenuBar::wxMenuBar() { - menu->SetInvokingWindow( (wxWindow*) NULL ); + Init(0, NULL, NULL, 0); +} -#if (GTK_MINOR_VERSION > 0) - wxWindow *top_frame = win; - while (top_frame->GetParent() && !(top_frame->IsTopLevel())) - top_frame = top_frame->GetParent(); +// 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 +{ - /* support for native hot keys */ - gtk_accel_group_detach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) ); -#endif +void +DetachFromFrame(wxMenu* menu, wxFrame* frame) +{ + // support for native hot keys + 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(gtk_accel_groups_from_object(G_OBJECT(tlw)), menu->m_accel)) + gtk_window_remove_accel_group(tlw, menu->m_accel); + } - wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); + 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(); } } -static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) +void +AttachToFrame(wxMenu* menu, wxFrame* frame) { - menu->SetInvokingWindow( win ); - -#if (GTK_MINOR_VERSION > 0) - wxWindow *top_frame = win; - while (top_frame->GetParent() && !(top_frame->IsTopLevel())) - top_frame = top_frame->GetParent(); - - /* support for native hot keys */ - gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) ); -#endif + // support for native hot keys + if (menu->m_accel) + { + GtkWindow * const tlw = GTK_WINDOW(wxGetTopLevelParent(frame)->m_widget); + if (!g_slist_find(gtk_accel_groups_from_object(G_OBJECT(tlw)), menu->m_accel)) + gtk_window_add_accel_group(tlw, menu->m_accel); + } - wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); + 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(); } } -void wxMenuBar::SetInvokingWindow( wxWindow *win ) +} // anonymous namespace + +void wxMenuBar::SetLayoutDirection(wxLayoutDirection dir) { - m_invokingWindow = win; -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) - wxWindow *top_frame = win; - while (top_frame->GetParent() && !(top_frame->IsTopLevel())) - top_frame = top_frame->GetParent(); + if ( dir == wxLayout_Default ) + { + const wxWindow *const frame = GetFrame(); + if ( frame ) + { + // inherit layout from frame. + dir = frame->GetLayoutDirection(); + } + else // use global layout + { + dir = wxTheApp->GetLayoutDirection(); + } + } - /* support for native key accelerators indicated by underscroes */ - gtk_accel_group_attach( m_accel, GTK_OBJECT(top_frame->m_widget) ); -#endif + if ( dir == wxLayout_Default ) + return; + + GTKSetLayout(m_menubar, dir); + + // also set the layout of all menus we already have (new ones will inherit + // the current layout) + for ( wxMenuList::compatibility_iterator node = m_menus.GetFirst(); + node; + node = node->GetNext() ) + { + wxMenu *const menu = node->GetData(); + menu->SetLayoutDirection(dir); + } +} + +wxLayoutDirection wxMenuBar::GetLayoutDirection() const +{ + return GTKGetLayout(m_menubar); +} + +void wxMenuBar::Attach(wxFrame *frame) +{ + wxMenuBarBase::Attach(frame); - wxMenuList::Node *node = m_menus.GetFirst(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node) { wxMenu *menu = node->GetData(); - wxMenubarSetInvokingWindow( menu, win ); + AttachToFrame( menu, frame ); node = node->GetNext(); } + + SetLayoutDirection(wxLayout_Default); } -void wxMenuBar::UnsetInvokingWindow( wxWindow *win ) +void wxMenuBar::Detach() { - m_invokingWindow = (wxWindow*) NULL; -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) - wxWindow *top_frame = win; - while (top_frame->GetParent() && !(top_frame->IsTopLevel())) - top_frame = top_frame->GetParent(); - - /* support for native key accelerators indicated by underscroes */ - gtk_accel_group_detach( m_accel, GTK_OBJECT(top_frame->m_widget) ); -#endif - - wxMenuList::Node *node = m_menus.GetFirst(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node) { wxMenu *menu = node->GetData(); - wxMenubarUnsetInvokingWindow( menu, win ); + DetachFromFrame( menu, m_menuBarFrame ); node = node->GetNext(); } + + wxMenuBarBase::Detach(); } bool wxMenuBar::Append( wxMenu *menu, const wxString &title ) { - m_menus.Append( menu ); + if (wxMenuBarBase::Append(menu, title)) + { + GtkAppend(menu, title); + return true; + } + return false; +} - const wxChar *pc; +void wxMenuBar::GtkAppend(wxMenu* menu, const wxString& title, int pos) +{ + menu->SetLayoutDirection(GetLayoutDirection()); - /* GTK 1.2 wants to have "_" instead of "&" for accelerators */ - wxString str; - for ( pc = title; *pc != wxT('\0'); pc++ ) +#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 (*pc == wxT('&')) - { -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) - str << wxT('_'); - } - else if (*pc == wxT('/')) + wxMenuItem * const item = menu->FindItemByPosition(0); + + // remove both mnemonics and accelerator: neither is useful under Maemo + const wxString str(wxStripMenuCodes(item->GetItemLabel())); + + if ( item->IsSubMenu() ) { - str << wxT('\\'); -#endif + GtkAppend(item->GetSubMenu(), str, pos); + return; } - else - { -#if __WXGTK12__ - if ( *pc == wxT('_') ) - { - // underscores must be doubled to prevent them from being - // interpreted as accelerator character prefix by GTK - str << *pc; - } -#endif // GTK+ 1.2 - str << *pc; - } - } + menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) ); - /* this doesn't have much effect right now */ - menu->SetTitle( str ); + g_signal_connect(menu->m_owner, "activate", + G_CALLBACK(menuitem_activate), item); + item->SetMenuItem(menu->m_owner); + } + else +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 + { + const wxString str(wxConvertMnemonicsToGTK(title)); - /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */ -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) - - /* local buffer in multibyte form */ - wxString buf; - buf << wxT('/') << str.c_str(); - - char *cbuf = new char[buf.Length()+1]; - strcpy(cbuf, buf.mbc_str()); - - GtkItemFactoryEntry entry; - entry.path = (gchar *)cbuf; // const_cast - entry.accelerator = (gchar*) NULL; - entry.callback = (GtkItemFactoryCallback) NULL; - entry.callback_action = 0; - entry.item_type = ""; - - gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ - /* in order to get the pointer to the item we need the item text _without_ underscores */ - wxString tmp = wxT("
/"); - for ( pc = str; *pc != wxT('\0'); pc++ ) - { - // contrary to the common sense, we must throw out _all_ underscores, - // (i.e. "Hello__World" => "HelloWorld" and not "Hello_World" as we - // might naively think). IMHO it's a bug in GTK+ (VZ) - while (*pc == wxT('_')) - pc++; - tmp << *pc; - } - menu->m_owner = gtk_item_factory_get_item( m_factory, tmp.mb_str() ); - gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu ); - delete [] cbuf; -#else + // This doesn't have much effect right now. + menu->SetTitle( str ); - menu->m_owner = gtk_menu_item_new_with_label( str.mb_str() ); - gtk_widget_show( menu->m_owner ); - gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu ); + // The "m_owner" is the "menu item" + menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) ); - gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner ); + gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu ); + } -#endif + gtk_widget_show( menu->m_owner ); - // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables - // adding menu later on. - if (m_invokingWindow) - wxMenubarSetInvokingWindow( menu, m_invokingWindow ); + if (pos == -1) + gtk_menu_shell_append( GTK_MENU_SHELL(m_menubar), menu->m_owner ); + else + gtk_menu_shell_insert( GTK_MENU_SHELL(m_menubar), menu->m_owner, pos ); - return TRUE; + if ( m_menuBarFrame ) + AttachToFrame( menu, m_menuBarFrame ); } bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { - if ( !wxMenuBarBase::Insert(pos, menu, title) ) - return FALSE; - - wxFAIL_MSG(wxT("TODO")); - - return FALSE; + 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) { - if ( !wxMenuBarBase::Replace(pos, menu, title) ) - return FALSE; - - wxFAIL_MSG(wxT("TODO")); + // remove the old item and insert a new one + wxMenu *menuOld = Remove(pos); + if ( menuOld && !Insert(pos, menu, title) ) + { + return NULL; + } - return NULL; + // either Insert() succeeded or Remove() failed and menuOld is NULL + return menuOld; } wxMenu *wxMenuBar::Remove(size_t pos) { - if ( !wxMenuBarBase::Remove(pos) ) - return FALSE; + wxMenu *menu = wxMenuBarBase::Remove(pos); + if ( !menu ) + return NULL; - wxFAIL_MSG(wxT("TODO")); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu->m_owner), NULL); + gtk_container_remove(GTK_CONTAINER(m_menubar), menu->m_owner); - return NULL; + gtk_widget_destroy( menu->m_owner ); + menu->m_owner = NULL; + + DetachFromFrame( menu, m_menuBarFrame ); + + return menu; } static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString ) { - if (menu->GetTitle() == menuString) + if (wxMenuItem::GetLabelText(menu->GetTitle()) == wxMenuItem::GetLabelText(menuString)) { int res = menu->FindItem( itemString ); if (res != wxNOT_FOUND) return res; } - wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { wxMenuItem *item = node->GetData(); @@ -345,7 +368,7 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const { - wxMenuList::Node *node = m_menus.GetFirst(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node) { wxMenu *menu = node->GetData(); @@ -363,7 +386,7 @@ static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id) { wxMenuItem* result = menu->FindChildItem(id); - wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while ( node && result == NULL ) { wxMenuItem *item = node->GetData(); @@ -380,7 +403,7 @@ static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id) wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const { wxMenuItem* result = 0; - wxMenuList::Node *node = m_menus.GetFirst(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node && result == 0) { wxMenu *menu = node->GetData(); @@ -390,7 +413,7 @@ wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const if ( menuForItem ) { - *menuForItem = result ? result->GetMenu() : (wxMenu *)NULL; + *menuForItem = result ? result->GetMenu() : NULL; } return result; @@ -398,7 +421,7 @@ wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const void wxMenuBar::EnableTop( size_t pos, bool flag ) { - wxMenuList::Node *node = m_menus.Item( pos ); + wxMenuList::compatibility_iterator node = m_menus.Item( pos ); wxCHECK_RET( node, wxT("menu not found") ); @@ -408,9 +431,18 @@ void wxMenuBar::EnableTop( size_t pos, bool flag ) gtk_widget_set_sensitive( menu->m_owner, flag ); } -wxString wxMenuBar::GetLabelTop( size_t pos ) const +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 ) != 0; +} + +wxString wxMenuBar::GetMenuLabel( size_t pos ) const { - wxMenuList::Node *node = m_menus.Item( pos ); + wxMenuList::compatibility_iterator node = m_menus.Item( pos ); wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") ); @@ -419,270 +451,204 @@ wxString wxMenuBar::GetLabelTop( size_t pos ) const return menu->GetTitle(); } -void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) +void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label ) { - wxMenuList::Node *node = m_menus.Item( pos ); + wxMenuList::compatibility_iterator node = m_menus.Item( pos ); wxCHECK_RET( node, wxT("menu not found") ); wxMenu* menu = node->GetData(); - menu->SetTitle( label ); + const wxString str(wxConvertMnemonicsToGTK(label)); + + menu->SetTitle( str ); + + if (menu->m_owner) + gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menu->m_owner))), wxGTK_CONV(str)); } //----------------------------------------------------------------------------- // "activate" //----------------------------------------------------------------------------- -static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) +extern "C" { +static void menuitem_activate(GtkWidget*, wxMenuItem* item) { - if (g_isIdle) wxapp_install_idle_handler(); - - int id = menu->FindMenuIdByMenuItem(widget); - - /* should find it for normal (not popup) menu */ - wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) ); - - if (!menu->IsEnabled(id)) + if (!item->IsEnabled()) return; - wxMenuItem* item = menu->FindChildItem( id ); - wxCHECK_RET( item, wxT("error in menu item callback") ); + int id = item->GetId(); + if (id == wxGTK_TITLE_ID) + { + // ignore events from the menu title + return; + } if (item->IsCheckable()) { - bool isReallyChecked = item->IsChecked(); - if ( item->wxMenuItemBase::IsChecked() == isReallyChecked ) + bool isReallyChecked = item->IsChecked(), + isInternallyChecked = item->wxMenuItemBase::IsChecked(); + + // ensure that the internal state is always consistent with what is + // shown on the screen + item->wxMenuItemBase::Check(isReallyChecked); + + // we must not report the events for the radio button going up nor the + // events resulting from the calls to wxMenuItem::Check() + if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) || + (isInternallyChecked == isReallyChecked) ) { - /* the menu item has been checked by calling wxMenuItem->Check() */ return; } - else - { - /* the user pressed on the menu item -> report and make consistent - * again */ - item->wxMenuItemBase::Check(isReallyChecked); - } } - wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id ); - event.SetEventObject( menu ); - event.SetInt(id ); - -#if wxUSE_MENU_CALLBACK - if (menu->GetCallback()) - { - (void) (*(menu->GetCallback())) (*menu, event); - return; - } -#endif // wxUSE_MENU_CALLBACK - - if (menu->GetEventHandler()->ProcessEvent(event)) - return; - - wxWindow *win = menu->GetInvokingWindow(); - if (win) - win->GetEventHandler()->ProcessEvent( event ); + wxMenu* menu = item->GetMenu(); + menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); +} } //----------------------------------------------------------------------------- // "select" //----------------------------------------------------------------------------- -static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) +extern "C" { +static void menuitem_select(GtkWidget*, wxMenuItem* item) { - if (g_isIdle) wxapp_install_idle_handler(); - - int id = menu->FindMenuIdByMenuItem(widget); - - wxASSERT( id != -1 ); // should find it! - - if (!menu->IsEnabled(id)) + if (!item->IsEnabled()) return; - wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id ); - event.SetEventObject( menu ); - - if (menu->GetEventHandler()->ProcessEvent(event)) - return; - - wxWindow *win = menu->GetInvokingWindow(); - if (win) win->GetEventHandler()->ProcessEvent( event ); + wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item->GetId()); + DoCommonMenuCallbackCode(item->GetMenu(), event); +} } //----------------------------------------------------------------------------- // "deselect" //----------------------------------------------------------------------------- -static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) +extern "C" { +static void menuitem_deselect(GtkWidget*, wxMenuItem* item) { - if (g_isIdle) wxapp_install_idle_handler(); - - 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 ); - event.SetEventObject( menu ); - - if (menu->GetEventHandler()->ProcessEvent(event)) - return; - - wxWindow *win = menu->GetInvokingWindow(); - if (win) - win->GetEventHandler()->ProcessEvent( event ); + DoCommonMenuCallbackCode(item->GetMenu(), event); +} } //----------------------------------------------------------------------------- // wxMenuItem //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase) - wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu, int id, const wxString& name, const wxString& help, - bool isCheckable, + wxItemKind kind, wxMenu *subMenu) { - return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu); + return new wxMenuItem(parentMenu, id, name, help, kind, subMenu); } wxMenuItem::wxMenuItem(wxMenu *parentMenu, int id, const wxString& text, const wxString& help, - bool isCheckable, + wxItemKind kind, wxMenu *subMenu) + : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu) { - m_id = id; - m_isCheckable = isCheckable; - m_isChecked = FALSE; - m_isEnabled = TRUE; - m_subMenu = subMenu; - m_parentMenu = parentMenu; - m_help = help; - - m_menuItem = (GtkWidget *) NULL; + m_menuItem = NULL; +} - DoSetText(text); +#if WXWIN_COMPATIBILITY_2_8 +wxMenuItem::wxMenuItem(wxMenu *parentMenu, + int id, + const wxString& text, + const wxString& help, + bool isCheckable, + wxMenu *subMenu) + : wxMenuItemBase(parentMenu, id, text, help, + isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu) +{ + m_menuItem = NULL; } +#endif wxMenuItem::~wxMenuItem() { // don't delete menu items, the menus take care of that } -// return the menu item text without any menu accels -wxString wxMenuItem::GetLabel() const +void wxMenuItem::SetItemLabel( const wxString& str ) { - wxString label; -#if (GTK_MINOR_VERSION > 0) - for ( const wxChar *pc = m_text.c_str(); *pc; pc++ ) +#if wxUSE_ACCEL + if (m_menuItem) { - if ( *pc == wxT('_') ) + // remove old accelerator + guint accel_key; + GdkModifierType accel_mods; + wxGetGtkAccel(this, &accel_key, &accel_mods); + if (accel_key) { - // this is the escape character for GTK+ - skip it - continue; + gtk_widget_remove_accelerator( + m_menuItem, m_parentMenu->m_accel, accel_key, accel_mods); } - - label += *pc; } -#else // GTK+ 1.0 - label = m_text; -#endif // GTK+ 1.2/1.0 - - return label; -} - -void wxMenuItem::SetText( const wxString& str ) -{ - DoSetText(str); - +#endif // wxUSE_ACCEL + wxMenuItemBase::SetItemLabel(str); if (m_menuItem) - { - GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child ); - - /* set new text */ - gtk_label_set( label, m_text.mb_str()); - - /* reparse key accel */ - (void)gtk_label_parse_uline (GTK_LABEL(label), m_text.mb_str() ); - gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) ); - } + SetGtkLabel(); } -// it's valid for this function to be called even if m_menuItem == NULL -void wxMenuItem::DoSetText( const wxString& str ) +void wxMenuItem::SetGtkLabel() { - /* '\t' is the deliminator indicating a hot key */ - m_text.Empty(); - const wxChar *pc = str; - for (; (*pc != wxT('\0')) && (*pc != wxT('\t')); pc++ ) - { - if (*pc == wxT('&')) - { -#if (GTK_MINOR_VERSION > 0) - m_text << wxT('_'); - } - else if ( *pc == wxT('_') ) // escape underscores - { - m_text << wxT("__"); - } - else if (*pc == wxT('/')) /* we have to filter out slashes ... */ - { - m_text << wxT('\\'); /* ... and replace them with back slashes */ -#endif - } - else - m_text << *pc; - } - - /* only GTK 1.2 knows about hot keys */ - m_hotKey = wxT(""); -#if (GTK_MINOR_VERSION > 0) - if(*pc == wxT('\t')) + 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) { - pc++; - m_hotKey = pc; + gtk_widget_add_accelerator( + m_menuItem, "activate", m_parentMenu->m_accel, + accel_key, accel_mods, GTK_ACCEL_VISIBLE); } -#endif +#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 (wxAcceleratorEntry *)NULL; + wxFAIL_MSG("only normal menu items can have bitmaps"); } - - // as wxGetAccelFromString() looks for TAB, insert a dummy one here - wxString label; - label << wxT('\t') << GetHotKey(); - - return wxGetAccelFromString(label); } -#endif // wxUSE_ACCEL - void wxMenuItem::Check( bool check ) { wxCHECK_RET( m_menuItem, wxT("invalid menu item") ); - wxCHECK_RET( IsCheckable(), wxT("Can't check uncheckable item!") ) - if (check == m_isChecked) return; wxMenuItemBase::Check( check ); - gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check ); + + switch ( GetKind() ) + { + case wxITEM_CHECK: + case wxITEM_RADIO: + gtk_check_menu_item_set_active( (GtkCheckMenuItem*)m_menuItem, (gint)check ); + break; + + default: + wxFAIL_MSG( wxT("can't check this item") ); + } } void wxMenuItem::Enable( bool enable ) @@ -695,275 +661,287 @@ void wxMenuItem::Enable( bool enable ) bool wxMenuItem::IsChecked() const { - wxCHECK_MSG( m_menuItem, FALSE, wxT("invalid menu item") ); + wxCHECK_MSG( m_menuItem, false, wxT("invalid menu item") ); - wxCHECK_MSG( IsCheckable(), FALSE, + wxCHECK_MSG( IsCheckable(), false, wxT("can't get state of uncheckable item!") ); - return ((GtkCheckMenuItem*)m_menuItem)->active != 0; -} - -wxString wxMenuItem::GetFactoryPath() const -{ - /* in order to get the pointer to the item we need the item text _without_ underscores */ - wxString path( wxT("
/") ); - path += GetLabel(); - - return path; + return gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(m_menuItem)) != 0; } //----------------------------------------------------------------------------- // 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() { -#if (GTK_MINOR_VERSION > 0) + m_popupShown = false; + m_accel = gtk_accel_group_new(); - m_factory = gtk_item_factory_new( GTK_TYPE_MENU, "
", m_accel ); - m_menu = gtk_item_factory_get_widget( m_factory, "
" ); -#else - m_menu = gtk_menu_new(); // Do not show! -#endif + 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: + g_object_ref_sink(m_menu); - m_owner = (GtkWidget*) NULL; + m_owner = NULL; -#if (GTK_MINOR_VERSION > 0) - /* Tearoffs are entries, just like separators. So if we want this - menu to be a tear-off one, we just append a tearoff entry - immediately. */ - if(m_style & wxMENU_TEAROFF) + // Tearoffs are entries, just like separators. So if we want this + // menu to be a tear-off one, we just append a tearoff entry + // immediately. + if ( m_style & wxMENU_TEAROFF ) { - GtkItemFactoryEntry entry; - entry.path = "/tearoff"; - entry.callback = (GtkItemFactoryCallback) NULL; - entry.callback_action = 0; - entry.item_type = ""; - entry.accelerator = (gchar*) NULL; - gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ - //GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "
/tearoff" ); + GtkWidget *tearoff = gtk_tearoff_menu_item_new(); + + gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), tearoff); } -#endif // append the title as the very first entry if we have it - if ( !!m_title ) + if ( !m_title.empty() ) { - Append(-2, m_title); + 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() { - m_items.Clear(); - - gtk_widget_destroy( m_menu ); + // 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); - gtk_object_unref( GTK_OBJECT(m_factory) ); + // 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); } -bool wxMenu::DoAppend(wxMenuItem *mitem) +void wxMenu::SetLayoutDirection(const wxLayoutDirection dir) { - GtkWidget *menuItem; + if ( m_owner ) + wxWindow::GTKSetLayout(m_owner, dir); + //else: will be called later by wxMenuBar again +} - if ( mitem->IsSeparator() ) - { -#if (GTK_MINOR_VERSION > 0) - GtkItemFactoryEntry entry; - entry.path = "/sep"; - entry.callback = (GtkItemFactoryCallback) NULL; - entry.callback_action = 0; - entry.item_type = ""; - entry.accelerator = (gchar*) NULL; - - gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ - - /* this will be wrong for more than one separator. do we care? */ - menuItem = gtk_item_factory_get_widget( m_factory, "
/sep" ); -#else // GTK+ 1.0 - menuItem = gtk_menu_item_new(); -#endif // GTK 1.2/1.0 - } - else if ( mitem->IsSubMenu() ) - { -#if (GTK_MINOR_VERSION > 0) - /* text has "_" instead of "&" after mitem->SetText() */ - wxString text( mitem->GetText() ); - - /* local buffer in multibyte form */ - char buf[200]; - strcpy( buf, "/" ); - strcat( buf, text.mb_str() ); - - GtkItemFactoryEntry entry; - entry.path = buf; - entry.callback = (GtkItemFactoryCallback) 0; - entry.callback_action = 0; - entry.item_type = ""; - entry.accelerator = (gchar*) NULL; - - gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ - - wxString path( mitem->GetFactoryPath() ); - menuItem = gtk_item_factory_get_item( m_factory, path.mb_str() ); -#else // GTK+ 1.0 - menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str()); -#endif // GTK 1.2/1.0 - - gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu ); - } - else // a normal item - { -#if (GTK_MINOR_VERSION > 0) - /* text has "_" instead of "&" after mitem->SetText() */ - wxString text( mitem->GetText() ); - - /* local buffer in multibyte form */ - char buf[200]; - strcpy( buf, "/" ); - strcat( buf, text.mb_str() ); - - GtkItemFactoryEntry entry; - entry.path = buf; - entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback; - entry.callback_action = 0; - if ( mitem->IsCheckable() ) - entry.item_type = ""; - else - entry.item_type = ""; - entry.accelerator = (gchar*) NULL; +wxLayoutDirection wxMenu::GetLayoutDirection() const +{ + return wxWindow::GTKGetLayout(m_owner); +} -#if wxUSE_ACCEL - // due to an apparent bug in GTK+, we have to use a static buffer here - - // otherwise GTK+ 1.2.2 manages to override the memory we pass to it - // somehow! (VZ) - static char s_accel[32]; // must be big enough for F12 - strncpy(s_accel, GetHotKey(*mitem).mb_str(), WXSIZEOF(s_accel)); - entry.accelerator = s_accel; -#else // !wxUSE_ACCEL - entry.accelerator = (char*) NULL; -#endif // wxUSE_ACCEL/!wxUSE_ACCEL - - gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ - - wxString path( mitem->GetFactoryPath() ); - menuItem = gtk_item_factory_get_widget( m_factory, path.mb_str() ); -#else // GTK+ 1.0 - menuItem = checkable ? gtk_check_menu_item_new_with_label( mitem->GetText().mb_str() ) - : gtk_menu_item_new_with_label( mitem->GetText().mb_str() ); - - gtk_signal_connect( GTK_OBJECT(menuItem), "activate", - GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), - (gpointer)this ); -#endif // GTK+ 1.2/1.0 - } +wxString wxMenu::GetTitle() const +{ + return wxConvertMnemonicsFromGTK(wxMenuBase::GetTitle()); +} - if ( !mitem->IsSeparator() ) +void wxMenu::GtkAppend(wxMenuItem* mitem, int pos) +{ + GtkWidget *menuItem; + switch (mitem->GetKind()) { - gtk_signal_connect( GTK_OBJECT(menuItem), "select", - GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), - (gpointer)this ); + 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: + { + // See if we need to create a new radio group for this item or + // add it to an existing one. + wxMenuItem* radioGroupItem = NULL; - gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", - GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), - (gpointer)this ); - } + const size_t numItems = GetMenuItemCount(); + const size_t n = pos == -1 ? numItems - 1 : size_t(pos); -#if GTK_MINOR_VERSION == 0 - gtk_menu_append( GTK_MENU(m_menu), menuItem ); - gtk_widget_show( menuItem ); -#endif // GTK+ 1.0 + if (n != 0) + { + 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; + } + } - mitem->SetMenuItem(menuItem); + if (radioGroupItem == NULL && n != numItems - 1) + { + 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; + } + } - return wxMenuBase::DoAppend(mitem); -} + GSList* group = NULL; + if ( radioGroupItem ) + { + group = gtk_radio_menu_item_get_group( + GTK_RADIO_MENU_ITEM(radioGroupItem->GetMenuItem()) + ); + } -// VZ: this seems to be GTK+ 1.0 only code, I don't understand why there were -// both specialized versions of Append() and this one before my changes, -// but it seems that the others are better... -#if 0 -void wxMenu::Append( wxMenuItem *item ) -{ - GtkWidget *menuItem = (GtkWidget*) NULL; + 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()) + { + // 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); + } + 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; + } + mitem->SetMenuItem(menuItem); - if (item->IsSeparator()) - menuItem = gtk_menu_item_new(); - else if (item->IsSubMenu()) - menuItem = gtk_menu_item_new_with_label(item->GetText().mbc_str()); - else - menuItem = item->IsCheckable() ? gtk_check_menu_item_new_with_label(item->GetText().mbc_str()) - : gtk_menu_item_new_with_label(item->GetText().mbc_str()); + gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos); - if (!item->IsSeparator()) + gtk_widget_show( menuItem ); + + if ( !mitem->IsSeparator() ) { - gtk_signal_connect( GTK_OBJECT(menuItem), "select", - GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), - (gpointer*)this ); + mitem->SetGtkLabel(); + g_signal_connect (menuItem, "select", + G_CALLBACK(menuitem_select), mitem); + g_signal_connect (menuItem, "deselect", + G_CALLBACK(menuitem_deselect), mitem); - gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", - GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), - (gpointer*)this ); + if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK ) + { + gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu ); - if (!item->IsSubMenu()) + gtk_widget_show( mitem->GetSubMenu()->m_menu ); + } + else { - gtk_signal_connect( GTK_OBJECT(menuItem), "activate", - GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), - (gpointer*)this ); + g_signal_connect(menuItem, "can_activate_accel", + G_CALLBACK(can_activate_accel), this); + g_signal_connect (menuItem, "activate", + G_CALLBACK(menuitem_activate), + mitem); } } - - gtk_menu_append( GTK_MENU(m_menu), menuItem ); - gtk_widget_show( menuItem ); - - item->SetMenuItem(menuItem); } -#endif // 0 -bool wxMenu::DoInsert(size_t pos, wxMenuItem *item) +wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem) { - if ( !wxMenuBase::DoInsert(pos, item) ) - return FALSE; - - wxFAIL_MSG(wxT("not implemented")); + if (wxMenuBase::DoAppend(mitem)) + { + GtkAppend(mitem); + return mitem; + } + return NULL; +} - return FALSE; +wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) +{ + if (wxMenuBase::DoInsert(pos, item)) + { + GtkAppend(item, int(pos)); + return item; + } + return NULL; } wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { if ( !wxMenuBase::DoRemove(item) ) - return (wxMenuItem *)NULL; + return NULL; + + GtkWidget * const mitem = item->GetMenuItem(); +#ifdef __WXGTK3__ + gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL); +#else + if (!gtk_check_version(2,12,0)) + { + // 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); + } + else // GTK+ < 2.12 + { + // 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)); + } +#endif - // TODO: this code doesn't delete the item factory item and this seems - // impossible as of GTK 1.2.6. - gtk_widget_destroy( item->GetMenuItem() ); + gtk_widget_destroy(mitem); + item->SetMenuItem(NULL); return item; } -int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const +void wxMenu::Attach(wxMenuBarBase *menubar) { - wxNode *node = m_items.First(); - while (node) - { - wxMenuItem *item = (wxMenuItem*)node->Data(); - if (item->GetMenuItem() == menuItem) - return item->GetId(); - node = node->Next(); - } + wxMenuBase::Attach(menubar); - return wxNOT_FOUND; + // inherit layout direction from menubar. + SetLayoutDirection(menubar->GetLayoutDirection()); } // ---------------------------------------------------------------------------- // helpers // ---------------------------------------------------------------------------- -#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL -static wxString GetHotKey( const wxMenuItem& item ) +#if wxUSE_ACCEL + +static wxString GetGtkHotKey( const wxMenuItem& item ) { wxString hotkey; @@ -993,18 +971,229 @@ static wxString GetHotKey( const wxMenuItem& item ) case WXK_F10: case WXK_F11: case WXK_F12: - hotkey << wxT('F') << code - WXK_F1 + 1; + case WXK_F13: + case WXK_F14: + case WXK_F15: + case WXK_F16: + case WXK_F17: + case WXK_F18: + case WXK_F19: + case WXK_F20: + case WXK_F21: + case WXK_F22: + case WXK_F23: + case WXK_F24: + hotkey += wxString::Format(wxT("F%d"), code - WXK_F1 + 1); break; - // if there are any other keys wxGetAccelFromString() may return, - // we should process them here + // TODO: we should use gdk_keyval_name() (a.k.a. + // XKeysymToString) here as well as hardcoding the keysym + // names this might be not portable + case WXK_INSERT: + hotkey << wxT("Insert" ); + break; + case WXK_DELETE: + hotkey << wxT("Delete" ); + break; + case WXK_UP: + hotkey << wxT("Up" ); + break; + case WXK_DOWN: + hotkey << wxT("Down" ); + break; + case WXK_PAGEUP: + hotkey << wxT("Page_Up" ); + break; + case WXK_PAGEDOWN: + hotkey << wxT("Page_Down" ); + break; + case WXK_LEFT: + hotkey << wxT("Left" ); + break; + case WXK_RIGHT: + hotkey << wxT("Right" ); + break; + case WXK_HOME: + hotkey << wxT("Home" ); + break; + case WXK_END: + hotkey << wxT("End" ); + break; + case WXK_RETURN: + hotkey << wxT("Return" ); + break; + case WXK_BACK: + hotkey << wxT("BackSpace" ); + break; + case WXK_TAB: + hotkey << wxT("Tab" ); + break; + case WXK_ESCAPE: + hotkey << wxT("Esc" ); + break; + case WXK_SPACE: + hotkey << wxT("space" ); + break; + case WXK_MULTIPLY: + hotkey << wxT("Multiply" ); + break; + case WXK_ADD: + hotkey << wxT("Add" ); + break; + case WXK_SEPARATOR: + hotkey << wxT("Separator" ); + break; + case WXK_SUBTRACT: + hotkey << wxT("Subtract" ); + break; + case WXK_DECIMAL: + hotkey << wxT("Decimal" ); + break; + case WXK_DIVIDE: + hotkey << wxT("Divide" ); + break; + case WXK_CANCEL: + hotkey << wxT("Cancel" ); + break; + case WXK_CLEAR: + hotkey << wxT("Clear" ); + break; + case WXK_MENU: + hotkey << wxT("Menu" ); + break; + case WXK_PAUSE: + hotkey << wxT("Pause" ); + break; + case WXK_CAPITAL: + hotkey << wxT("Capital" ); + break; + case WXK_SELECT: + hotkey << wxT("Select" ); + break; + case WXK_PRINT: + hotkey << wxT("Print" ); + break; + case WXK_EXECUTE: + hotkey << wxT("Execute" ); + break; + case WXK_SNAPSHOT: + hotkey << wxT("Snapshot" ); + break; + case WXK_HELP: + hotkey << wxT("Help" ); + break; + case WXK_NUMLOCK: + hotkey << wxT("Num_Lock" ); + break; + case WXK_SCROLL: + hotkey << wxT("Scroll_Lock" ); + break; + case WXK_NUMPAD_INSERT: + hotkey << wxT("KP_Insert" ); + break; + case WXK_NUMPAD_DELETE: + hotkey << wxT("KP_Delete" ); + break; + case WXK_NUMPAD_SPACE: + hotkey << wxT("KP_Space" ); + break; + case WXK_NUMPAD_TAB: + hotkey << wxT("KP_Tab" ); + break; + case WXK_NUMPAD_ENTER: + hotkey << wxT("KP_Enter" ); + break; + case WXK_NUMPAD_F1: case WXK_NUMPAD_F2: case WXK_NUMPAD_F3: + case WXK_NUMPAD_F4: + hotkey += wxString::Format(wxT("KP_F%d"), code - WXK_NUMPAD_F1 + 1); + break; + case WXK_NUMPAD_HOME: + hotkey << wxT("KP_Home" ); + break; + case WXK_NUMPAD_LEFT: + hotkey << wxT("KP_Left" ); + break; + case WXK_NUMPAD_UP: + hotkey << wxT("KP_Up" ); + break; + case WXK_NUMPAD_RIGHT: + hotkey << wxT("KP_Right" ); + break; + case WXK_NUMPAD_DOWN: + hotkey << wxT("KP_Down" ); + break; + case WXK_NUMPAD_PAGEUP: + hotkey << wxT("KP_Page_Up" ); + break; + case WXK_NUMPAD_PAGEDOWN: + hotkey << wxT("KP_Page_Down" ); + break; + case WXK_NUMPAD_END: + hotkey << wxT("KP_End" ); + break; + case WXK_NUMPAD_BEGIN: + hotkey << wxT("KP_Begin" ); + break; + case WXK_NUMPAD_EQUAL: + hotkey << wxT("KP_Equal" ); + break; + case WXK_NUMPAD_MULTIPLY: + hotkey << wxT("KP_Multiply" ); + break; + case WXK_NUMPAD_ADD: + hotkey << wxT("KP_Add" ); + break; + case WXK_NUMPAD_SEPARATOR: + hotkey << wxT("KP_Separator" ); + break; + case WXK_NUMPAD_SUBTRACT: + hotkey << wxT("KP_Subtract" ); + break; + case WXK_NUMPAD_DECIMAL: + hotkey << wxT("KP_Decimal" ); + break; + case WXK_NUMPAD_DIVIDE: + hotkey << wxT("KP_Divide" ); + break; + case WXK_NUMPAD0: case WXK_NUMPAD1: case WXK_NUMPAD2: + case WXK_NUMPAD3: case WXK_NUMPAD4: case WXK_NUMPAD5: + case WXK_NUMPAD6: case WXK_NUMPAD7: case WXK_NUMPAD8: case WXK_NUMPAD9: + hotkey += wxString::Format(wxT("KP_%d"), code - WXK_NUMPAD0); + break; + case WXK_WINDOWS_LEFT: + hotkey << wxT("Super_L" ); + break; + case WXK_WINDOWS_RIGHT: + hotkey << wxT("Super_R" ); + break; + case WXK_WINDOWS_MENU: + hotkey << wxT("Menu" ); + break; + case WXK_COMMAND: + hotkey << wxT("Command" ); + break; + /* These probably wouldn't work as there is no SpecialX in gdk/keynames.txt + case WXK_SPECIAL1: case WXK_SPECIAL2: case WXK_SPECIAL3: case WXK_SPECIAL4: + case WXK_SPECIAL5: case WXK_SPECIAL6: case WXK_SPECIAL7: case WXK_SPECIAL8: + case WXK_SPECIAL9: case WXK_SPECIAL10: case WXK_SPECIAL11: case WXK_SPECIAL12: + case WXK_SPECIAL13: case WXK_SPECIAL14: case WXK_SPECIAL15: case WXK_SPECIAL16: + case WXK_SPECIAL17: case WXK_SPECIAL18: case WXK_SPECIAL19: case WXK_SPECIAL20: + hotkey += wxString::Format(wxT("Special%d"), code - WXK_SPECIAL1 + 1); + break; + */ + // if there are any other keys wxAcceleratorEntry::Create() may + // return, we should process them here default: - if ( wxIsalnum(code) ) + if ( code < 127 ) { - hotkey << (wxChar)code; - - break; + const wxString + name = wxGTK_CONV_BACK_SYS(gdk_keyval_name((guint)code)); + if ( !name.empty() ) + { + hotkey << name; + break; + } } wxFAIL_MSG( wxT("unknown keyboard accel") ); @@ -1015,5 +1204,134 @@ static wxString GetHotKey( const wxMenuItem& item ) 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) +{ + #define STOCKITEM(wx,gtk) \ + case wx: \ + return gtk; + + #if GTK_CHECK_VERSION(2,6,0) + #define STOCKITEM_26(wx,gtk) STOCKITEM(wx,gtk) + #else + #define STOCKITEM_26(wx,gtk) + #endif + + #if GTK_CHECK_VERSION(2,8,0) + #define STOCKITEM_28(wx,gtk) STOCKITEM(wx,gtk) + #else + #define STOCKITEM_28(wx,gtk) + #endif + + #if GTK_CHECK_VERSION(2,10,0) + #define STOCKITEM_210(wx,gtk) STOCKITEM(wx,gtk) + #else + #define STOCKITEM_210(wx,gtk) + #endif + + + switch (id) + { + 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_BOTTOM, GTK_STOCK_GOTO_BOTTOM) + 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_CONVERT, GTK_STOCK_CONVERT) + 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(wxID_EXECUTE, GTK_STOCK_EXECUTE) + STOCKITEM(wxID_EXIT, GTK_STOCK_QUIT) + STOCKITEM_26(wxID_FILE, GTK_STOCK_FILE) + 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_HARDDISK, GTK_STOCK_HARDDISK) + STOCKITEM(wxID_HELP, GTK_STOCK_HELP) + STOCKITEM(wxID_HOME, GTK_STOCK_HOME) + STOCKITEM(wxID_INDENT, GTK_STOCK_INDENT) + STOCKITEM(wxID_INDEX, GTK_STOCK_INDEX) + STOCKITEM_28(wxID_INFO, GTK_STOCK_INFO) + 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_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_PREVIEW, GTK_STOCK_PRINT_PREVIEW) + STOCKITEM(wxID_PRINT, GTK_STOCK_PRINT) + STOCKITEM(wxID_PROPERTIES, GTK_STOCK_PROPERTIES) + 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_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_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_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_ZOOM_IN, GTK_STOCK_ZOOM_IN) + STOCKITEM(wxID_ZOOM_OUT, GTK_STOCK_ZOOM_OUT) + + default: + break; + }; + + #undef STOCKITEM + + return NULL; +} + +#endif // wxUSE_MENUS