X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33961d59b0fc1271fd7f12cf99819a552610269c..1c8c91463fcd1749ad285017397ef2edbf2ca6ec:/src/gtk1/menu.cpp diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index 1fec1d74fc..fa3f149dd0 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.cpp +// Name: src/gtk1/menu.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,18 +7,36 @@ // 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/menu.h" -#include "wx/log.h" -#include "wx/intl.h" -#include "wx/app.h" +#include "wx/stockitem.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/app.h" + #include "wx/bitmap.h" +#endif + +#if wxUSE_ACCEL + #include "wx/accel.h" +#endif // wxUSE_ACCEL + +#include "wx/gtk1/private.h" + +#include + +#define ACCEL_OBJECT GtkObject +#define ACCEL_OBJECTS(a) (a)->attach_objects +#define ACCEL_OBJ_CAST(obj) GTK_OBJECT(obj) -#include "gdk/gdk.h" -#include "gtk/gtk.h" +// we use normal item but with a special id for the menu title +static const int wxGTK_TITLE_ID = -3; + +// defined in window.cpp +extern guint32 wxGtkTimeLastClick; //----------------------------------------------------------------------------- // idle system @@ -27,35 +45,118 @@ extern void wxapp_install_idle_handler(); extern bool g_isIdle; +#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; if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) || - !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, _T("menubar") )) + !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") )) { - wxFAIL_MSG( _T("wxMenuBar creation failed") ); - return; + 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 + m_accel = gtk_accel_group_new(); if (style & wxMB_DOCKABLE) { @@ -69,61 +170,60 @@ wxMenuBar::wxMenuBar( long style ) } PostCreation(); -} -wxMenuBar::wxMenuBar() -{ - /* the parent window is known after wxFrame::SetMenu() */ - m_needParent = FALSE; - m_style = 0; + ApplyWidgetStyle(); - if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) || - !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("menubar") )) - { - wxFAIL_MSG( _T("wxMenuBar creation failed") ); - return; - } - - m_menus.DeleteContents( TRUE ); + for (size_t i = 0; i < n; ++i ) + Append(menus[i], titles[i]); - /* 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 + // 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 + gtk_signal_connect( GTK_OBJECT(GTK_MENU_SHELL(m_menubar)), + "deactivate", + GTK_SIGNAL_FUNC(gtk_menu_close_callback), + (gpointer)this ); + +} - 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() { - // how to destroy a GtkItemFactory ? } 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 = top_frame->GetParent(); + 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 + // support for native hot keys + gtk_accel_group_detach( menu->m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) ); - wxNode *node = menu->GetItems().First(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { - wxMenuItem *menuitem = (wxMenuItem*)node->Data(); + wxMenuItem *menuitem = node->GetData(); if (menuitem->IsSubMenu()) wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win ); - node = node->Next(); + node = node->GetNext(); } } @@ -131,372 +231,403 @@ 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 = top_frame->GetParent(); + 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 ); - wxNode *node = menu->GetItems().First(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { - wxMenuItem *menuitem = (wxMenuItem*)node->Data(); + wxMenuItem *menuitem = node->GetData(); if (menuitem->IsSubMenu()) wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win ); - node = node->Next(); + node = node->GetNext(); } } void wxMenuBar::SetInvokingWindow( wxWindow *win ) { -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) + m_invokingWindow = win; wxWindow *top_frame = win; - while (top_frame->GetParent()) - top_frame = top_frame->GetParent(); + 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 + // support for native key accelerators indicated by underscroes + ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget); + if ( !g_slist_find( ACCEL_OBJECTS(m_accel), obj ) ) + gtk_accel_group_attach( m_accel, obj ); - wxNode *node = m_menus.First(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node) { - wxMenu *menu = (wxMenu*)node->Data(); + wxMenu *menu = node->GetData(); wxMenubarSetInvokingWindow( menu, win ); - node = node->Next(); + node = node->GetNext(); } } void wxMenuBar::UnsetInvokingWindow( wxWindow *win ) { -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) + m_invokingWindow = (wxWindow*) NULL; wxWindow *top_frame = win; - while (top_frame->GetParent()) - top_frame = top_frame->GetParent(); + 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 + // support for native key accelerators indicated by underscroes + gtk_accel_group_detach( m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) ); - wxNode *node = m_menus.First(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node) { - wxMenu *menu = (wxMenu*)node->Data(); + wxMenu *menu = node->GetData(); wxMenubarUnsetInvokingWindow( menu, win ); - node = node->Next(); + node = node->GetNext(); } } -void wxMenuBar::Append( wxMenu *menu, const wxString &title ) +bool wxMenuBar::Append( wxMenu *menu, const wxString &title ) { - m_menus.Append( menu ); + if ( !wxMenuBarBase::Append( menu, title ) ) + return false; - const wxChar *pc; + return GtkAppend(menu, title); +} - /* GTK 1.2 wants to have "_" instead of "&" for accelerators */ - wxString str; - for ( pc = title; *pc != _T('\0'); pc++ ) +bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos) +{ + wxString str( wxReplaceUnderscore( title ) ); + + // This doesn't have much effect right now. + menu->SetTitle( str ); + + // The "m_owner" is the "menu item" + menu->m_owner = gtk_menu_item_new_with_label( wxGTK_CONV( str ) ); + GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child ); + // set new text + gtk_label_set_text( label, wxGTK_CONV( str ) ); + // reparse key accel + guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( str ) ); + if (accel_key != GDK_VoidSymbol) { - if (*pc == _T('&')) - { -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) - str << _T('_'); - } else - if (*pc == _T('/')) - { - str << _T('\\'); -#endif - } - else - str << *pc; + gtk_widget_add_accelerator (menu->m_owner, + "activate_item", + m_accel, //gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menubar)), + accel_key, + GDK_MOD1_MASK, + GTK_ACCEL_LOCKED); } - /* this doesn't have much effect right now */ - menu->SetTitle( str ); + gtk_widget_show( menu->m_owner ); - /* 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) + gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu ); + + 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 ); - /* local buffer in multibyte form */ - wxString buf; - buf << _T('/') << str.c_str(); + gtk_signal_connect( GTK_OBJECT(menu->m_owner), "activate", + GTK_SIGNAL_FUNC(gtk_menu_open_callback), + (gpointer)menu ); - char *cbuf = new char[buf.Length()]; - strcpy(cbuf, buf.mbc_str()); + // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables + // addings menu later on. + if (m_invokingWindow) + { + wxMenubarSetInvokingWindow( menu, m_invokingWindow ); + + // 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. - GtkItemFactoryEntry entry; - entry.path = (gchar *)cbuf; // const_cast - entry.accelerator = (gchar*) NULL; - entry.callback = (GtkItemFactoryCallback) NULL; - entry.callback_action = 0; - entry.item_type = ""; + wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame ); - 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 = _T("
/"); - for ( pc = str; *pc != _T('\0'); pc++ ) + 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; + + // TODO + + if ( !GtkAppend(menu, title, (int)pos) ) + return false; + + return true; +} + +wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) +{ + // remove the old item and insert a new one + wxMenu *menuOld = Remove(pos); + if ( menuOld && !Insert(pos, menu, title) ) { - if (*pc == _T('_')) pc++; /* skip it */ - tmp << *pc; + return (wxMenu*) NULL; } - 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 ); + // either Insert() succeeded or Remove() failed and menuOld is NULL + return menuOld; +} - gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner ); +wxMenu *wxMenuBar::Remove(size_t pos) +{ + wxMenu *menu = wxMenuBarBase::Remove(pos); + if ( !menu ) + return (wxMenu*) NULL; -#endif + 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 ); + 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; } - wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { - wxMenuItem *item = (wxMenuItem*)node->Data(); + wxMenuItem *item = node->GetData(); if (item->IsSubMenu()) return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString); - node = node->Next(); + node = node->GetNext(); } return wxNOT_FOUND; } -wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem ) const -{ - if ( menuForItem ) - { - // TODO return the pointer to the menu - - *menuForItem = NULL; - } - - return FindItem(itemId); -} - int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const { - wxNode *node = m_menus.First(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node) { - wxMenu *menu = (wxMenu*)node->Data(); + wxMenu *menu = node->GetData(); int res = FindMenuItemRecursive( menu, menuString, itemString); - if (res != -1) return res; - node = node->Next(); + if (res != -1) + return res; + node = node->GetNext(); } - return -1; + + return wxNOT_FOUND; } // Find a wxMenuItem using its id. Recurses down into sub-menus static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id) { - wxMenuItem* result = menu->FindItem(id); + wxMenuItem* result = menu->FindChildItem(id); - wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while ( node && result == NULL ) { - wxMenuItem *item = (wxMenuItem*)node->Data(); + wxMenuItem *item = node->GetData(); if (item->IsSubMenu()) { result = FindMenuItemByIdRecursive( item->GetSubMenu(), id ); } - node = node->Next(); + node = node->GetNext(); } return result; } -wxMenuItem* wxMenuBar::FindItem( int id ) const +wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const { wxMenuItem* result = 0; - wxNode *node = m_menus.First(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node && result == 0) { - wxMenu *menu = (wxMenu*)node->Data(); + wxMenu *menu = node->GetData(); result = FindMenuItemByIdRecursive( menu, id ); - node = node->Next(); + node = node->GetNext(); + } + + if ( menuForItem ) + { + *menuForItem = result ? result->GetMenu() : (wxMenu *)NULL; } return result; } -void wxMenuBar::Check( int id, bool check ) +void wxMenuBar::EnableTop( size_t pos, bool flag ) { - wxMenuItem* item = FindMenuItemById( id ); + wxMenuList::compatibility_iterator node = m_menus.Item( pos ); - wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") ); + wxCHECK_RET( node, wxT("menu not found") ); - item->Check(check); -} + wxMenu* menu = node->GetData(); -bool wxMenuBar::IsChecked( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked: no such item") ); - - return item->IsChecked(); + if (menu->m_owner) + gtk_widget_set_sensitive( menu->m_owner, flag ); } -void wxMenuBar::Enable( int id, bool enable ) +wxString wxMenuBar::GetLabelTop( size_t pos ) const { - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") ); + wxMenuList::compatibility_iterator node = m_menus.Item( pos ); - item->Enable(enable); -} + wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") ); -bool wxMenuBar::IsEnabled( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); + wxMenu* menu = node->GetData(); - wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled: no such item") ); - - return item->IsEnabled(); -} + 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; + } -wxString wxMenuBar::GetLabel( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); + // don't remove ampersands '&' since if we have them in the menu title + // it means that they were doubled to indicate "&" instead of accelerator - wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel: no such item") ); + label += *pc; + } - return item->GetText(); + return label; } -void wxMenuBar::SetLabel( int id, const wxString &label ) +void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) { - wxMenuItem* item = FindMenuItemById( id ); + wxMenuList::compatibility_iterator node = m_menus.Item( pos ); - wxCHECK_RET( item, _T("wxMenuBar::SetLabel: no such item") ); + wxCHECK_RET( node, wxT("menu not found") ); - item->SetText( label ); -} + wxMenu* menu = node->GetData(); -void wxMenuBar::EnableTop( int pos, bool flag ) -{ - wxNode *node = m_menus.Nth( pos ); + const wxString str( wxReplaceUnderscore( label ) ); - wxCHECK_RET( node, _T("menu not found") ); - - wxMenu* menu = (wxMenu*)node->Data(); + menu->SetTitle( str ); if (menu->m_owner) - gtk_widget_set_sensitive( menu->m_owner, flag ); -} - -wxString wxMenuBar::GetLabelTop( int pos ) const -{ - wxNode *node = m_menus.Nth( pos ); - - wxCHECK_MSG( node, _T("invalid"), _T("menu not found") ); - - wxMenu* menu = (wxMenu*)node->Data(); - - return menu->GetTitle(); -} - -void wxMenuBar::SetLabelTop( int pos, const wxString& label ) -{ - wxNode *node = m_menus.Nth( pos ); - - wxCHECK_RET( node, _T("menu not found") ); - - wxMenu* menu = (wxMenu*)node->Data(); - - menu->SetTitle( label ); -} - -void wxMenuBar::SetHelpString( int id, const wxString& helpString ) -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_RET( item, _T("wxMenuBar::SetHelpString: no such item") ); - - item->SetHelp( helpString ); -} + { + GtkLabel *glabel = GTK_LABEL( GTK_BIN(menu->m_owner)->child ); -wxString wxMenuBar::GetHelpString( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); + /* set new text */ + gtk_label_set( glabel, wxGTK_CONV( str ) ); - wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString: no such item") ); + /* reparse key accel */ + (void)gtk_label_parse_uline (GTK_LABEL(glabel), wxGTK_CONV( str ) ); + gtk_accel_label_refetch( GTK_ACCEL_LABEL(glabel) ); + } - return item->GetHelp(); } //----------------------------------------------------------------------------- // "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; - wxMenuItem* item = menu->FindItem( id ); - wxCHECK_RET( item, _T("error in menu item callback") ); + 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()) { - if (item->GetCheckedFlag() == item->IsChecked()) + 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 */ - item->SetCheckedFlag(item->IsChecked()); /* make consistent again */ - } } - wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id ); - event.SetEventObject( menu ); - event.SetInt(id ); - 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); } - - if (menu->GetEventHandler()->ProcessEvent(event)) - return; - - wxWindow *win = menu->GetInvokingWindow(); - if (win) - win->GetEventHandler()->ProcessEvent( event ); + else + { + // otherwise let the menu have it + menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); + } +} } //----------------------------------------------------------------------------- // "select" //----------------------------------------------------------------------------- +extern "C" { static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -511,17 +642,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(); @@ -536,98 +670,261 @@ 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,wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) + +wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu, + int id, + const wxString& name, + const wxString& help, + wxItemKind kind, + wxMenu *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, + int id, + const wxString& text, + const wxString& help, + bool isCheckable, + wxMenu *subMenu) + : wxMenuItemBase(parentMenu, id, text, help, + isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu) +{ + Init(text); +} -wxMenuItem::wxMenuItem() +void wxMenuItem::Init(const wxString& text) { - m_id = ID_SEPARATOR; - m_isCheckMenu = FALSE; - m_isChecked = FALSE; - m_isEnabled = TRUE; - m_subMenu = (wxMenu *) NULL; + m_labelWidget = (GtkWidget *) NULL; m_menuItem = (GtkWidget *) NULL; + + DoSetText(text); +} + +wxMenuItem::~wxMenuItem() +{ + // don't delete menu items, the menus take care of that +} + +// return the menu item text without any menu accels +/* static */ +wxString wxMenuItemBase::GetLabelFromText(const wxString& text) +{ + wxString label; + + for ( const wxChar *pc = text.c_str(); *pc; pc++ ) + { + if ( *pc == wxT('\t')) + break; + + if ( *pc == wxT('_') ) + { + // GTK 1.2 escapes "xxx_xxx" to "xxx__xxx" + pc++; + label += *pc; + continue; + } + + if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) ) + { + // wxMSW escapes "&" + // "&" is doubled to indicate "&" instead of accelerator + continue; + } + + label += *pc; + } + + // wxPrintf( wxT("GetLabelFromText(): text %s label %s\n"), text.c_str(), label.c_str() ); + + return label; +} + +void wxMenuItem::SetText( const wxString& string ) +{ + wxString str = string; + if ( str.empty() && !IsSeparator() ) + { + wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?")); + str = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR | + wxSTOCK_WITH_MNEMONIC); + } + + // Some optimization to avoid flicker + wxString oldLabel = m_text; + oldLabel = wxStripMenuCodes(oldLabel); + oldLabel.Replace(wxT("_"), wxEmptyString); + wxString label1 = wxStripMenuCodes(str); + wxString oldhotkey = GetHotKey(); // Store the old hotkey in Ctrl-foo format + wxCharBuffer oldbuf = wxGTK_CONV( 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; + if (m_labelWidget) + label = (GtkLabel*) m_labelWidget; + else + label = GTK_LABEL( GTK_BIN(m_menuItem)->child ); + + // set new text + gtk_label_set( label, wxGTK_CONV( m_text ) ); + + // reparse key accel + (void)gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV(m_text) ); + gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) ); + } + + guint accel_key; + GdkModifierType accel_mods; + 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 ); + } + + wxCharBuffer buf = wxGTK_CONV( GetGtkHotKey(*this) ); + 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); + } } // it's valid for this function to be called even if m_menuItem == NULL -void wxMenuItem::SetName( const wxString& str ) +void wxMenuItem::DoSetText( const wxString& str ) { - /* '\t' is the deliminator indicating a hot key */ - m_text = _T(""); + // '\t' is the deliminator indicating a hot key + m_text.Empty(); const wxChar *pc = str; - for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ ) + while ( (*pc != wxT('\0')) && (*pc != wxT('\t')) ) { - if (*pc == _T('&')) + if ((*pc == wxT('&')) && (*(pc+1) == wxT('&'))) { -#if (GTK_MINOR_VERSION > 0) - m_text << _T('_'); - } else - if (*pc == _T('/')) /* we have to filter out slashes ... */ + // "&" is doubled to indicate "&" instead of accelerator + ++pc; + m_text << wxT('&'); + } + else if (*pc == wxT('&')) { - m_text << _T('\\'); /* ... and replace them with back slashes */ -#endif + m_text << wxT('_'); + } + else if ( *pc == wxT('_') ) // escape underscores + { + m_text << wxT("__"); } else - m_text << *pc; + { + m_text << *pc; + } + ++pc; } - /* only GTK 1.2 knows about hot keys */ - m_hotKey = _T(""); -#if (GTK_MINOR_VERSION > 0) - if(*pc == _T('\t')) + m_hotKey = wxEmptyString; + + if(*pc == wxT('\t')) { pc++; m_hotKey = pc; } -#endif +} - if (m_menuItem) +#if wxUSE_ACCEL + +wxAcceleratorEntry *wxMenuItem::GetAccel() const +{ + if ( !GetHotKey() ) { - GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child ); - gtk_label_set( label, m_text.mb_str()); + // nothing + return (wxAcceleratorEntry *)NULL; } + + // accelerator parsing code looks for them after a TAB, so insert a dummy + // one here + wxString label; + label << wxT('\t') << GetHotKey(); + + return wxAcceleratorEntry::Create(label); } +#endif // wxUSE_ACCEL + void wxMenuItem::Check( bool check ) { - wxCHECK_RET( m_menuItem, _T("invalid menu item") ); + wxCHECK_RET( m_menuItem, wxT("invalid menu item") ); + + if (check == m_isChecked) + return; - wxCHECK_RET( IsCheckable(), _T("Can't check uncheckable item!") ) + wxMenuItemBase::Check( check ); - if (check == m_isChecked) return; + switch ( GetKind() ) + { + case wxITEM_CHECK: + case wxITEM_RADIO: + gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check ); + break; - m_isChecked = check; - gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check ); + default: + wxFAIL_MSG( _T("can't check this item") ); + } } void wxMenuItem::Enable( bool enable ) { - wxCHECK_RET( m_menuItem, _T("invalid menu item") ); + wxCHECK_RET( m_menuItem, wxT("invalid menu item") ); gtk_widget_set_sensitive( m_menuItem, enable ); - m_isEnabled = enable; + wxMenuItemBase::Enable( enable ); } bool wxMenuItem::IsChecked() const { - wxCHECK_MSG( m_menuItem, FALSE, _T("invalid menu item") ); - - wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item! + wxCHECK_MSG( m_menuItem, false, wxT("invalid menu item") ); - bool bIsChecked = ((GtkCheckMenuItem*)m_menuItem)->active != 0; + wxCHECK_MSG( IsCheckable(), false, + wxT("can't get state of uncheckable item!") ); - return bIsChecked; + return ((GtkCheckMenuItem*)m_menuItem)->active != 0; } //----------------------------------------------------------------------------- @@ -636,485 +933,630 @@ bool wxMenuItem::IsChecked() const IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler) -void -wxMenu::Init( const wxString& title, - long style, - const wxFunction func - ) +void wxMenu::Init() { - m_title = title; - m_items.DeleteContents( TRUE ); - m_invokingWindow = (wxWindow *) NULL; - m_style = style; - -#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_callback = func; - - m_eventHandler = this; - m_clientData = (void*) NULL; + m_owner = (GtkWidget*) NULL; - if (m_title.IsNull()) m_title = _T(""); - if (m_title != _T("")) + // 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 ) { - Append(-2, m_title); - AppendSeparator(); + GtkWidget *tearoff = gtk_tearoff_menu_item_new(); + + gtk_menu_append(GTK_MENU(m_menu), tearoff); } - m_owner = (GtkWidget*) NULL; + m_prevRadio = 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) + // append the title as the very first entry if we have it + if ( !m_title.empty() ) { - 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" ); + Append(wxGTK_TITLE_ID, m_title); + AppendSeparator(); } -#endif } wxMenu::~wxMenu() { - /* how do we delete an item-factory ? */ - gtk_widget_destroy( m_menu ); - + 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 ); + } } -void wxMenu::SetTitle( const wxString& title ) +bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) { - // TODO Waiting for something better - m_title = title; -} + GtkWidget *menuItem; -const wxString wxMenu::GetTitle() const -{ - return m_title; -} + wxString text; + GtkLabel* label = NULL; -void wxMenu::AppendSeparator() -{ - wxMenuItem *mitem = new wxMenuItem(); - mitem->SetId(ID_SEPARATOR); - -#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? */ - GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "
/sep" ); -#else - GtkWidget *menuItem = gtk_menu_item_new(); - gtk_menu_append( GTK_MENU(m_menu), menuItem ); - gtk_widget_show( menuItem ); -#endif - - mitem->SetMenuItem(menuItem); - m_items.Append( mitem ); -} + if ( mitem->IsSeparator() ) + { + // TODO + menuItem = gtk_menu_item_new(); + } + else if (mitem->GetBitmap().Ok()) + { + text = mitem->GetText(); + const wxBitmap *bitmap = &mitem->GetBitmap(); -static char* GetHotKey( const wxString &hotkey, char *hotbuf ) -{ - if (hotkey.IsEmpty()) return (char*) NULL; + // TODO + wxUnusedVar(bitmap); + menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) ); + label = GTK_LABEL( GTK_BIN(menuItem)->child ); - switch (hotkey[0]) + m_prevRadio = NULL; + } + else // a normal item { - case _T('a'): /* Alt */ - case _T('A'): - case _T('m'): /* Meta */ - case _T('M'): - { - strcpy( hotbuf, "" ); - wxString last = hotkey.Right(1); - strcat( hotbuf, last.mb_str() ); - return hotbuf; - } - case _T('c'): /* Ctrl */ - case _T('C'): - case _T('s'): /* Strg, yeah man, I'm German */ - case _T('S'): - { - strcpy( hotbuf, "" ); - wxString last = hotkey.Right(1); - strcat( hotbuf, last.mb_str() ); - return hotbuf; - } - case _T('F'): /* function keys */ - { - strcpy( hotbuf, hotkey.mb_str() ); - return hotbuf; - } - default: + // text has "_" instead of "&" after mitem->SetText() so don't use it + text = mitem->GetText() ; + + switch ( mitem->GetKind() ) { + case wxITEM_CHECK: + { + menuItem = gtk_check_menu_item_new_with_label( wxGTK_CONV( text ) ); + label = GTK_LABEL( GTK_BIN(menuItem)->child ); + // set new text + gtk_label_set_text( label, wxGTK_CONV( 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_label( group, wxGTK_CONV( text ) ); + label = GTK_LABEL( GTK_BIN(menuItem)->child ); + // set new text + gtk_label_set_text( label, wxGTK_CONV( text ) ); + } + else // continue the radio group + { + group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (m_prevRadio)); + m_prevRadio = menuItem = gtk_radio_menu_item_new_with_label( group, wxGTK_CONV( text ) ); + label = GTK_LABEL( GTK_BIN(menuItem)->child ); + } + break; + } + + default: + wxFAIL_MSG( _T("unexpected menu item kind") ); + // fall through + + case wxITEM_NORMAL: + { + menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) ); + label = GTK_LABEL( GTK_BIN(menuItem)->child ); + m_prevRadio = NULL; + break; + } } - } - return (char*) NULL; -} -void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable ) -{ - wxMenuItem *mitem = new wxMenuItem(); - mitem->SetId(id); - mitem->SetText(item); - mitem->SetHelp(helpStr); - mitem->SetCheckable(checkable); - -#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 (checkable) - entry.item_type = ""; - else - entry.item_type = ""; - - char hotbuf[50]; - entry.accelerator = GetHotKey( mitem->GetHotKey(), hotbuf ); + } - gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ + guint accel_key; + GdkModifierType accel_mods; + wxCharBuffer buf = wxGTK_CONV( GetGtkHotKey(*mitem) ); - /* in order to get the pointer to the item we need the item text _without_ underscores */ - wxString s = _T("
/"); - for ( const wxChar *pc = text; *pc != _T('\0'); pc++ ) + // wxPrintf( wxT("item: %s hotkey %s\n"), mitem->GetText().c_str(), GetGtkHotKey(*mitem).c_str() ); + gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods); + if (accel_key != 0) { - if (*pc == _T('_')) pc++; /* skip it */ - s << *pc; + gtk_widget_add_accelerator (GTK_WIDGET(menuItem), + "activate", + m_accel, + accel_key, + accel_mods, + GTK_ACCEL_VISIBLE); } - GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, s.mb_str() ); + 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); -#else + gtk_widget_show( menuItem ); - GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label( mitem->GetText().mb_str() ) - : gtk_menu_item_new_with_label( mitem->GetText().mb_str() ); + if ( !mitem->IsSeparator() ) + { + wxASSERT_MSG( menuItem, wxT("invalid menuitem") ); - gtk_signal_connect( GTK_OBJECT(menuItem), "activate", - GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), - (gpointer)this ); + gtk_signal_connect( GTK_OBJECT(menuItem), "select", + GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), + (gpointer)this ); - gtk_menu_append( GTK_MENU(m_menu), menuItem ); - gtk_widget_show( menuItem ); + gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", + GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), + (gpointer)this ); -#endif + 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_signal_connect( GTK_OBJECT(menuItem), "select", - GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), - (gpointer)this ); + gtk_widget_show( mitem->GetSubMenu()->m_menu ); - gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", - GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), - (gpointer)this ); + // 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 + { + gtk_signal_connect( GTK_OBJECT(menuItem), "activate", + GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), + (gpointer)this ); + } - mitem->SetMenuItem(menuItem); + guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) ); + if (accel_key != GDK_VoidSymbol) + { + gtk_widget_add_accelerator (menuItem, + "activate_item", + gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)), + accel_key, + GDK_MOD1_MASK, + GTK_ACCEL_LOCKED); + } + } - m_items.Append( mitem ); -} + mitem->SetMenuItem(menuItem); -void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr ) -{ - wxMenuItem *mitem = new wxMenuItem(); - mitem->SetId(id); - mitem->SetText(item); - mitem->SetHelp(helpStr); - -#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 = ""; - - 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 s = _T("
/"); - for ( const wxChar *pc = text; *pc != _T('\0'); pc++ ) + if (ms_locked) { - if (*pc == _T('_')) pc++; /* skip it */ - s << *pc; + // This doesn't even exist! + // gtk_widget_lock_accelerators(mitem->GetMenuItem()); } - GtkWidget *menuItem = gtk_item_factory_get_item( m_factory, s.mb_str() ); - -#else - - GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str()); - - gtk_menu_append( GTK_MENU(m_menu), menuItem ); - gtk_widget_show( menuItem ); - -#endif - - gtk_signal_connect( GTK_OBJECT(menuItem), "select", - GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), - (gpointer*)this ); - - gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", - GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), - (gpointer*)this ); - - gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu ); + return true; +} - mitem->SetMenuItem(menuItem); - mitem->SetSubMenu(subMenu); +wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem) +{ + if (!GtkAppend(mitem)) + return NULL; - m_items.Append( mitem ); + return wxMenuBase::DoAppend(mitem); } -void wxMenu::Append( wxMenuItem *item ) +wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) { - m_items.Append( item ); - - GtkWidget *menuItem = (GtkWidget*) NULL; + if ( !wxMenuBase::DoInsert(pos, item) ) + return NULL; - 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()); + // TODO + if ( !GtkAppend(item, (int)pos) ) + return NULL; - if (!item->IsSeparator()) - { - gtk_signal_connect( GTK_OBJECT(menuItem), "select", - GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), - (gpointer*)this ); + return item; +} - gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", - GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), - (gpointer*)this ); +wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) +{ + if ( !wxMenuBase::DoRemove(item) ) + return (wxMenuItem *)NULL; - if (!item->IsSubMenu()) - { - gtk_signal_connect( GTK_OBJECT(menuItem), "activate", - GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), - (gpointer*)this ); - } - } + // 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_menu_append( GTK_MENU(m_menu), menuItem ); - gtk_widget_show( menuItem ); - item->SetMenuItem(menuItem); + return item; } -int wxMenu::FindItem( const wxString itemString ) const +int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const { - wxString s = _T(""); - for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ ) - { - if (*pc == _T('&')) - { - pc++; /* skip it */ -#if (GTK_MINOR_VERSION > 0) - s << _T('_'); -#endif - } - s << *pc; - } - - wxNode *node = m_items.First(); + wxMenuItemList::compatibility_iterator node = m_items.GetFirst(); while (node) { - wxMenuItem *item = (wxMenuItem*)node->Data(); - if (item->GetText() == s) - { + wxMenuItem *item = node->GetData(); + if (item->GetMenuItem() == menuItem) return item->GetId(); - } - node = node->Next(); + node = node->GetNext(); } return wxNOT_FOUND; } -void wxMenu::Enable( int id, bool enable ) -{ - wxMenuItem *item = FindItem(id); - - wxCHECK_RET( item, _T("wxMenu::Enable: no such item") ); +// ---------------------------------------------------------------------------- +// helpers +// ---------------------------------------------------------------------------- - item->Enable(enable); -} +#if wxUSE_ACCEL -bool wxMenu::IsEnabled( int id ) const +static wxString GetGtkHotKey( const wxMenuItem& item ) { - wxMenuItem *item = FindItem(id); + wxString hotkey; - wxCHECK_MSG( item, FALSE, _T("wxMenu::IsEnabled: no such item") ); + wxAcceleratorEntry *accel = item.GetAccel(); + if ( accel ) + { + int flags = accel->GetFlags(); + if ( flags & wxACCEL_ALT ) + hotkey += wxT(""); + if ( flags & wxACCEL_CTRL ) + hotkey += wxT(""); + if ( flags & wxACCEL_SHIFT ) + hotkey += wxT(""); + + int code = accel->GetKeyCode(); + switch ( code ) + { + case WXK_F1: + case WXK_F2: + case WXK_F3: + case WXK_F4: + case WXK_F5: + case WXK_F6: + case WXK_F7: + case WXK_F8: + case WXK_F9: + case WXK_F10: + case WXK_F11: + case WXK_F12: + 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; + + // 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 ( code < 127 ) + { + wxString name = wxGTK_CONV_BACK( gdk_keyval_name((guint)code) ); + if ( name ) + { + hotkey << name; + break; + } + } + + wxFAIL_MSG( wxT("unknown keyboard accel") ); + } - return item->IsEnabled(); + delete accel; + } + + return hotkey; } -void wxMenu::Check( int id, bool enable ) -{ - wxMenuItem *item = FindItem(id); +#endif // wxUSE_ACCEL - wxCHECK_RET( item, _T("wxMenu::Check: no such item") ); +// ---------------------------------------------------------------------------- +// Pop-up menu stuff +// ---------------------------------------------------------------------------- - item->Check(enable); -} +#if wxUSE_MENUS_NATIVE -bool wxMenu::IsChecked( int id ) const +extern "C" WXDLLIMPEXP_CORE +void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting ) { - wxMenuItem *item = FindItem(id); - - wxCHECK_MSG( item, FALSE, _T("wxMenu::IsChecked: no such item") ); - - return item->IsChecked(); + *is_waiting = false; } -void wxMenu::SetLabel( int id, const wxString &label ) +WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win ) { - wxMenuItem *item = FindItem(id); + menu->SetInvokingWindow( win ); - wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") ); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); + while (node) + { + wxMenuItem *menuitem = node->GetData(); + if (menuitem->IsSubMenu()) + { + SetInvokingWindow( menuitem->GetSubMenu(), win ); + } - item->SetText(label); + node = node->GetNext(); + } } -wxString wxMenu::GetLabel( int id ) const +extern "C" WXDLLIMPEXP_CORE +void wxPopupMenuPositionCallback( GtkMenu *menu, + gint *x, gint *y, + gpointer user_data ) { - wxMenuItem *item = FindItem(id); + // ensure that the menu appears entirely on screen + GtkRequisition req; + gtk_widget_get_child_requisition(GTK_WIDGET(menu), &req); - wxCHECK_MSG( item, _T(""), _T("wxMenu::GetLabel: no such item") ); + wxSize sizeScreen = wxGetDisplaySize(); + wxPoint *pos = (wxPoint*)user_data; - return item->GetText(); + 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; } -void wxMenu::SetHelpString( int id, const wxString& helpString ) +bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) { - wxMenuItem *item = FindItem(id); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") ); - wxCHECK_RET( item, _T("wxMenu::SetHelpString: no such item") ); + wxCHECK_MSG( menu != NULL, false, wxT("invalid popup-menu") ); - item->SetHelp( helpString ); -} + // 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. -wxString wxMenu::GetHelpString( int id ) const -{ - wxMenuItem *item = FindItem(id); + SetInvokingWindow( menu, this ); - wxCHECK_MSG( item, _T(""), _T("wxMenu::GetHelpString: no such item") ); + menu->UpdateUI(); - return item->GetHelp(); -} + bool is_waiting = true; -int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const -{ - wxNode *node = m_items.First(); - while (node) + gulong handler = gtk_signal_connect( GTK_OBJECT(menu->m_menu), + "hide", + GTK_SIGNAL_FUNC(gtk_pop_hide_callback), + (gpointer)&is_waiting ); + + wxPoint pos; + gpointer userdata; + GtkMenuPositionFunc posfunc; + if ( x == -1 && y == -1 ) { - wxMenuItem *item = (wxMenuItem*)node->Data(); - if (item->GetMenuItem() == menuItem) - return item->GetId(); - node = node->Next(); + // use GTK's default positioning algorithm + userdata = NULL; + posfunc = NULL; } - - return wxNOT_FOUND; -} - -wxMenuItem *wxMenu::FindItem(int id) const -{ - wxNode *node = m_items.First(); - while (node) + else { - wxMenuItem *item = (wxMenuItem*)node->Data(); - if (item->GetId() == id) - { - return item; - } - node = node->Next(); + pos = ClientToScreen(wxPoint(x, y)); + userdata = &pos; + posfunc = wxPopupMenuPositionCallback; } - /* Not finding anything here can be correct - * when search the entire menu system for - * an entry -> no error message. */ + wxMenuEvent eventOpen(wxEVT_MENU_OPEN, -1, menu); + DoCommonMenuCallbackCode(menu, eventOpen); - return (wxMenuItem *) NULL; -} + 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 + wxGtkTimeLastClick // the time of activation + ); -void wxMenu::SetInvokingWindow( wxWindow *win ) -{ - m_invokingWindow = win; -} - -wxWindow *wxMenu::GetInvokingWindow() -{ - return m_invokingWindow; -} - -// Update a menu and all submenus recursively. source is the object that has -// the update event handlers defined for it. If NULL, the menu or associated -// window will be used. -void wxMenu::UpdateUI(wxEvtHandler* source) -{ - if (!source && GetInvokingWindow()) - source = GetInvokingWindow()->GetEventHandler(); - if (!source) - source = GetEventHandler(); - if (!source) - source = this; - - wxNode* node = GetItems().First(); - while (node) - { - wxMenuItem* item = (wxMenuItem*) node->Data(); - if ( !item->IsSeparator() ) + while (is_waiting) { - wxWindowID id = item->GetId(); - wxUpdateUIEvent event(id); - event.SetEventObject( source ); - - if (source->ProcessEvent(event)) - { - if (event.GetSetText()) - SetLabel(id, event.GetText()); - if (event.GetSetChecked()) - Check(id, event.GetChecked()); - if (event.GetSetEnabled()) - Enable(id, event.GetEnabled()); - } - - if (item->GetSubMenu()) - item->GetSubMenu()->UpdateUI(source); + gtk_main_iteration(); } - node = node->Next(); - } + + gtk_signal_disconnect(GTK_OBJECT(menu->m_menu), handler); + + wxMenuEvent eventClose(wxEVT_MENU_CLOSE, -1, menu); + DoCommonMenuCallbackCode(menu, eventClose); + + return true; } +#endif // wxUSE_MENUS_NATIVE