X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b919f007af55c6bcba975ead6177c80a317e1a4a..e49426a206f9933702526d733b1ae944381f03de:/src/gtk/menu.cpp diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 094b02165a..7f4d87855d 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.cpp +// Name: src/gtk/menu.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,44 +7,144 @@ // 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" -#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 -#include +#include "wx/accel.h" +#include "wx/stockitem.h" +#include "wx/gtk/private.h" + +#ifdef __WXGTK20__ +#include +#endif + +// 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; //----------------------------------------------------------------------------- // idle system //----------------------------------------------------------------------------- -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - -#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL -static wxString GetHotKey( const wxMenuItem& item ); +#if wxUSE_ACCEL +static wxString GetGtkHotKey( const wxMenuItem& item ); #endif +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +static wxString wxReplaceUnderscore( const wxString& title ) +{ + const wxChar *pc; + + // GTK 1.2 wants to have "_" instead of "&" for accelerators + wxString str; + pc = title; + while (*pc != wxT('\0')) + { + if ((*pc == wxT('&')) && (*(pc+1) == wxT('&'))) + { + // "&" is doubled to indicate "&" instead of accelerator + ++pc; + str << wxT('&'); + } + else if (*pc == wxT('&')) + { + str << wxT('_'); + } + else + { + if ( *pc == wxT('_') ) + { + // underscores must be doubled to prevent them from being + // interpreted as accelerator character prefix by GTK + str << *pc; + } + + str << *pc; + } + ++pc; + } + + // wxPrintf( wxT("before %s after %s\n"), title.c_str(), str.c_str() ); + + return str; +} + +//----------------------------------------------------------------------------- +// activate message from GTK +//----------------------------------------------------------------------------- + +static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + + event.SetEventObject( menu ); + + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(event)) + return; + + wxWindow *win = menu->GetInvokingWindow(); + if (win) + win->GetEventHandler()->ProcessEvent( event ); +} + +extern "C" { + +static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu ) +{ + wxMenuEvent event(wxEVT_MENU_OPEN, -1, menu); + + DoCommonMenuCallbackCode(menu, event); +} + +static void gtk_menu_close_callback( GtkWidget *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); +} + +} + //----------------------------------------------------------------------------- // wxMenuBar //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow) -wxMenuBar::wxMenuBar( long style ) +void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style) { - /* the parent window is known after wxFrame::SetMenu() */ - m_needParent = FALSE; + // the parent window is known after wxFrame::SetMenu() + m_needParent = false; m_style = style; m_invokingWindow = (wxWindow*) NULL; @@ -55,16 +155,7 @@ wxMenuBar::wxMenuBar( long style ) 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) { @@ -78,57 +169,49 @@ wxMenuBar::wxMenuBar( long style ) } PostCreation(); -} -wxMenuBar::wxMenuBar() -{ - /* the parent window is known after wxFrame::SetMenu() */ - m_needParent = FALSE; - m_style = 0; - m_invokingWindow = (wxWindow*) NULL; + ApplyWidgetStyle(); - if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) || - !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("menubar") )) - { - wxFAIL_MSG( wxT("wxMenuBar creation failed") ); - return; - } + for (size_t i = 0; i < n; ++i ) + Append(menus[i], titles[i]); - m_menus.DeleteContents( TRUE ); + // 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); - /* 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); +wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style) +{ + Init(n, menus, titles, style); +} - PostCreation(); +wxMenuBar::wxMenuBar(long style) +{ + Init(0, NULL, NULL, style); +} + +wxMenuBar::wxMenuBar() +{ + Init(0, NULL, NULL, 0); } wxMenuBar::~wxMenuBar() { -// gtk_object_unref( GTK_OBJECT(m_factory) ); why not ? } static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( (wxWindow*) NULL ); -#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_detach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) ); -#endif - - wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { wxMenuItem *menuitem = node->GetData(); @@ -142,16 +225,16 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) { 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 + 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 ); - wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { wxMenuItem *menuitem = node->GetData(); @@ -164,16 +247,11 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) void wxMenuBar::SetInvokingWindow( wxWindow *win ) { 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(); - /* support for native key accelerators indicated by underscroes */ - gtk_accel_group_attach( 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(); @@ -182,19 +260,58 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win ) } } +void wxMenuBar::SetLayoutDirection(wxLayoutDirection dir) +{ + 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(); + } + } + + 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); + + SetLayoutDirection(wxLayout_Default); +} + void wxMenuBar::UnsetInvokingWindow( wxWindow *win ) { 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(); @@ -206,130 +323,71 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win ) bool wxMenuBar::Append( wxMenu *menu, const wxString &title ) { if ( !wxMenuBarBase::Append( menu, title ) ) - return FALSE; + return false; return GtkAppend(menu, title); } -bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) +bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos) { - const wxChar *pc; + wxString str( wxReplaceUnderscore( title ) ); - /* GTK 1.2 wants to have "_" instead of "&" for accelerators */ - wxString str; - for ( pc = title; *pc != wxT('\0'); pc++ ) - { - if (*pc == wxT('&')) - { -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) - str << wxT('_'); - } - else if (*pc == wxT('/')) - { - str << wxT('\\'); -#endif - } - 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; - } - } - - /* this doesn't have much effect right now */ + // This doesn't have much effect right now. menu->SetTitle( str ); - /* 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 = ""; + // The "m_owner" is the "menu item" + menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) ); + menu->SetLayoutDirection(GetLayoutDirection()); - 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 - - 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 ); - gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner ); + if (pos == -1) + gtk_menu_shell_append( GTK_MENU_SHELL(m_menubar), menu->m_owner ); + else + gtk_menu_shell_insert( GTK_MENU_SHELL(m_menubar), menu->m_owner, pos ); -#endif + g_signal_connect (menu->m_owner, "activate", + G_CALLBACK (gtk_menu_open_callback), + menu); // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables - // adding menu later on. + // addings menu later on. if (m_invokingWindow) + { wxMenubarSetInvokingWindow( menu, m_invokingWindow ); - return TRUE; + // OPTIMISE ME: we should probably cache this, or pass it + // directly, but for now this is a minimal + // change to validate the new dynamic sizing. + // see (and refactor :) similar code in Remove + // below. + + wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame ); + + if( frame ) + frame->UpdateMenuBarSize(); + } + + return true; } bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { if ( !wxMenuBarBase::Insert(pos, menu, title) ) - return FALSE; + return false; -#if __WXGTK12__ - // GTK+ doesn't have a function to insert a menu using GtkItemFactory (as - // of version 1.2.6), so we first append the item and then change its - // index - if ( !GtkAppend(menu, title) ) - return FALSE; + // TODO - GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget); - gpointer data = g_list_last(menu_shell->children)->data; - menu_shell->children = g_list_remove(menu_shell->children, data); - menu_shell->children = g_list_insert(menu_shell->children, data, pos); + if ( !GtkAppend(menu, title, (int)pos) ) + return false; - return TRUE; -#else // GTK < 1.2 - // this should be easy to do with GTK 1.0 - can use standard functions for - // this and don't need any hacks like above, but as I don't have GTK 1.0 - // any more I can't do it - wxFAIL_MSG( wxT("TODO") ); - - return FALSE; -#endif // GTK 1.2/1.0 + return true; } wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) { - if ( !wxMenuBarBase::Replace(pos, menu, title) ) - return (wxMenu*) NULL; - // remove the old item and insert a new one wxMenu *menuOld = Remove(pos); if ( menuOld && !Insert(pos, menu, title) ) @@ -347,33 +405,34 @@ wxMenu *wxMenuBar::Remove(size_t pos) if ( !menu ) return (wxMenu*) NULL; - GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget); - printf( "factory entries before %d\n", (int)g_slist_length(m_factory->items) ); - printf( "menu shell entries before %d\n", (int)g_list_length( menu_shell->children ) ); - - // unparent calls unref() and that would delete the widget so we raise - // the ref count to 2 artificially before invoking unparent. - gtk_widget_ref( menu->m_menu ); - gtk_widget_unparent( menu->m_menu ); - + gtk_menu_item_remove_submenu( GTK_MENU_ITEM(menu->m_owner) ); + gtk_container_remove(GTK_CONTAINER(m_menubar), menu->m_owner); + gtk_widget_destroy( menu->m_owner ); - - printf( "factory entries after %d\n", (int)g_slist_length(m_factory->items) ); - printf( "menu shell entries after %d\n", (int)g_list_length( menu_shell->children ) ); - + menu->m_owner = NULL; + + if (m_invokingWindow) + { + // OPTIMISE ME: see comment in GtkAppend + wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame ); + + if( frame ) + frame->UpdateMenuBarSize(); + } + return menu; } static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString ) { - if (menu->GetTitle() == menuString) + if (wxMenuItem::GetLabelFromText(menu->GetTitle()) == wxMenuItem::GetLabelFromText(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(); @@ -388,7 +447,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(); @@ -406,7 +465,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(); @@ -423,7 +482,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(); @@ -441,7 +500,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") ); @@ -453,38 +512,62 @@ void wxMenuBar::EnableTop( size_t pos, bool flag ) wxString wxMenuBar::GetLabelTop( 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") ); wxMenu* menu = node->GetData(); - return menu->GetTitle(); + wxString label; + wxString text( menu->GetTitle() ); + for ( const wxChar *pc = text.c_str(); *pc; pc++ ) + { + if ( *pc == wxT('_') ) + { + // '_' is the escape character for GTK+ + continue; + } + + // don't remove ampersands '&' since if we have them in the menu title + // it means that they were doubled to indicate "&" instead of accelerator + + label += *pc; + } + + return label; } void wxMenuBar::SetLabelTop( 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( wxReplaceUnderscore( label ) ); + + menu->SetTitle( str ); + + if (menu->m_owner) + gtk_label_set_text_with_mnemonic( GTK_LABEL( GTK_BIN(menu->m_owner)->child), wxGTK_CONV(str) ); } //----------------------------------------------------------------------------- // "activate" //----------------------------------------------------------------------------- +extern "C" { static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) { - if (g_isIdle) wxapp_install_idle_handler(); - + 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) ); + wxASSERT_MSG( (id != -1) || (menu->GetInvokingWindow() != NULL), + _T("menu item not found in gtk_menu_clicked_callback") ); if (!menu->IsEnabled(id)) return; @@ -492,46 +575,66 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) wxMenuItem* item = menu->FindChildItem( id ); wxCHECK_RET( item, wxT("error in menu item callback") ); + if ( item->GetId() == 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()) + // 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) { - (void) (*(menu->GetCallback())) (*menu, event); - return; + // 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()); + commandEvent.SetEventObject(menu); + + frame->GetEventHandler()->ProcessEvent(commandEvent); + } + else + { + // otherwise let the menu have it + menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); } -#endif // wxUSE_MENU_CALLBACK - - if (menu->GetEventHandler()->ProcessEvent(event)) - return; - - wxWindow *win = menu->GetInvokingWindow(); - if (win) - win->GetEventHandler()->ProcessEvent( event ); +} } //----------------------------------------------------------------------------- // "select" //----------------------------------------------------------------------------- +extern "C" { static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -546,17 +649,20 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id ); event.SetEventObject( menu ); - if (menu->GetEventHandler()->ProcessEvent(event)) + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(event)) return; wxWindow *win = menu->GetInvokingWindow(); if (win) win->GetEventHandler()->ProcessEvent( event ); } +} //----------------------------------------------------------------------------- // "deselect" //----------------------------------------------------------------------------- +extern "C" { static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -571,28 +677,41 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 ); event.SetEventObject( menu ); - if (menu->GetEventHandler()->ProcessEvent(event)) + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(event)) return; wxWindow *win = menu->GetInvokingWindow(); if (win) win->GetEventHandler()->ProcessEvent( event ); } +} //----------------------------------------------------------------------------- // wxMenuItem //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase) +IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) 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, + wxItemKind kind, + wxMenu *subMenu) + : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu) +{ + Init(text); } wxMenuItem::wxMenuItem(wxMenu *parentMenu, @@ -601,15 +720,15 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu, const wxString& help, bool isCheckable, wxMenu *subMenu) + : wxMenuItemBase(parentMenu, id, text, help, + isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu) { - m_id = id; - m_isCheckable = isCheckable; - m_isChecked = FALSE; - m_isEnabled = TRUE; - m_subMenu = subMenu; - m_parentMenu = parentMenu; - m_help = help; + Init(text); +} +void wxMenuItem::Init(const wxString& text) +{ + m_labelWidget = (GtkWidget *) NULL; m_menuItem = (GtkWidget *) NULL; DoSetText(text); @@ -621,79 +740,191 @@ wxMenuItem::~wxMenuItem() } // return the menu item text without any menu accels -wxString wxMenuItem::GetLabel() const +/* static */ +wxString wxMenuItemBase::GetLabelFromText(const wxString& text) { wxString label; -#if (GTK_MINOR_VERSION > 0) - for ( const wxChar *pc = m_text.c_str(); *pc; pc++ ) + + for ( const wxChar *pc = text.c_str(); *pc; pc++ ) { + if ( *pc == wxT('\t')) + break; + if ( *pc == wxT('_') ) { - // this is the escape character for GTK+ - skip it + // 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; } -#else // GTK+ 1.0 - label = m_text; -#endif // GTK+ 1.2/1.0 + + // wxPrintf( wxT("GetLabelFromText(): text %s label %s\n"), text.c_str(), label.c_str() ); return label; } void wxMenuItem::SetText( 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); + wxString oldhotkey = GetHotKey(); // Store the old hotkey in Ctrl-foo format + wxCharBuffer oldbuf = wxGTK_CONV_SYS( GetGtkHotKey(*this) ); // and as foo + DoSetText(str); + if (oldLabel == label1 && + oldhotkey == GetHotKey()) // Make sure we can change a hotkey even if the label is unaltered + return; + if (m_menuItem) { - GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child ); + 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()); - /* set new text */ - gtk_label_set( label, m_text.mb_str()); + // need & => _ conversion + text = GTKProcessMenuItemLabel(text, NULL); + } - /* reparse key accel */ - (void)gtk_label_parse_uline (GTK_LABEL(label), m_text.mb_str() ); - gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) ); + 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) + { + gtk_widget_remove_accelerator( GTK_WIDGET(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( GTK_WIDGET(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( GTK_WIDGET(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( GTK_WIDGET(m_menuItem), + m_parentMenu->m_accel, + accel_key, + accel_mods ); } } -// it's valid for this function to be called even if m_menuItem == NULL -void wxMenuItem::DoSetText( const wxString& str ) +// NOTE: this function is different from the similar functions GTKProcessMnemonics() +// implemented in control.cpp and from wxMenuItemBase::GetLabelFromText... +// so there's no real code duplication +wxString wxMenuItem::GTKProcessMenuItemLabel(const wxString& str, wxString *hotKey) { - /* '\t' is the deliminator indicating a hot key */ - m_text.Empty(); + wxString text; + + // '\t' is the deliminator indicating a hot key const wxChar *pc = str; - for (; (*pc != wxT('\0')) && (*pc != wxT('\t')); pc++ ) + while ( (*pc != wxT('\0')) && (*pc != wxT('\t')) ) { - if (*pc == wxT('&')) + if ((*pc == wxT('&')) && (*(pc+1) == wxT('&'))) { -#if (GTK_MINOR_VERSION > 0) - m_text << wxT('_'); + // "&" is doubled to indicate "&" instead of accelerator + ++pc; + text << wxT('&'); } - else if ( *pc == wxT('_') ) // escape underscores + else if (*pc == wxT('&')) { - m_text << wxT("__"); + text << wxT('_'); } - else if (*pc == wxT('/')) /* we have to filter out slashes ... */ + else if ( *pc == wxT('_') ) // escape underscores { - m_text << wxT('\\'); /* ... and replace them with back slashes */ -#endif + text << wxT("__"); } else - m_text << *pc; + { + text << *pc; + } + ++pc; } - /* only GTK 1.2 knows about hot keys */ - m_hotKey = wxT(""); -#if (GTK_MINOR_VERSION > 0) - if(*pc == wxT('\t')) + if (hotKey) { - pc++; - m_hotKey = pc; + hotKey->Empty(); + if(*pc == wxT('\t')) + { + pc++; + *hotKey = pc; + } } -#endif + + 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); } #if wxUSE_ACCEL @@ -703,14 +934,15 @@ wxAcceleratorEntry *wxMenuItem::GetAccel() const if ( !GetHotKey() ) { // nothing - return (wxAcceleratorEntry *)NULL; + return NULL; } - // as wxGetAccelFromString() looks for TAB, insert a dummy one here + // accelerator parsing code looks for them after a TAB, so insert a dummy + // one here wxString label; label << wxT('\t') << GetHotKey(); - return wxGetAccelFromString(label); + return wxAcceleratorEntry::Create(label); } #endif // wxUSE_ACCEL @@ -719,13 +951,21 @@ 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( _T("can't check this item") ); + } } void wxMenuItem::Enable( bool enable ) @@ -738,24 +978,14 @@ 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; -} - //----------------------------------------------------------------------------- // wxMenu //----------------------------------------------------------------------------- @@ -764,196 +994,271 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler) void wxMenu::Init() { -#if (GTK_MINOR_VERSION > 0) 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: + gtk_widget_ref(m_menu); m_owner = (GtkWidget*) 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 + + m_prevRadio = NULL; // 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(); } } wxMenu::~wxMenu() { - m_items.Clear(); + WX_CLEAR_LIST(wxMenuItemList, m_items); + + if ( GTK_IS_WIDGET( m_menu )) + { + // see wxMenu::Init + gtk_widget_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 ); + } +} - gtk_widget_destroy( m_menu ); +void wxMenu::SetLayoutDirection(const wxLayoutDirection dir) +{ + if ( m_owner ) + wxWindow::GTKSetLayout(m_owner, dir); + //else: will be called later by wxMenuBar again +} - gtk_object_unref( GTK_OBJECT(m_factory) ); +wxLayoutDirection wxMenu::GetLayoutDirection() const +{ + return wxWindow::GTKGetLayout(m_owner); } -bool wxMenu::GtkAppend(wxMenuItem *mitem) +bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) { GtkWidget *menuItem; + // cache some data used later + wxString text = mitem->GetText(); + 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() ) { -#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 + menuItem = gtk_separator_menu_item_new(); } - else if ( mitem->IsSubMenu() ) + else if ( mitem->GetBitmap().Ok() || + (mitem->GetKind() == wxITEM_NORMAL && isstock) ) { -#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 ); + 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 { -#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; + // NB: 'text' variable has "_" instead of "&" after mitem->SetText() + // 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: + { + 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; + } + + default: + wxFAIL_MSG( _T("unexpected menu item kind") ); + // fall through + + case wxITEM_NORMAL: + { + menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) ); + m_prevRadio = NULL; + break; + } + } -#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 } - if ( !mitem->IsSeparator() ) - { - gtk_signal_connect( GTK_OBJECT(menuItem), "select", - GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), - (gpointer)this ); + guint accel_key; + GdkModifierType accel_mods; + wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*mitem) ); - gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", - GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), - (gpointer)this ); + // wxPrintf( wxT("item: %s hotkey %s\n"), mitem->GetText().c_str(), GetGtkHotKey(*mitem).c_str() ); + if (buf[(size_t)0] != '\0') + { + gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods); + if (accel_key != 0) + { + gtk_widget_add_accelerator (GTK_WIDGET(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( GTK_WIDGET(menuItem), + "activate", + m_accel, + accel_key, + accel_mods, + GTK_ACCEL_VISIBLE); } -#if GTK_MINOR_VERSION == 0 - gtk_menu_append( GTK_MENU(m_menu), 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_widget_show( menuItem ); -#endif // GTK+ 1.0 + + if ( !mitem->IsSeparator() ) + { + wxASSERT_MSG( menuItem, wxT("invalid menuitem") ); + + g_signal_connect (menuItem, "select", + G_CALLBACK (gtk_menu_hilight_callback), this); + g_signal_connect (menuItem, "deselect", + G_CALLBACK (gtk_menu_nolight_callback), 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 ); + + 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 + { + g_signal_connect (menuItem, "activate", + G_CALLBACK (gtk_menu_clicked_callback), + this); + } + } mitem->SetMenuItem(menuItem); - return TRUE; + if (ms_locked) + { + // This doesn't even exist! + // gtk_widget_lock_accelerators(mitem->GetMenuItem()); + } + + return true; } -bool wxMenu::DoAppend(wxMenuItem *mitem) +wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem) { - return GtkAppend(mitem) && wxMenuBase::DoAppend(mitem); + if (!GtkAppend(mitem)) + return NULL; + + return wxMenuBase::DoAppend(mitem); } -bool wxMenu::DoInsert(size_t pos, wxMenuItem *item) +wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) { if ( !wxMenuBase::DoInsert(pos, item) ) - return FALSE; + return NULL; -#ifdef __WXGTK12__ - // GTK+ doesn't have a function to insert a menu using GtkItemFactory (as - // of version 1.2.6), so we first append the item and then change its - // index - if ( !GtkAppend(item) ) - return FALSE; + // TODO + if ( !GtkAppend(item, (int)pos) ) + return NULL; - GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget); - gpointer data = g_list_last(menu_shell->children)->data; - menu_shell->children = g_list_remove(menu_shell->children, data); - menu_shell->children = g_list_insert(menu_shell->children, data, pos); - - return TRUE; -#else // GTK < 1.2 - // this should be easy to do... - wxFAIL_MSG( wxT("not implemented") ); -#endif // GTK 1.2/1.0 - - return FALSE; + return item; } wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) @@ -970,24 +1275,33 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const { - wxNode *node = m_items.First(); + wxMenuItemList::compatibility_iterator node = m_items.GetFirst(); while (node) { - wxMenuItem *item = (wxMenuItem*)node->Data(); + wxMenuItem *item = node->GetData(); if (item->GetMenuItem() == menuItem) - return item->GetId(); - node = node->Next(); + return item->GetId(); + node = node->GetNext(); } return wxNOT_FOUND; } +void wxMenu::Attach(wxMenuBarBase *menubar) +{ + wxMenuBase::Attach(menubar); + + // 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; @@ -1017,18 +1331,228 @@ 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("PgUp" ); + break; + case WXK_PAGEDOWN: + hotkey << wxT("PgDn" ); + 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_PgUp" ); + break; + case WXK_NUMPAD_PAGEDOWN: + hotkey << wxT("KP_PgDn" ); + 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; + wxString name = wxGTK_CONV_BACK( gdk_keyval_name((guint)code) ); + if ( name ) + { + hotkey << name; + break; + } } wxFAIL_MSG( wxT("unknown keyboard accel") ); @@ -1039,5 +1563,240 @@ static wxString GetHotKey( const wxMenuItem& item ) 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 ) +{ + menu->SetInvokingWindow( win ); + + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); + while (node) + { + wxMenuItem *menuitem = node->GetData(); + if (menuitem->IsSubMenu()) + { + SetInvokingWindow( menuitem->GetSubMenu(), win ); + } + + node = node->GetNext(); + } +} + +extern "C" WXDLLIMPEXP_CORE +void wxPopupMenuPositionCallback( GtkMenu *menu, + gint *x, gint *y, + gboolean * WXUNUSED(whatever), + gpointer user_data ) +{ + // ensure that the menu appears entirely on screen + GtkRequisition req; + gtk_widget_get_child_requisition(GTK_WIDGET(menu), &req); + + wxSize sizeScreen = wxGetDisplaySize(); + wxPoint *pos = (wxPoint*)user_data; + + gint xmax = sizeScreen.x - req.width, + ymax = sizeScreen.y - req.height; + + *x = pos->x < xmax ? pos->x : xmax; + *y = pos->y < ymax ? pos->y : ymax; +} + +bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) +{ + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") ); + + wxCHECK_MSG( menu != NULL, false, wxT("invalid popup-menu") ); + + // NOTE: if you change this code, you need to update + // the same code in taskbar.cpp as well. This + // is ugly code duplication, I know. + + SetInvokingWindow( menu, this ); + + menu->UpdateUI(); + + bool is_waiting = true; + + gulong handler = g_signal_connect (menu->m_menu, "hide", + G_CALLBACK (gtk_pop_hide_callback), + &is_waiting); + + wxPoint pos; + gpointer userdata; + GtkMenuPositionFunc posfunc; + if ( x == -1 && y == -1 ) + { + // use GTK's default positioning algorithm + userdata = NULL; + posfunc = NULL; + } + else + { + pos = ClientToScreen(wxPoint(x, y)); + userdata = &pos; + posfunc = wxPopupMenuPositionCallback; + } + + wxMenuEvent eventOpen(wxEVT_MENU_OPEN, -1, menu); + DoCommonMenuCallbackCode(menu, eventOpen); + + gtk_menu_popup( + GTK_MENU(menu->m_menu), + (GtkWidget *) NULL, // parent menu shell + (GtkWidget *) NULL, // parent menu item + posfunc, // function to position it + userdata, // client data + 0, // button used to activate it + gtk_get_current_event_time() + ); + + while (is_waiting) + { + gtk_main_iteration(); + } + + g_signal_handler_disconnect (menu->m_menu, handler); + + wxMenuEvent eventClose(wxEVT_MENU_CLOSE, -1, menu); + DoCommonMenuCallbackCode(menu, eventClose); + + return true; +} + +#endif // wxUSE_MENUS_NATIVE + +#ifdef __WXGTK20__ + +#include + +const char *wxGetStockGtkID(wxWindowID id) +{ + #define STOCKITEM(wx,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) + #else + #define STOCKITEM_24(wx,gtk) STOCKITEM_MISSING(wx) + #endif + + #if GTK_CHECK_VERSION(2,6,0) + #define STOCKITEM_26(wx,gtk) STOCKITEM(wx,gtk) + #else + #define STOCKITEM_26(wx,gtk) STOCKITEM_MISSING(wx) + #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) + #endif + + + switch (id) + { + STOCKITEM_26(wxID_ABOUT, GTK_STOCK_ABOUT) + STOCKITEM(wxID_ADD, GTK_STOCK_ADD) + STOCKITEM(wxID_APPLY, GTK_STOCK_APPLY) + STOCKITEM(wxID_BOLD, GTK_STOCK_BOLD) + STOCKITEM(wxID_CANCEL, GTK_STOCK_CANCEL) + STOCKITEM(wxID_CLEAR, GTK_STOCK_CLEAR) + STOCKITEM(wxID_CLOSE, GTK_STOCK_CLOSE) + STOCKITEM(wxID_COPY, GTK_STOCK_COPY) + STOCKITEM(wxID_CUT, GTK_STOCK_CUT) + STOCKITEM(wxID_DELETE, GTK_STOCK_DELETE) + STOCKITEM_26(wxID_EDIT, GTK_STOCK_EDIT) + STOCKITEM(wxID_FIND, GTK_STOCK_FIND) + 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_FORWARD, GTK_STOCK_GO_FORWARD) + STOCKITEM(wxID_UP, GTK_STOCK_GO_UP) + STOCKITEM(wxID_HELP, GTK_STOCK_HELP) + STOCKITEM(wxID_HOME, GTK_STOCK_HOME) + STOCKITEM_24(wxID_INDENT, GTK_STOCK_INDENT) + STOCKITEM(wxID_INDEX, GTK_STOCK_INDEX) + STOCKITEM(wxID_ITALIC, GTK_STOCK_ITALIC) + 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_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_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_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_STOP, GTK_STOCK_STOP) + 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_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: + wxFAIL_MSG( _T("invalid stock item ID") ); + break; + }; + + #undef STOCKITEM + + return NULL; +} + +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 // __WXGTK20__