X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37d403aa1cf182cfc01e2ce1753c2dda39ba82ea..3a5bcc4db0851bf8cd3063917511b0b17c7f9679:/src/gtk/menu.cpp diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 89b3623f27..1d53ddd74f 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -7,11 +7,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "menu.h" -#pragma implementation "menuitem.h" +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) + #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" @@ -22,8 +25,26 @@ #include "wx/accel.h" #endif // wxUSE_ACCEL -#include -#include +#include "wx/gtk/private.h" + +#include + +// FIXME: is this right? somehow I don't think so (VZ) +#ifdef __WXGTK20__ + #include + + #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) +#else // GTK+ 1.x + #define ACCEL_OBJECT GtkObject + #define ACCEL_OBJECTS(a) (a)->attach_objects + #define ACCEL_OBJ_CAST(obj) GTK_OBJECT(obj) +#endif //----------------------------------------------------------------------------- // idle system @@ -32,19 +53,23 @@ extern void wxapp_install_idle_handler(); extern bool g_isIdle; -#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL +#if wxUSE_ACCEL static wxString GetHotKey( const wxMenuItem& item ); #endif -////// BEGIN CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI ////// +//----------------------------------------------------------------------------- +// substitute for missing GtkPixmapMenuItem +//----------------------------------------------------------------------------- + +#ifndef __WXGTK20__ -#define GTK_TYPE_PIXMAP_MENU_ITEM (gtk_pixmap_menu_item_get_type ()) -#define GTK_PIXMAP_MENU_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PIXMAP_MENU_ITEM, GtkPixmapMenuItem)) +#define GTK_TYPE_PIXMAP_MENU_ITEM (gtk_pixmap_menu_item_get_type ()) +#define GTK_PIXMAP_MENU_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PIXMAP_MENU_ITEM, GtkPixmapMenuItem)) #define GTK_PIXMAP_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PIXMAP_MENU_ITEM, GtkPixmapMenuItemClass)) -#define GTK_IS_PIXMAP_MENU_ITEM(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_PIXMAP_MENU_ITEM)) +#define GTK_IS_PIXMAP_MENU_ITEM(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_PIXMAP_MENU_ITEM)) #define GTK_IS_PIXMAP_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PIXMAP_MENU_ITEM)) //#define GTK_PIXMAP_MENU_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PIXMAP_MENU_ITEM)) -#define GTK_PIXMAP_MENU_ITEM_GET_CLASS(obj) (GTK_PIXMAP_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj))) +#define GTK_PIXMAP_MENU_ITEM_GET_CLASS(obj) (GTK_PIXMAP_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj))) #ifndef GTK_MENU_ITEM_GET_CLASS #define GTK_MENU_ITEM_GET_CLASS(obj) (GTK_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj))) @@ -55,29 +80,25 @@ typedef struct _GtkPixmapMenuItemClass GtkPixmapMenuItemClass; struct _GtkPixmapMenuItem { - GtkMenuItem menu_item; + GtkMenuItem menu_item; - GtkWidget *pixmap; + GtkWidget *pixmap; }; struct _GtkPixmapMenuItemClass { - GtkMenuItemClass parent_class; + GtkMenuItemClass parent_class; - guint orig_toggle_size; - guint have_pixmap_count; + guint orig_toggle_size; + guint have_pixmap_count; }; -GtkType gtk_pixmap_menu_item_get_type (void); -GtkWidget* gtk_pixmap_menu_item_new (void); -void gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item, - GtkWidget *pixmap); -/* Added by JACS */ - -GtkWidget* gtk_pixmap_menu_item_new_with_label (const gchar *label, GtkWidget** labelWidget); - -////// END CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI ////// +GtkType gtk_pixmap_menu_item_get_type (void); +GtkWidget* gtk_pixmap_menu_item_new (void); +void gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item, + GtkWidget *pixmap); +#endif // GTK 2.0 //----------------------------------------------------------------------------- // idle system @@ -86,38 +107,60 @@ GtkWidget* gtk_pixmap_menu_item_new_with_label (const gchar *label, GtkWidget** static wxString wxReplaceUnderscore( const wxString& title ) { const wxChar *pc; - - /* GTK 1.2 wants to have "_" instead of "&" for accelerators */ + + // GTK 1.2 wants to have "_" instead of "&" for accelerators wxString str; - for ( pc = title; *pc != wxT('\0'); pc++ ) + pc = title; + while (*pc != wxT('\0')) { - if (*pc == wxT('&')) + if ((*pc == wxT('&')) && (*(pc+1) == wxT('&'))) { -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) - str << wxT('_'); + // "&" is doubled to indicate "&" instead of accelerator + ++pc; + str << wxT('&'); } - else if (*pc == wxT('/')) + else if (*pc == wxT('&')) { - str << wxT('\\'); -#endif + str << wxT('_'); } 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; } + ++pc; } + + // wxPrintf( wxT("before %s after %s\n"), title.c_str(), str.c_str() ); + return str; } +//----------------------------------------------------------------------------- +// activate message from GTK +//----------------------------------------------------------------------------- + +static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu ) +{ + if (g_isIdle) wxapp_install_idle_handler(); + + wxMenuEvent event( wxEVT_MENU_OPEN, -1, menu ); + event.SetEventObject( menu ); + + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(event)) + return; + + wxWindow *win = menu->GetInvokingWindow(); + if (win) win->GetEventHandler()->ProcessEvent( event ); +} + //----------------------------------------------------------------------------- // wxMenuBar //----------------------------------------------------------------------------- @@ -126,7 +169,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow) wxMenuBar::wxMenuBar( long style ) { - /* the parent window is known after wxFrame::SetMenu() */ + // the parent window is known after wxFrame::SetMenu() m_needParent = FALSE; m_style = style; m_invokingWindow = (wxWindow*) NULL; @@ -138,15 +181,9 @@ 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(); +#ifndef __WXGTK20__ + m_accel = gtk_accel_group_new(); #endif if (style & wxMB_DOCKABLE) @@ -167,7 +204,7 @@ wxMenuBar::wxMenuBar( long style ) wxMenuBar::wxMenuBar() { - /* the parent window is known after wxFrame::SetMenu() */ + // the parent window is known after wxFrame::SetMenu() m_needParent = FALSE; m_style = 0; m_invokingWindow = (wxWindow*) NULL; @@ -179,15 +216,9 @@ wxMenuBar::wxMenuBar() 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(); +#ifndef __WXGTK20__ + m_accel = gtk_accel_group_new(); #endif m_widget = GTK_WIDGET(m_menubar); @@ -199,23 +230,22 @@ wxMenuBar::wxMenuBar() 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) ); +#ifndef __WXGTK20__ + // support for native hot keys + gtk_accel_group_detach( menu->m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) ); #endif - wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { wxMenuItem *menuitem = node->GetData(); @@ -229,18 +259,16 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( 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 hot keys */ - GtkObject *obj = GTK_OBJECT(top_frame->m_widget); - if ( !g_slist_find( menu->m_accel->attach_objects, obj ) ) + // 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 ); -#endif - wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { wxMenuItem *menuitem = node->GetData(); @@ -253,18 +281,18 @@ 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 */ - GtkObject *obj = GTK_OBJECT(top_frame->m_widget); - if ( !g_slist_find( m_accel->attach_objects, obj ) ) +#ifndef __WXGTK20__ + // 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 ); #endif - wxMenuList::Node *node = m_menus.GetFirst(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node) { wxMenu *menu = node->GetData(); @@ -276,16 +304,16 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win ) 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) ); + +#ifndef __WXGTK20__ + // support for native key accelerators indicated by underscroes + gtk_accel_group_detach( m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) ); #endif - wxMenuList::Node *node = m_menus.GetFirst(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node) { wxMenu *menu = node->GetData(); @@ -306,57 +334,58 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) { wxString str( wxReplaceUnderscore( title ) ); - /* 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 = ""; - - 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("
/"); - const wxChar *pc; - for ( pc = str; *pc != wxT('\0'); pc++ ) + // The "m_owner" is the "menu item" +#ifdef __WXGTK20__ + menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) ); +#else + 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) { - // 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; + 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); } - 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 +#endif - 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 ); - -#endif + + gtk_menu_shell_append( GTK_MENU_SHELL(m_menubar), menu->m_owner ); + + gtk_signal_connect( GTK_OBJECT(menu->m_owner), "activate", + GTK_SIGNAL_FUNC(gtk_menu_open_callback), + (gpointer)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 ); + // 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; } @@ -365,30 +394,12 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) if ( !wxMenuBarBase::Insert(pos, menu, title) ) 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 + // TODO + if ( !GtkAppend(menu, title) ) return FALSE; - if (pos+1 >= m_menus.GetCount()) - return TRUE; - - 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 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 } wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) @@ -404,18 +415,43 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) return menuOld; } +static wxMenu *CopyMenu (wxMenu *menu) +{ + wxMenu *menucopy = new wxMenu (); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); + while (node) + { + wxMenuItem *item = node->GetData(); + int itemid = item->GetId(); + wxString text = item->GetText(); + text.Replace(wxT("_"), wxT("&")); + wxMenu *submenu = item->GetSubMenu(); + if (!submenu) + { + wxMenuItem* itemcopy = new wxMenuItem(menucopy, + itemid, text, + menu->GetHelpString(itemid)); + itemcopy->SetBitmap(item->GetBitmap()); + itemcopy->SetCheckable(item->IsCheckable()); + menucopy->Append(itemcopy); + } + else + menucopy->Append (itemid, text, CopyMenu(submenu), + menu->GetHelpString(itemid)); + + node = node->GetNext(); + } + + return menucopy; +} + wxMenu *wxMenuBar::Remove(size_t pos) { wxMenu *menu = wxMenuBarBase::Remove(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 ) ); -*/ + wxMenu *menucopy = CopyMenu( menu ); // unparent calls unref() and that would delete the widget so we raise // the ref count to 2 artificially before invoking unparent. @@ -423,11 +459,18 @@ wxMenu *wxMenuBar::Remove(size_t pos) gtk_widget_unparent( menu->m_menu ); gtk_widget_destroy( menu->m_owner ); + delete menu; -/* - 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 = menucopy; + + if (m_invokingWindow) + { + // OPTIMISE ME: see comment in GtkAppend + wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame ); + + if( frame ) + frame->UpdateMenuBarSize(); + } return menu; } @@ -441,7 +484,7 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString return res; } - wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { wxMenuItem *item = node->GetData(); @@ -456,7 +499,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(); @@ -474,7 +517,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(); @@ -491,7 +534,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(); @@ -509,7 +552,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") ); @@ -521,7 +564,7 @@ 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") ); @@ -529,28 +572,26 @@ wxString wxMenuBar::GetLabelTop( size_t pos ) const wxString label; wxString text( menu->GetTitle() ); -#if (GTK_MINOR_VERSION > 0) for ( const wxChar *pc = text.c_str(); *pc; pc++ ) { - if ( *pc == wxT('_') || *pc == wxT('&') ) + if ( *pc == wxT('_') ) { - // '_' is the escape character for GTK+ and '&' is the one for - // wxWindows - skip both of them + // '_' 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; } -#else // GTK+ 1.0 - label = text; -#endif // GTK+ 1.2/1.0 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") ); @@ -565,10 +606,10 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child ); /* set new text */ - gtk_label_set( label, str.mb_str()); + gtk_label_set( label, wxGTK_CONV( str ) ); /* reparse key accel */ - (void)gtk_label_parse_uline (GTK_LABEL(label), str.mb_str() ); + (void)gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( str ) ); gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) ); } @@ -580,12 +621,14 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) 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; @@ -595,39 +638,55 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) 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 ); - if (item->IsCheckable()) - event.SetInt( item->IsChecked() ); -#if wxUSE_MENU_CALLBACK - if (menu->GetCallback()) + // Is this menu on a menubar? (possibly nested) + wxFrame* frame = NULL; + wxMenu* pm = menu; + while ( pm && !frame ) { - (void) (*(menu->GetCallback())) (*menu, event); - return; + if ( pm->IsAttached() ) + frame = pm->GetMenuBar()->GetFrame(); + pm = pm->GetParent(); } -#endif // wxUSE_MENU_CALLBACK - if (menu->GetEventHandler()->ProcessEvent(event)) - return; - - wxWindow *win = menu->GetInvokingWindow(); - if (win) - win->GetEventHandler()->ProcessEvent( event ); + // FIXME: why do we have to call wxFrame::GetEventHandler() directly here? + // normally wxMenu::SendEvent() should be enough, if it doesn't work + // in wxGTK then we have a bug in wxMenu::GetInvokingWindow() which + // should be fixed instead of working around it here... + if (frame) + { + // If it is attached then let the frame send the event. + // Don't call frame->ProcessCommand(id) because it toggles + // checkable items and we've already done that above. + wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id); + commandEvent.SetEventObject(frame); + if (item->IsCheckable()) + commandEvent.SetInt(item->IsChecked()); + commandEvent.SetEventObject(menu); + + frame->GetEventHandler()->ProcessEvent(commandEvent); + } + else + { + // otherwise let the menu have it + menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); + } } //----------------------------------------------------------------------------- @@ -648,7 +707,8 @@ 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(); @@ -673,7 +733,8 @@ 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(); @@ -685,16 +746,27 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) // 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, @@ -703,15 +775,14 @@ 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; @@ -728,81 +799,113 @@ wxMenuItem::~wxMenuItem() wxString wxMenuItemBase::GetLabelFromText(const wxString& text) { wxString label; -#if (GTK_MINOR_VERSION > 0) + for ( const wxChar *pc = text.c_str(); *pc; pc++ ) { - if ( *pc == wxT('_') || *pc == wxT('&') ) + if ( *pc == wxT('_') ) { - // '_' is the escape character for GTK+ and '&' is the one for - // wxWindows - skip both of them + // GTK 1.2 escapes "xxx_xxx" to "xxx__xxx" + pc++; + label += *pc; + continue; + } + +#ifdef __WXGTK20__ + if ( *pc == wxT('\\') ) + { + // GTK 2.0 escapes "xxx/xxx" to "xxx\/xxx" + pc++; + label += *pc; + continue; + } +#endif + + if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) ) + { + // wxMSW escapes "&" + // "&" is doubled to indicate "&" instead of accelerator continue; } label += *pc; } -#else // GTK+ 1.0 - label = 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 ) { + // Some optimization to avoid flicker + wxString oldLabel = m_text; + oldLabel = wxStripMenuCodes(oldLabel.BeforeFirst('\t')); + oldLabel.Replace(wxT("_"), wxT("")); + wxString label1 = wxStripMenuCodes(str.BeforeFirst('\t')); + if (oldLabel == label1) + return; + DoSetText(str); if (m_menuItem) { GtkLabel *label; if (m_labelWidget) - label = (GtkLabel*) m_labelWidget; + label = (GtkLabel*) m_labelWidget; else - label = GTK_LABEL( GTK_BIN(m_menuItem)->child ); + label = GTK_LABEL( GTK_BIN(m_menuItem)->child ); - /* set new text */ - gtk_label_set( label, m_text.mb_str()); +#ifdef __WXGTK20__ + gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV(m_text) ); +#else + // set new text + gtk_label_set( label, wxGTK_CONV( m_text ) ); - /* reparse key accel */ - (void)gtk_label_parse_uline (GTK_LABEL(label), m_text.mb_str() ); + // reparse key accel + (void)gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV(m_text) ); gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) ); +#endif } } // it's valid for this function to be called even if m_menuItem == NULL void wxMenuItem::DoSetText( const wxString& str ) { - /* '\t' is the deliminator indicating a hot key */ + // '\t' is the deliminator indicating a hot key m_text.Empty(); 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('&'))) + { + // "&" is doubled to indicate "&" instead of accelerator + ++pc; + m_text << wxT('&'); + } + else if (*pc == wxT('&')) { -#if (GTK_MINOR_VERSION > 0) m_text << wxT('_'); } else if ( *pc == wxT('_') ) // escape underscores { m_text << wxT("__"); } - else if (*pc == wxT('/')) /* we have to filter out slashes ... */ + else { - m_text << wxT('\\'); /* ... and replace them with back slashes */ -#endif - } - else m_text << *pc; + } + ++pc; } - /* only GTK 1.2 knows about hot keys */ + // wxPrintf( wxT("DoSetText(): str %s m_text %s\n"), str.c_str(), m_text.c_str() ); + m_hotKey = wxT(""); -#if (GTK_MINOR_VERSION > 0) + if(*pc == wxT('\t')) { pc++; m_hotKey = pc; } -#endif } #if wxUSE_ACCEL @@ -828,13 +931,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_state( (GtkCheckMenuItem*)m_menuItem, (gint)check ); + break; + + default: + wxFAIL_MSG( _T("can't check this item") ); + } } void wxMenuItem::Enable( bool enable ) @@ -855,16 +966,6 @@ bool wxMenuItem::IsChecked() const 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 //----------------------------------------------------------------------------- @@ -873,32 +974,22 @@ 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(); 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. */ + // 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" ); - } -#endif + GtkWidget *tearoff = gtk_tearoff_menu_item_new(); + + gtk_menu_append(GTK_MENU(m_menu), tearoff); + } + + m_prevRadio = NULL; // append the title as the very first entry if we have it if ( !!m_title ) @@ -910,146 +1001,284 @@ void wxMenu::Init() wxMenu::~wxMenu() { - m_items.Clear(); + WX_CLEAR_LIST(wxMenuItemList, m_items); - gtk_widget_destroy( m_menu ); - - gtk_object_unref( GTK_OBJECT(m_factory) ); + if ( GTK_IS_WIDGET( m_menu )) + gtk_widget_destroy( m_menu ); } bool wxMenu::GtkAppend(wxMenuItem *mitem) { GtkWidget *menuItem; - bool appended = FALSE; - 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 +#ifdef __WXGTK20__ + menuItem = gtk_separator_menu_item_new(); +#else + // TODO menuItem = gtk_menu_item_new(); -#endif // GTK 1.2/1.0 +#endif + gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem); + } else if ( mitem->IsSubMenu() ) { -#if (GTK_MINOR_VERSION > 0) - /* text has "_" instead of "&" after mitem->SetText() */ + // 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 +#ifdef __WXGTK20__ + menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( text ) ); +#else + menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) ); + GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child ); + // set new text + gtk_label_set_text( label, wxGTK_CONV( text ) ); + // reparse key accel + 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); + } +#endif gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu ); + gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem); + + 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); + + m_prevRadio = NULL; } - else if (mitem->GetBitmap().Ok()) // An item with bitmap + else if (mitem->GetBitmap().Ok()) { - //// UNFINISHED, because I don't know how to handle hotkeys and - //// accelerators :-( + wxString text = mitem->GetText(); + const wxBitmap *bitmap = &mitem->GetBitmap(); + GdkPixmap *gdk_pixmap = bitmap->GetPixmap(); + GdkBitmap *gdk_bitmap = bitmap->GetMask() ? bitmap->GetMask()->GetBitmap() : (GdkBitmap*) NULL; + +#ifdef __WXGTK20__ + menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV( text ) ); + + GtkWidget *image = gtk_image_new_from_pixmap( gdk_pixmap, gdk_bitmap ); + gtk_widget_show(image); + + gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(menuItem), image ); + + gtk_signal_connect( GTK_OBJECT(menuItem), "activate", + GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), + (gpointer)this ); + + gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem); +#else + + menuItem = gtk_pixmap_menu_item_new (); + GtkWidget *label = gtk_accel_label_new ( wxGTK_CONV( text ) ); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_container_add (GTK_CONTAINER (menuItem), label); + + gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuItem); + guint accel_key; + GdkModifierType accel_mods; + + // accelerator for the item, as specified by its label + // (ex. Ctrl+O for open) + gtk_accelerator_parse(GetHotKey(*mitem).c_str(), &accel_key, + &accel_mods); + if (accel_key != GDK_VoidSymbol) + { + gtk_widget_add_accelerator (menuItem, + "activate_item", + m_accel, + accel_key, accel_mods, + GTK_ACCEL_VISIBLE); + } + + // accelerator for the underlined char (ex ALT+F for the File menu) + 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); + } - GtkWidget* labelWidget; - menuItem = gtk_pixmap_menu_item_new_with_label(mitem->GetText().mb_str(), &labelWidget); - //menuItem = gtk_pixmap_menu_item_new_with_label("", &labelWidget); - mitem->SetLabelWidget(labelWidget); + gtk_widget_show (label); - //// TODO: should we store the widget somewhere to avoid a memory leak? - GtkWidget* w = gtk_pixmap_new(mitem->GetBitmap().GetPixmap(), mitem->GetBitmap().GetMask() ? mitem->GetBitmap().GetMask()->GetBitmap() : (GdkBitmap* )NULL); - gtk_widget_show(w); - gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM( menuItem ), w); + mitem->SetLabelWidget(label); + + GtkWidget* pixmap = gtk_pixmap_new( gdk_pixmap, gdk_bitmap ); + gtk_widget_show(pixmap); + gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM( menuItem ), pixmap); gtk_signal_connect( GTK_OBJECT(menuItem), "activate", GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), (gpointer)this ); + gtk_menu_append( GTK_MENU(m_menu), menuItem ); gtk_widget_show( menuItem ); +#endif - //mitem->SetMenuItem(menuItem); - //mitem->SetText(mitem->GetText()); - - appended = TRUE; // We've done this, don't do it again + m_prevRadio = NULL; } else // a normal item { -#if (GTK_MINOR_VERSION > 0) - /* text has "_" instead of "&" after mitem->SetText() */ + // text has "_" instead of "&" after mitem->SetText() so don't use it 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; + switch ( mitem->GetKind() ) + { + case wxITEM_CHECK: + { +#ifdef __WXGTK20__ + menuItem = gtk_check_menu_item_new_with_mnemonic( wxGTK_CONV( text ) ); +#else + menuItem = gtk_check_menu_item_new_with_label( wxGTK_CONV( text ) ); + GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child ); + // set new text + gtk_label_set_text( label, wxGTK_CONV( text ) ); + // reparse key accel + 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); + } +#endif + 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[50]; // must be big enougg - wxString tmp( GetHotKey(*mitem) ); - strncpy(s_accel, tmp.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() ); + case wxITEM_RADIO: + { + GSList *group = NULL; + if ( m_prevRadio == NULL ) + { + // start of a new radio group +#ifdef __WXGTK20__ + m_prevRadio = menuItem = gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV( text ) ); +#else + m_prevRadio = menuItem = gtk_radio_menu_item_new_with_label( group, wxGTK_CONV( text ) ); + GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child ); + // set new text + gtk_label_set_text( label, wxGTK_CONV( text ) ); + // reparse key accel + 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); + } +#endif + } + else // continue the radio group + { +#ifdef __WXGTK20__ + 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( text ) ); +#else + 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 ) ); + GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child ); + // set new text + gtk_label_set_text( label, wxGTK_CONV( text ) ); + // reparse key accel + 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); + } +#endif + } + break; + } + + default: + wxFAIL_MSG( _T("unexpected menu item kind") ); + // fall through + + case wxITEM_NORMAL: + { +#ifdef __WXGTK20__ + menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( text ) ); +#else + menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) ); + GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child ); + // set new text + gtk_label_set_text( label, wxGTK_CONV( text ) ); + // reparse key accel + 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); + } +#endif + m_prevRadio = NULL; + break; + } + } gtk_signal_connect( GTK_OBJECT(menuItem), "activate", GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), (gpointer)this ); -#endif // GTK+ 1.2/1.0 + + gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem); } + + guint accel_key; + GdkModifierType accel_mods; + wxCharBuffer buf = wxGTK_CONV( GetHotKey(*mitem) ); + + // wxPrintf( wxT("item: %s hotkey %s\n"), mitem->GetText().c_str(), GetHotKey(*mitem).c_str() ); + + 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); + } + + gtk_widget_show( menuItem ); if ( !mitem->IsSeparator() ) { + wxASSERT_MSG( menuItem, wxT("invalid menuitem") ); + gtk_signal_connect( GTK_OBJECT(menuItem), "select", GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), (gpointer)this ); @@ -1059,54 +1288,35 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) (gpointer)this ); } -#if GTK_MINOR_VERSION == 0 - if (!appended) + mitem->SetMenuItem(menuItem); + + if (ms_locked) { - gtk_menu_append( GTK_MENU(m_menu), menuItem ); - gtk_widget_show( menuItem ); + // This doesn't even exist! + // gtk_widget_lock_accelerators(mitem->GetMenuItem()); } -#endif // GTK+ 1.0 - - mitem->SetMenuItem(menuItem); 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 + // TODO if ( !GtkAppend(item) ) - return FALSE; + return NULL; - if ( m_style & wxMENU_TEAROFF ) - { - // change the position as the first item is the tear-off marker - pos++; - } - - 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") ); - - return FALSE; -#endif // GTK 1.2/1.0 + return item; } wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) @@ -1123,13 +1333,13 @@ 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(); + node = node->GetNext(); } return wxNOT_FOUND; @@ -1139,7 +1349,8 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const // helpers // ---------------------------------------------------------------------------- -#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL +#if wxUSE_ACCEL + static wxString GetHotKey( const wxMenuItem& item ) { wxString hotkey; @@ -1172,8 +1383,10 @@ static wxString GetHotKey( const wxMenuItem& item ) case WXK_F12: hotkey << wxT('F') << code - WXK_F1 + 1; break; - - // GTK seems to use XStringToKeySym 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_NUMPAD_INSERT: hotkey << wxT("KP_Insert" ); break; @@ -1186,16 +1399,48 @@ static wxString GetHotKey( const wxMenuItem& item ) case WXK_DELETE: hotkey << wxT("Delete" ); break; + case WXK_UP: + hotkey << wxT("Up" ); + break; + case WXK_DOWN: + hotkey << wxT("Down" ); + break; + case WXK_PAGEUP: + case WXK_PRIOR: + hotkey << wxT("Prior" ); + break; + case WXK_PAGEDOWN: + case WXK_NEXT: + hotkey << wxT("Next" ); + 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; - // if there are any other keys wxGetAccelFromString() may return, - // we should process them here + // if there are any other keys wxGetAccelFromString() 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") ); @@ -1206,10 +1451,15 @@ static wxString GetHotKey( const wxMenuItem& item ) return hotkey; } + #endif // wxUSE_ACCEL -////// BEGIN CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI ////// +//----------------------------------------------------------------------------- +// substitute for missing GtkPixmapMenuItem +//----------------------------------------------------------------------------- + +#ifndef __WXGTK20__ /* * Copyright (C) 1998, 1999, 2000 Free Software Foundation @@ -1238,38 +1488,42 @@ static wxString GetHotKey( const wxMenuItem& item ) /* Author: Dietmar Maurer */ -//#include "gtkpixmapmenuitem.h" #include #include #include #include #include +extern "C" +{ + static void gtk_pixmap_menu_item_class_init (GtkPixmapMenuItemClass *klass); static void gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item); static void gtk_pixmap_menu_item_draw (GtkWidget *widget, - GdkRectangle *area); + GdkRectangle *area); static gint gtk_pixmap_menu_item_expose (GtkWidget *widget, - GdkEventExpose *event); + GdkEventExpose *event); /* we must override the following functions */ static void gtk_pixmap_menu_item_map (GtkWidget *widget); static void gtk_pixmap_menu_item_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); + GtkAllocation *allocation); static void gtk_pixmap_menu_item_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data); + gboolean include_internals, + GtkCallback callback, + gpointer callback_data); static void gtk_pixmap_menu_item_size_request (GtkWidget *widget, - GtkRequisition *requisition); + GtkRequisition *requisition); static void gtk_pixmap_menu_item_remove (GtkContainer *container, - GtkWidget *child); + GtkWidget *child); static void changed_have_pixmap_status (GtkPixmapMenuItem *menu_item); static GtkMenuItemClass *parent_class = NULL; +} + #define BORDER_SPACING 3 #define PMAP_WIDTH 20 @@ -1282,7 +1536,7 @@ gtk_pixmap_menu_item_get_type (void) { GtkTypeInfo pixmap_menu_item_info = { - "GtkPixmapMenuItem", + (char *)"GtkPixmapMenuItem", sizeof (GtkPixmapMenuItem), sizeof (GtkPixmapMenuItemClass), (GtkClassInitFunc) gtk_pixmap_menu_item_class_init, @@ -1292,8 +1546,8 @@ gtk_pixmap_menu_item_get_type (void) (GtkClassInitFunc) NULL, }; - pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (), - &pixmap_menu_item_info); + pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (), + &pixmap_menu_item_info); } return pixmap_menu_item_type; @@ -1302,7 +1556,7 @@ gtk_pixmap_menu_item_get_type (void) /** * gtk_pixmap_menu_item_new * - * Creates a new pixmap menu item. Use gtk_pixmap_menu_item_set_pixmap() + * Creates a new pixmap menu item. Use gtk_pixmap_menu_item_set_pixmap() * to set the pixmap wich is displayed at the left side. * * Returns: @@ -1355,7 +1609,7 @@ gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item) static void gtk_pixmap_menu_item_draw (GtkWidget *widget, - GdkRectangle *area) + GdkRectangle *area) { g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget)); @@ -1364,7 +1618,7 @@ gtk_pixmap_menu_item_draw (GtkWidget *widget, if (GTK_WIDGET_CLASS (parent_class)->draw) (* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area); - if (GTK_WIDGET_DRAWABLE (widget) && + if (GTK_WIDGET_DRAWABLE (widget) && GTK_PIXMAP_MENU_ITEM(widget)->pixmap) { gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL); } @@ -1372,7 +1626,7 @@ gtk_pixmap_menu_item_draw (GtkWidget *widget, static gint gtk_pixmap_menu_item_expose (GtkWidget *widget, - GdkEventExpose *event) + GdkEventExpose *event) { g_return_val_if_fail (widget != NULL, FALSE); g_return_val_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget), FALSE); @@ -1381,7 +1635,7 @@ gtk_pixmap_menu_item_expose (GtkWidget *widget, if (GTK_WIDGET_CLASS (parent_class)->expose_event) (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event); - if (GTK_WIDGET_DRAWABLE (widget) && + if (GTK_WIDGET_DRAWABLE (widget) && GTK_PIXMAP_MENU_ITEM(widget)->pixmap) { gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL); } @@ -1400,7 +1654,7 @@ gtk_pixmap_menu_item_expose (GtkWidget *widget, void gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item, - GtkWidget *pixmap) + GtkWidget *pixmap) { g_return_if_fail (menu_item != NULL); g_return_if_fail (pixmap != NULL); @@ -1414,16 +1668,16 @@ gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item, if (GTK_WIDGET_REALIZED (pixmap->parent) && !GTK_WIDGET_REALIZED (pixmap)) gtk_widget_realize (pixmap); - - if (GTK_WIDGET_VISIBLE (pixmap->parent)) { + + if (GTK_WIDGET_VISIBLE (pixmap->parent)) { if (GTK_WIDGET_MAPPED (pixmap->parent) && - GTK_WIDGET_VISIBLE(pixmap) && + GTK_WIDGET_VISIBLE(pixmap) && !GTK_WIDGET_MAPPED (pixmap)) gtk_widget_map (pixmap); } changed_have_pixmap_status(menu_item); - + if (GTK_WIDGET_VISIBLE (pixmap) && GTK_WIDGET_VISIBLE (menu_item)) gtk_widget_queue_resize (pixmap); } @@ -1448,7 +1702,7 @@ gtk_pixmap_menu_item_map (GtkWidget *widget) static void gtk_pixmap_menu_item_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) + GtkAllocation *allocation) { GtkPixmapMenuItem *pmenu_item; @@ -1465,8 +1719,8 @@ gtk_pixmap_menu_item_size_allocate (GtkWidget *widget, child_allocation.height = pmenu_item->pixmap->requisition.height; child_allocation.x = border_width + BORDER_SPACING; child_allocation.y = (border_width + BORDER_SPACING - + (((allocation->height - child_allocation.height) - child_allocation.x) - / 2)); /* center pixmaps vertically */ + + (((allocation->height - child_allocation.height) - child_allocation.x) + / 2)); /* center pixmaps vertically */ gtk_widget_size_allocate (pmenu_item->pixmap, &child_allocation); } @@ -1476,9 +1730,9 @@ gtk_pixmap_menu_item_size_allocate (GtkWidget *widget, static void gtk_pixmap_menu_item_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data) + gboolean include_internals, + GtkCallback callback, + gpointer callback_data) { GtkPixmapMenuItem *menu_item; @@ -1492,12 +1746,12 @@ gtk_pixmap_menu_item_forall (GtkContainer *container, (* callback) (menu_item->pixmap, callback_data); GTK_CONTAINER_CLASS(parent_class)->forall(container,include_internals, - callback,callback_data); + callback,callback_data); } static void gtk_pixmap_menu_item_size_request (GtkWidget *widget, - GtkRequisition *requisition) + GtkRequisition *requisition) { GtkPixmapMenuItem *menu_item; GtkRequisition req = {0, 0}; @@ -1509,7 +1763,7 @@ gtk_pixmap_menu_item_size_request (GtkWidget *widget, GTK_WIDGET_CLASS(parent_class)->size_request(widget,requisition); menu_item = GTK_PIXMAP_MENU_ITEM (widget); - + if (menu_item->pixmap) gtk_widget_size_request(menu_item->pixmap, &req); @@ -1519,7 +1773,7 @@ gtk_pixmap_menu_item_size_request (GtkWidget *widget, static void gtk_pixmap_menu_item_remove (GtkContainer *container, - GtkWidget *child) + GtkWidget *child) { GtkBin *bin; gboolean widget_was_visible; @@ -1530,19 +1784,19 @@ gtk_pixmap_menu_item_remove (GtkContainer *container, g_return_if_fail (GTK_IS_WIDGET (child)); bin = GTK_BIN (container); - g_return_if_fail ((bin->child == child || - (GTK_PIXMAP_MENU_ITEM(container)->pixmap == child))); + g_return_if_fail ((bin->child == child || + (GTK_PIXMAP_MENU_ITEM(container)->pixmap == child))); widget_was_visible = GTK_WIDGET_VISIBLE (child); - + gtk_widget_unparent (child); if (bin->child == child) - bin->child = NULL; + bin->child = NULL; else { GTK_PIXMAP_MENU_ITEM(container)->pixmap = NULL; changed_have_pixmap_status(GTK_PIXMAP_MENU_ITEM(container)); } - + if (widget_was_visible) gtk_widget_queue_resize (GTK_WIDGET (container)); } @@ -1564,7 +1818,7 @@ changed_have_pixmap_status (GtkPixmapMenuItem *menu_item) if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 0) { /* Install normal toggle size */ - GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size; + GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size; } } @@ -1573,30 +1827,9 @@ changed_have_pixmap_status (GtkPixmapMenuItem *menu_item) this function is called, we get the same effect, just because of how the preferences option to show pixmaps works. Bogus, broken. */ - if (GTK_WIDGET_VISIBLE(GTK_WIDGET(menu_item))) + if (GTK_WIDGET_VISIBLE(GTK_WIDGET(menu_item))) gtk_widget_queue_resize(GTK_WIDGET(menu_item)); } -/* Added by JACS */ - -GtkWidget* -gtk_pixmap_menu_item_new_with_label (const gchar *label, GtkWidget** labelWidget) -{ - GtkWidget *menu_item; - GtkWidget *accel_label; - - menu_item = gtk_pixmap_menu_item_new (); - accel_label = gtk_accel_label_new (label); - if (labelWidget) - *labelWidget = accel_label; - gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5); - - gtk_container_add (GTK_CONTAINER (menu_item), accel_label); - gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label), menu_item); - gtk_widget_show (accel_label); - - return menu_item; -} - -////// END CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI ////// +#endif