X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..3ec704b4221ee4d66ebb1cb98f1dc1017f68bec3:/src/gtk/menu.cpp diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index d72ee3bd41..782c17ce7b 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.cpp -// Purpose: +// Name: src/gtk/menu.cpp +// Purpose: implementation of wxMenuBar and wxMenu classes for wxGTK // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling @@ -10,157 +10,47 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_MENUS + #include "wx/menu.h" -#include "wx/log.h" -#include "wx/intl.h" -#include "wx/app.h" -#include "wx/bitmap.h" -#if wxUSE_ACCEL - #include "wx/accel.h" -#endif // wxUSE_ACCEL +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/frame.h" + #include "wx/bitmap.h" + #include "wx/app.h" +#endif +#include "wx/accel.h" +#include "wx/stockitem.h" #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 +#include "wx/gtk/private/mnemonics.h" // we use normal item but with a special id for the menu title static const int wxGTK_TITLE_ID = -3; -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - -#if wxUSE_ACCEL -static wxString GetGtkHotKey( const wxMenuItem& item ); -#endif - -//----------------------------------------------------------------------------- -// 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_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_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))) - -#ifndef GTK_MENU_ITEM_GET_CLASS -#define GTK_MENU_ITEM_GET_CLASS(obj) (GTK_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj))) -#endif - -typedef struct _GtkPixmapMenuItem GtkPixmapMenuItem; -typedef struct _GtkPixmapMenuItemClass GtkPixmapMenuItemClass; - -struct _GtkPixmapMenuItem -{ - GtkMenuItem menu_item; - - GtkWidget *pixmap; -}; - -struct _GtkPixmapMenuItemClass -{ - GtkMenuItemClass parent_class; - - guint orig_toggle_size; - guint have_pixmap_count; -}; - -extern "C" { -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 // !__WXGTK20__ - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -static wxString wxReplaceUnderscore( const wxString& title ) +// forward declare it as it's used by wxMenuBar too when using Hildon +extern "C" { - 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; + static void menuitem_activate(GtkWidget*, wxMenuItem* item); } -//----------------------------------------------------------------------------- -// activate message from GTK -//----------------------------------------------------------------------------- +#if wxUSE_ACCEL +static void wxGetGtkAccel(const wxMenuItem*, guint*, GdkModifierType*); +#endif -extern "C" { -static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu ) +static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event) { - 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)) + if (handler && handler->SafelyProcessEvent(event)) return; wxWindow *win = menu->GetInvokingWindow(); - if (win) win->GetEventHandler()->ProcessEvent( event ); -} + if (win) + win->HandleWindowEvent( event ); } //----------------------------------------------------------------------------- @@ -171,37 +61,38 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow) void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style) { - // 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, wxT("menubar") )) + m_invokingWindow = NULL; + +#if wxUSE_LIBHILDON + // Hildon window uses a single menu instead of a menu bar, so wxMenuBar is + // the same as menu in this case + m_widget = + m_menubar = gtk_menu_new(); +#else // !wxUSE_LIBHILDON + if (!PreCreation( NULL, wxDefaultPosition, wxDefaultSize ) || + !CreateBase( NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") )) { wxFAIL_MSG( wxT("wxMenuBar creation failed") ); return; } m_menubar = gtk_menu_bar_new(); -#ifndef __WXGTK20__ - m_accel = gtk_accel_group_new(); -#endif if (style & wxMB_DOCKABLE) { m_widget = gtk_handle_box_new(); - gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_menubar) ); - gtk_widget_show( GTK_WIDGET(m_menubar) ); + gtk_container_add(GTK_CONTAINER(m_widget), m_menubar); + gtk_widget_show(m_menubar); } else { - m_widget = GTK_WIDGET(m_menubar); + m_widget = m_menubar; } PostCreation(); ApplyWidgetStyle(); +#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON for (size_t i = 0; i < n; ++i ) Append(menus[i], titles[i]); @@ -226,48 +117,50 @@ wxMenuBar::~wxMenuBar() { } -static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win ) +static void +wxMenubarUnsetInvokingWindow(wxMenu* menu, wxWindow* win, GtkWindow* tlw = NULL) { menu->SetInvokingWindow( (wxWindow*) NULL ); - wxWindow *top_frame = win; - while (top_frame->GetParent() && !(top_frame->IsTopLevel())) - top_frame = top_frame->GetParent(); - -#ifndef __WXGTK20__ // support for native hot keys - gtk_accel_group_detach( menu->m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) ); -#endif + if (menu->m_accel) + { + if (tlw == NULL) + tlw = GTK_WINDOW(wxGetTopLevelParent(win)->m_widget); + if (g_slist_find(menu->m_accel->acceleratables, tlw)) + gtk_window_remove_accel_group(tlw, menu->m_accel); + } wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { wxMenuItem *menuitem = node->GetData(); if (menuitem->IsSubMenu()) - wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win ); + wxMenubarUnsetInvokingWindow(menuitem->GetSubMenu(), win, tlw); node = node->GetNext(); } } -static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) +static void +wxMenubarSetInvokingWindow(wxMenu* menu, wxWindow* win, GtkWindow* tlw = NULL) { menu->SetInvokingWindow( win ); - wxWindow *top_frame = win; - while (top_frame->GetParent() && !(top_frame->IsTopLevel())) - top_frame = top_frame->GetParent(); - // 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 ); + if (menu->m_accel) + { + if (tlw == NULL) + tlw = GTK_WINDOW(wxGetTopLevelParent(win)->m_widget); + if (!g_slist_find(menu->m_accel->acceleratables, tlw)) + gtk_window_add_accel_group(tlw, menu->m_accel); + } wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { wxMenuItem *menuitem = node->GetData(); if (menuitem->IsSubMenu()) - wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win ); + wxMenubarSetInvokingWindow(menuitem->GetSubMenu(), win, tlw); node = node->GetNext(); } } @@ -275,16 +168,6 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) void wxMenuBar::SetInvokingWindow( wxWindow *win ) { m_invokingWindow = win; - wxWindow *top_frame = win; - while (top_frame->GetParent() && !(top_frame->IsTopLevel())) - top_frame = top_frame->GetParent(); - -#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::compatibility_iterator node = m_menus.GetFirst(); while (node) @@ -295,17 +178,53 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win ) } } +void wxMenuBar::SetLayoutDirection(wxLayoutDirection dir) +{ + if ( dir == wxLayout_Default ) + { + const wxWindow *const frame = GetFrame(); + if ( frame ) + { + // inherit layout from frame. + dir = frame->GetLayoutDirection(); + } + else // use global layout + { + dir = wxTheApp->GetLayoutDirection(); + } + } + + if ( dir == wxLayout_Default ) + return; + + GTKSetLayout(m_menubar, dir); + + // also set the layout of all menus we already have (new ones will inherit + // the current layout) + for ( wxMenuList::compatibility_iterator node = m_menus.GetFirst(); + node; + node = node->GetNext() ) + { + wxMenu *const menu = node->GetData(); + menu->SetLayoutDirection(dir); + } +} + +wxLayoutDirection wxMenuBar::GetLayoutDirection() const +{ + return GTKGetLayout(m_menubar); +} + +void wxMenuBar::Attach(wxFrame *frame) +{ + wxMenuBarBase::Attach(frame); + + SetLayoutDirection(wxLayout_Default); +} + void wxMenuBar::UnsetInvokingWindow( wxWindow *win ) { m_invokingWindow = (wxWindow*) NULL; - wxWindow *top_frame = win; - while (top_frame->GetParent() && !(top_frame->IsTopLevel())) - top_frame = top_frame->GetParent(); - -#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::compatibility_iterator node = m_menus.GetFirst(); while (node) @@ -319,84 +238,74 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win ) bool wxMenuBar::Append( wxMenu *menu, const wxString &title ) { if ( !wxMenuBarBase::Append( menu, title ) ) - return FALSE; + return false; return GtkAppend(menu, title); } bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos) { - wxString str( wxReplaceUnderscore( title ) ); + menu->SetLayoutDirection(GetLayoutDirection()); - // This doesn't have much effect right now. - menu->SetTitle( str ); +#if wxUSE_LIBHILDON + // if the menu has only one item, append it directly to the top level menu + // instead of inserting a useless submenu + if ( menu->GetMenuItemCount() == 1 ) + { + wxMenuItem * const item = menu->FindItemByPosition(0); + + // remove both mnemonics and accelerator: neither is useful under Maemo + const wxString str(wxStripMenuCodes(item->GetItemLabel())); + + if ( item->IsSubMenu() ) + return GtkAppend(item->GetSubMenu(), str, pos); + + menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) ); - // 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) + g_signal_connect(menu->m_owner, "activate", + G_CALLBACK(menuitem_activate), item); + item->SetMenuItem(menu->m_owner); + } + else +#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON { - 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); + const wxString str(wxConvertMnemonicsToGTK(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_mnemonic( wxGTK_CONV( str ) ); + + gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu ); } -#endif gtk_widget_show( menu->m_owner ); - 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 ); - 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 // 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; + return true; } bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { if ( !wxMenuBarBase::Insert(pos, menu, title) ) - return FALSE; + return false; // TODO if ( !GtkAppend(menu, title, (int)pos) ) - return FALSE; + return false; - return TRUE; + return true; } wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) @@ -418,27 +327,21 @@ wxMenu *wxMenuBar::Remove(size_t pos) if ( !menu ) return (wxMenu*) NULL; - gtk_menu_item_remove_submenu( GTK_MENU_ITEM(menu->m_owner) ); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu->m_owner), NULL); 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(); - } + wxMenubarUnsetInvokingWindow( menu, m_invokingWindow ); return menu; } static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString ) { - if (wxMenuItem::GetLabelFromText(menu->GetTitle()) == wxMenuItem::GetLabelFromText(menuString)) + if (wxMenuItem::GetLabelText(wxConvertMnemonicsFromGTK(menu->GetTitle())) == wxMenuItem::GetLabelText(menuString)) { int res = menu->FindItem( itemString ); if (res != wxNOT_FOUND) @@ -523,7 +426,7 @@ void wxMenuBar::EnableTop( size_t pos, bool flag ) gtk_widget_set_sensitive( menu->m_owner, flag ); } -wxString wxMenuBar::GetLabelTop( size_t pos ) const +wxString wxMenuBar::GetMenuLabel( size_t pos ) const { wxMenuList::compatibility_iterator node = m_menus.Item( pos ); @@ -531,26 +434,10 @@ wxString wxMenuBar::GetLabelTop( size_t pos ) const wxMenu* menu = node->GetData(); - wxString label; - wxString text( menu->GetTitle() ); - for ( const wxChar *pc = text.c_str(); *pc; pc++ ) - { - if ( *pc == wxT('_') ) - { - // '_' is the escape character for GTK+ - continue; - } - - // don't remove ampersands '&' since if we have them in the menu title - // it means that they were doubled to indicate "&" instead of accelerator - - label += *pc; - } - - return label; + return wxConvertMnemonicsFromGTK(menu->GetTitle()); } -void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) +void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label ) { wxMenuList::compatibility_iterator node = m_menus.Item( pos ); @@ -558,22 +445,12 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) wxMenu* menu = node->GetData(); - wxString str( wxReplaceUnderscore( label ) ); + const wxString str(wxConvertMnemonicsToGTK(label)); menu->SetTitle( str ); if (menu->m_owner) - { - GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child ); - - /* set new text */ - gtk_label_set( label, wxGTK_CONV( str ) ); - - /* reparse key accel */ - (void)gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( str ) ); - gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) ); - } - + gtk_label_set_text_with_mnemonic( GTK_LABEL( GTK_BIN(menu->m_owner)->child), wxGTK_CONV(str) ); } //----------------------------------------------------------------------------- @@ -581,24 +458,13 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) //----------------------------------------------------------------------------- extern "C" { -static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) +static void menuitem_activate(GtkWidget*, wxMenuItem* item) { - if (g_isIdle) - wxapp_install_idle_handler(); - - int id = menu->FindMenuIdByMenuItem(widget); - - /* should find it for normal (not popup) menu */ - wxASSERT_MSG( (id != -1) || (menu->GetInvokingWindow() != NULL), - _T("menu item not found in gtk_menu_clicked_callback") ); - - if (!menu->IsEnabled(id)) + if (!item->IsEnabled()) return; - wxMenuItem* item = menu->FindChildItem( id ); - wxCHECK_RET( item, wxT("error in menu item callback") ); - - if ( item->GetId() == wxGTK_TITLE_ID ) + int id = item->GetId(); + if (id == wxGTK_TITLE_ID) { // ignore events from the menu title return; @@ -622,34 +488,8 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) } } - - // Is this menu on a menubar? (possibly nested) - wxFrame* frame = NULL; - if(menu->IsAttached()) - frame = menu->GetMenuBar()->GetFrame(); - - // FIXME: why do we have to call wxFrame::GetEventHandler() directly here? - // normally wxMenu::SendEvent() should be enough, if it doesn't work - // in wxGTK then we have a bug in wxMenu::GetInvokingWindow() which - // should be fixed instead of working around it here... - if (frame) - { - // If it is attached then let the frame send the event. - // Don't call frame->ProcessCommand(id) because it toggles - // checkable items and we've already done that above. - wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id); - commandEvent.SetEventObject(frame); - if (item->IsCheckable()) - commandEvent.SetInt(item->IsChecked()); - commandEvent.SetEventObject(menu); - - frame->GetEventHandler()->ProcessEvent(commandEvent); - } - else - { - // otherwise let the menu have it - menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); - } + wxMenu* menu = item->GetMenu(); + menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); } } @@ -658,26 +498,21 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) //----------------------------------------------------------------------------- extern "C" { -static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) +static void menuitem_select(GtkWidget*, wxMenuItem* item) { - if (g_isIdle) wxapp_install_idle_handler(); - - int id = menu->FindMenuIdByMenuItem(widget); - - wxASSERT( id != -1 ); // should find it! - - if (!menu->IsEnabled(id)) + if (!item->IsEnabled()) return; - wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id ); + wxMenu* menu = item->GetMenu(); + wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item->GetId()); event.SetEventObject( menu ); wxEvtHandler* handler = menu->GetEventHandler(); - if (handler && handler->ProcessEvent(event)) + if (handler && handler->SafelyProcessEvent(event)) return; wxWindow *win = menu->GetInvokingWindow(); - if (win) win->GetEventHandler()->ProcessEvent( event ); + if (win) win->HandleWindowEvent( event ); } } @@ -686,27 +521,22 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) //----------------------------------------------------------------------------- extern "C" { -static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) +static void menuitem_deselect(GtkWidget*, wxMenuItem* item) { - if (g_isIdle) wxapp_install_idle_handler(); - - int id = menu->FindMenuIdByMenuItem(widget); - - wxASSERT( id != -1 ); // should find it! - - if (!menu->IsEnabled(id)) + if (!item->IsEnabled()) return; + wxMenu* menu = item->GetMenu(); wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 ); event.SetEventObject( menu ); wxEvtHandler* handler = menu->GetEventHandler(); - if (handler && handler->ProcessEvent(event)) + if (handler && handler->SafelyProcessEvent(event)) return; wxWindow *win = menu->GetInvokingWindow(); if (win) - win->GetEventHandler()->ProcessEvent( event ); + win->HandleWindowEvent( event ); } } @@ -734,9 +564,10 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu, wxMenu *subMenu) : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu) { - Init(text); + m_menuItem = NULL; } +#if WXWIN_COMPATIBILITY_2_8 wxMenuItem::wxMenuItem(wxMenu *parentMenu, int id, const wxString& text, @@ -746,185 +577,62 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu, : wxMenuItemBase(parentMenu, id, text, help, isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu) { - Init(text); -} - -void wxMenuItem::Init(const wxString& text) -{ - m_labelWidget = (GtkWidget *) NULL; - m_menuItem = (GtkWidget *) NULL; - - DoSetText(text); + m_menuItem = NULL; } +#endif wxMenuItem::~wxMenuItem() { // don't delete menu items, the menus take care of that } -// return the menu item text without any menu accels -/* static */ -wxString wxMenuItemBase::GetLabelFromText(const wxString& text) +void wxMenuItem::SetItemLabel( const wxString& str ) { - wxString label; - - for ( const wxChar *pc = text.c_str(); *pc; pc++ ) +#if wxUSE_ACCEL + if (m_menuItem) { - if ( *pc == wxT('\t')) - break; - - if ( *pc == wxT('_') ) + // remove old accelerator + guint accel_key; + GdkModifierType accel_mods; + wxGetGtkAccel(this, &accel_key, &accel_mods); + if (accel_key) { - // GTK 1.2 escapes "xxx_xxx" to "xxx__xxx" - pc++; - label += *pc; - continue; + gtk_widget_remove_accelerator( + m_menuItem, m_parentMenu->m_accel, accel_key, accel_mods); } - -#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; } - - // wxPrintf( wxT("GetLabelFromText(): text %s label %s\n"), text.c_str(), label.c_str() ); - - return label; +#endif // wxUSE_ACCEL + wxMenuItemBase::SetItemLabel(str); + if (m_menuItem) + SetGtkLabel(); } -void wxMenuItem::SetText( const wxString& str ) +void wxMenuItem::SetGtkLabel() { - // Some optimization to avoid flicker - wxString oldLabel = m_text; - oldLabel = wxStripMenuCodes(oldLabel); - oldLabel.Replace(wxT("_"), wxT("")); - wxString label1 = wxStripMenuCodes(str); - wxString oldhotkey = GetHotKey(); // Store the old hotkey in Ctrl-foo format - wxCharBuffer oldbuf = wxGTK_CONV( 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 ); - -#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), wxGTK_CONV(m_text) ); - gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) ); -#endif - } - + const wxString text = wxConvertMnemonicsToGTK(m_text.BeforeFirst('\t')); + GtkLabel* label = GTK_LABEL(GTK_BIN(m_menuItem)->child); + gtk_label_set_text_with_mnemonic(label, wxGTK_CONV_SYS(text)); +#if wxUSE_ACCEL guint accel_key; GdkModifierType accel_mods; - gtk_accelerator_parse( (const char*) oldbuf, &accel_key, &accel_mods); - if (accel_key != 0) + wxGetGtkAccel(this, &accel_key, &accel_mods); + if (accel_key) { - gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem), - m_parentMenu->m_accel, - accel_key, - accel_mods ); + gtk_widget_add_accelerator( + m_menuItem, "activate", m_parentMenu->m_accel, + accel_key, accel_mods, GTK_ACCEL_VISIBLE); } - - 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::DoSetText( const wxString& str ) -{ - // '\t' is the deliminator indicating a hot key - m_text.Empty(); - const wxChar *pc = str; - while ( (*pc != wxT('\0')) && (*pc != wxT('\t')) ) - { - if ((*pc == wxT('&')) && (*(pc+1) == wxT('&'))) - { - // "&" is doubled to indicate "&" instead of accelerator - ++pc; - m_text << wxT('&'); - } - else if (*pc == wxT('&')) - { - m_text << wxT('_'); - } - else if ( *pc == wxT('_') ) // escape underscores - { - m_text << wxT("__"); - } - else - { - m_text << *pc; - } - ++pc; - } - - m_hotKey = wxT(""); - - if(*pc == wxT('\t')) - { - pc++; - m_hotKey = pc; - } - - // wxPrintf( wxT("DoSetText(): str %s m_text %s hotkey %s\n"), str.c_str(), m_text.c_str(), m_hotKey.c_str() ); +#endif // wxUSE_ACCEL } -#if wxUSE_ACCEL - -wxAcceleratorEntry *wxMenuItem::GetAccel() const +void wxMenuItem::SetBitmap(const wxBitmap& bitmap) { - if ( !GetHotKey() ) - { - // nothing - return (wxAcceleratorEntry *)NULL; - } - - // as wxGetAccelFromString() looks for TAB, insert a dummy one here - wxString label; - label << wxT('\t') << GetHotKey(); - - return wxGetAccelFromString(label); + if (m_kind == wxITEM_NORMAL) + m_bitmap = bitmap; + else + wxFAIL_MSG("only normal menu items can have bitmaps"); } -#endif // wxUSE_ACCEL - void wxMenuItem::Check( bool check ) { wxCHECK_RET( m_menuItem, wxT("invalid menu item") ); @@ -938,7 +646,7 @@ void wxMenuItem::Check( bool check ) { case wxITEM_CHECK: case wxITEM_RADIO: - gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check ); + gtk_check_menu_item_set_active( (GtkCheckMenuItem*)m_menuItem, (gint)check ); break; default: @@ -956,9 +664,9 @@ void wxMenuItem::Enable( bool enable ) bool wxMenuItem::IsChecked() const { - wxCHECK_MSG( m_menuItem, FALSE, wxT("invalid menu item") ); + wxCHECK_MSG( m_menuItem, false, wxT("invalid menu item") ); - wxCHECK_MSG( IsCheckable(), FALSE, + wxCHECK_MSG( IsCheckable(), false, wxT("can't get state of uncheckable item!") ); return ((GtkCheckMenuItem*)m_menuItem)->active != 0; @@ -968,15 +676,35 @@ bool wxMenuItem::IsChecked() const // wxMenu //----------------------------------------------------------------------------- +extern "C" { +// "map" from m_menu +static void menu_map(GtkWidget*, wxMenu* menu) +{ + wxMenuEvent event(wxEVT_MENU_OPEN, menu->m_popupShown ? -1 : 0, menu); + DoCommonMenuCallbackCode(menu, event); +} + +// "hide" from m_menu +static void menu_hide(GtkWidget*, wxMenu* menu) +{ + wxMenuEvent event(wxEVT_MENU_CLOSE, menu->m_popupShown ? -1 : 0, menu); + menu->m_popupShown = false; + DoCommonMenuCallbackCode(menu, event); +} +} + IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler) void wxMenu::Init() { + m_popupShown = false; + m_accel = gtk_accel_group_new(); 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); + g_object_ref(m_menu); + gtk_object_sink(GTK_OBJECT(m_menu)); m_owner = (GtkWidget*) NULL; @@ -987,7 +715,7 @@ void wxMenu::Init() { GtkWidget *tearoff = gtk_tearoff_menu_item_new(); - gtk_menu_append(GTK_MENU(m_menu), tearoff); + gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), tearoff); } m_prevRadio = NULL; @@ -998,193 +726,102 @@ void wxMenu::Init() Append(wxGTK_TITLE_ID, m_title); AppendSeparator(); } -} -wxMenu::~wxMenu() -{ - 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 ); - } + // "show" occurs for sub-menus which are not showing, so use "map" instead + g_signal_connect(m_menu, "map", G_CALLBACK(menu_map), this); + g_signal_connect(m_menu, "hide", G_CALLBACK(menu_hide), this); } -bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) +wxMenu::~wxMenu() { - GtkWidget *menuItem; - - wxString text; -#ifndef __WXGTK20__ - GtkLabel* label; -#endif - - if ( mitem->IsSeparator() ) - { -#ifdef __WXGTK20__ - menuItem = gtk_separator_menu_item_new(); -#else - // TODO - menuItem = gtk_menu_item_new(); -#endif - } - else if (mitem->GetBitmap().Ok()) - { - text = mitem->GetText(); - const wxBitmap *bitmap = &mitem->GetBitmap(); - -#ifdef __WXGTK20__ - menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV( text ) ); - - GtkWidget *image; - if (bitmap->HasPixbuf()) - { - image = gtk_image_new_from_pixbuf(bitmap->GetPixbuf()); - } - else - { - GdkPixmap *gdk_pixmap = bitmap->GetPixmap(); - GdkBitmap *gdk_bitmap = bitmap->GetMask() ? - bitmap->GetMask()->GetBitmap() : - (GdkBitmap*) NULL; - image = gtk_image_new_from_pixmap( gdk_pixmap, gdk_bitmap ); - } - - gtk_widget_show(image); - - gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(menuItem), image ); - -#else - GdkPixmap *gdk_pixmap = bitmap->GetPixmap(); - GdkBitmap *gdk_bitmap = bitmap->GetMask() ? bitmap->GetMask()->GetBitmap() : (GdkBitmap*) NULL; - - menuItem = gtk_pixmap_menu_item_new (); - label = GTK_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), GTK_WIDGET(label)); + // see wxMenu::Init + g_object_unref(m_menu); - gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuItem); + // if the menu is inserted in another menu at this time, there was + // one more reference to it: + if (m_owner) + gtk_widget_destroy(m_menu); - gtk_widget_show (GTK_WIDGET(label)); - - mitem->SetLabelWidget(GTK_WIDGET(label)); + g_object_unref(m_accel); +} - 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); +void wxMenu::SetLayoutDirection(const wxLayoutDirection dir) +{ + if ( m_owner ) + wxWindow::GTKSetLayout(m_owner, dir); + //else: will be called later by wxMenuBar again +} -#endif +wxLayoutDirection wxMenu::GetLayoutDirection() const +{ + return wxWindow::GTKGetLayout(m_owner); +} - m_prevRadio = NULL; - } - else // a normal item +bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) +{ + GtkWidget *menuItem; + GtkWidget* prevRadio = m_prevRadio; + m_prevRadio = NULL; + switch (mitem->GetKind()) { - // text has "_" instead of "&" after mitem->SetText() so don't use it - text = mitem->GetText() ; - - switch ( mitem->GetKind() ) - { - case wxITEM_CHECK: + case wxITEM_SEPARATOR: + menuItem = gtk_separator_menu_item_new(); + break; + case wxITEM_CHECK: + menuItem = gtk_check_menu_item_new_with_label(""); + break; + case wxITEM_RADIO: { -#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 ) ); - label = GTK_LABEL( GTK_BIN(menuItem)->child ); - // set new text - gtk_label_set_text( label, wxGTK_CONV( text ) ); -#endif - m_prevRadio = NULL; - break; + GSList* group = NULL; + if (prevRadio) + group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(prevRadio)); + menuItem = gtk_radio_menu_item_new_with_label(group, ""); + m_prevRadio = menuItem; } - - case wxITEM_RADIO: + break; + default: + wxFAIL_MSG("unexpected menu item kind"); + // fall through + case wxITEM_NORMAL: + const wxBitmap& bitmap = mitem->GetBitmap(); + const char* stockid; + if (bitmap.IsOk()) { - 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 ) ); - label = GTK_LABEL( GTK_BIN(menuItem)->child ); - // set new text - gtk_label_set_text( label, wxGTK_CONV( text ) ); -#endif - } - else // continue the radio group + GtkWidget* image; + if (bitmap.HasPixbuf()) + image = gtk_image_new_from_pixbuf(bitmap.GetPixbuf()); + else { -#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 ) ); - label = GTK_LABEL( GTK_BIN(menuItem)->child ); -#endif + GdkPixmap* mask = NULL; + if (bitmap.GetMask()) + mask = bitmap.GetMask()->GetBitmap(); + image = gtk_image_new_from_pixmap(bitmap.GetPixmap(), mask); } - break; + menuItem = gtk_image_menu_item_new_with_label(""); + gtk_widget_show(image); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuItem), image); } - - 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 ) ); - label = GTK_LABEL( GTK_BIN(menuItem)->child ); -#endif - m_prevRadio = NULL; - break; - } - } - - } - - guint accel_key; - GdkModifierType accel_mods; - wxCharBuffer buf = wxGTK_CONV( GetGtkHotKey(*mitem) ); - - // 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) - { - gtk_widget_add_accelerator (GTK_WIDGET(menuItem), - "activate", - m_accel, - accel_key, - accel_mods, - GTK_ACCEL_VISIBLE); + else if ((stockid = wxGetStockGtkID(mitem->GetId())) != NULL) + // use stock bitmap for this item if available on the assumption + // that it never hurts to follow GTK+ conventions more closely + menuItem = gtk_image_menu_item_new_from_stock(stockid, NULL); + else + menuItem = gtk_menu_item_new_with_label(""); + break; } + mitem->SetMenuItem(menuItem); - if (pos == -1) - gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem); - else - gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos); + gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos); gtk_widget_show( menuItem ); if ( !mitem->IsSeparator() ) { - wxASSERT_MSG( menuItem, wxT("invalid menuitem") ); - - 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 ); + mitem->SetGtkLabel(); + g_signal_connect (menuItem, "select", + G_CALLBACK(menuitem_select), mitem); + g_signal_connect (menuItem, "deselect", + G_CALLBACK(menuitem_deselect), mitem); if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK ) { @@ -1200,34 +837,13 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) } else { - gtk_signal_connect( GTK_OBJECT(menuItem), "activate", - GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), - (gpointer)this ); - } - -#ifndef __WXGTK20__ - 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); + g_signal_connect (menuItem, "activate", + G_CALLBACK(menuitem_activate), + mitem); } -#endif - } - - mitem->SetMenuItem(menuItem); - - if (ms_locked) - { - // This doesn't even exist! - // gtk_widget_lock_accelerators(mitem->GetMenuItem()); } - return TRUE; + return true; } wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem) @@ -1253,27 +869,29 @@ wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { if ( !wxMenuBase::DoRemove(item) ) - return (wxMenuItem *)NULL; + return NULL; + + GtkWidget * const mitem = item->GetMenuItem(); + if ( m_prevRadio == mitem ) + { + // deleting an item starts a new radio group (has to as we shouldn't + // keep a deleted pointer anyhow) + m_prevRadio = NULL; + } - // 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_item_set_submenu(GTK_MENU_ITEM(mitem), NULL); + gtk_widget_destroy(mitem); + item->SetMenuItem(NULL); return item; } -int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const +void wxMenu::Attach(wxMenuBarBase *menubar) { - wxMenuItemList::compatibility_iterator node = m_items.GetFirst(); - while (node) - { - wxMenuItem *item = node->GetData(); - if (item->GetMenuItem() == menuItem) - return item->GetId(); - node = node->GetNext(); - } + wxMenuBase::Attach(menubar); - return wxNOT_FOUND; + // inherit layout direction from menubar. + SetLayoutDirection(menubar->GetLayoutDirection()); } // ---------------------------------------------------------------------------- @@ -1343,12 +961,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item ) hotkey << wxT("Down" ); break; case WXK_PAGEUP: - case WXK_PRIOR: - hotkey << wxT("Prior" ); + hotkey << wxT("Page_Up" ); break; case WXK_PAGEDOWN: - case WXK_NEXT: - hotkey << wxT("Next" ); + hotkey << wxT("Page_Down" ); break; case WXK_LEFT: hotkey << wxT("Left" ); @@ -1465,11 +1081,11 @@ static wxString GetGtkHotKey( const wxMenuItem& item ) case WXK_NUMPAD_DOWN: hotkey << wxT("KP_Down" ); break; - case WXK_NUMPAD_PRIOR: case WXK_NUMPAD_PAGEUP: - hotkey << wxT("KP_Prior" ); + case WXK_NUMPAD_PAGEUP: + hotkey << wxT("KP_Page_Up" ); break; - case WXK_NUMPAD_NEXT: case WXK_NUMPAD_PAGEDOWN: - hotkey << wxT("KP_Next" ); + case WXK_NUMPAD_PAGEDOWN: + hotkey << wxT("KP_Page_Down" ); break; case WXK_NUMPAD_END: hotkey << wxT("KP_End" ); @@ -1524,14 +1140,15 @@ static wxString GetGtkHotKey( const wxMenuItem& item ) hotkey += wxString::Format(wxT("Special%d"), code - WXK_SPECIAL1 + 1); break; */ - // if there are any other keys wxGetAccelFromString() may + // 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 ) + const wxString + name = wxGTK_CONV_BACK_SYS(gdk_keyval_name((guint)code)); + if ( !name.empty() ) { hotkey << name; break; @@ -1547,388 +1164,109 @@ static wxString GetGtkHotKey( const wxMenuItem& item ) return hotkey; } -#endif // wxUSE_ACCEL - - -//----------------------------------------------------------------------------- -// substitute for missing GtkPixmapMenuItem -//----------------------------------------------------------------------------- - -#ifndef __WXGTK20__ - -/* - * Copyright (C) 1998, 1999, 2000 Free Software Foundation - * All rights reserved. - * - * This file is part of the Gnome Library. - * - * The Gnome Library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * The Gnome Library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with the Gnome Library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ -/* - @NOTATION@ - */ - -/* Author: Dietmar Maurer */ - -#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); -static gint gtk_pixmap_menu_item_expose (GtkWidget *widget, - 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); -static void gtk_pixmap_menu_item_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data); -static void gtk_pixmap_menu_item_size_request (GtkWidget *widget, - GtkRequisition *requisition); -static void gtk_pixmap_menu_item_remove (GtkContainer *container, - GtkWidget *child); - -static void changed_have_pixmap_status (GtkPixmapMenuItem *menu_item); - -static GtkMenuItemClass *parent_class = NULL; - -} // extern "C" - -#define BORDER_SPACING 3 -#define PMAP_WIDTH 20 - -GtkType -gtk_pixmap_menu_item_get_type (void) -{ - static GtkType pixmap_menu_item_type = 0; - - if (!pixmap_menu_item_type) - { - GtkTypeInfo pixmap_menu_item_info = - { - (char *)"GtkPixmapMenuItem", - sizeof (GtkPixmapMenuItem), - sizeof (GtkPixmapMenuItemClass), - (GtkClassInitFunc) gtk_pixmap_menu_item_class_init, - (GtkObjectInitFunc) gtk_pixmap_menu_item_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - - pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (), - &pixmap_menu_item_info); - } - - return pixmap_menu_item_type; -} - -extern "C" { - -/** - * gtk_pixmap_menu_item_new - * - * 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: - * &GtkWidget pointer to new menu item - **/ - -GtkWidget* -gtk_pixmap_menu_item_new (void) -{ - return GTK_WIDGET (gtk_type_new (gtk_pixmap_menu_item_get_type ())); -} - -static void -gtk_pixmap_menu_item_class_init (GtkPixmapMenuItemClass *klass) -{ - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkMenuItemClass *menu_item_class; - GtkContainerClass *container_class; - - object_class = (GtkObjectClass*) klass; - widget_class = (GtkWidgetClass*) klass; - menu_item_class = (GtkMenuItemClass*) klass; - container_class = (GtkContainerClass*) klass; - - parent_class = (GtkMenuItemClass*) gtk_type_class (gtk_menu_item_get_type ()); - - widget_class->draw = gtk_pixmap_menu_item_draw; - widget_class->expose_event = gtk_pixmap_menu_item_expose; - widget_class->map = gtk_pixmap_menu_item_map; - widget_class->size_allocate = gtk_pixmap_menu_item_size_allocate; - widget_class->size_request = gtk_pixmap_menu_item_size_request; - - container_class->forall = gtk_pixmap_menu_item_forall; - container_class->remove = gtk_pixmap_menu_item_remove; - - klass->orig_toggle_size = menu_item_class->toggle_size; - klass->have_pixmap_count = 0; -} - -static void -gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item) -{ - GtkMenuItem *mi; - - mi = GTK_MENU_ITEM (menu_item); - - menu_item->pixmap = NULL; -} - -static void -gtk_pixmap_menu_item_draw (GtkWidget *widget, - GdkRectangle *area) -{ - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget)); - g_return_if_fail (area != NULL); - - if (GTK_WIDGET_CLASS (parent_class)->draw) - (* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area); - - if (GTK_WIDGET_DRAWABLE (widget) && - GTK_PIXMAP_MENU_ITEM(widget)->pixmap) { - gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL); - } -} - -static gint -gtk_pixmap_menu_item_expose (GtkWidget *widget, - GdkEventExpose *event) -{ - g_return_val_if_fail (widget != NULL, FALSE); - g_return_val_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); - - if (GTK_WIDGET_CLASS (parent_class)->expose_event) - (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event); - - if (GTK_WIDGET_DRAWABLE (widget) && - GTK_PIXMAP_MENU_ITEM(widget)->pixmap) { - gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL); - } - - return FALSE; -} - -/** - * gtk_pixmap_menu_item_set_pixmap - * @menu_item: Pointer to the pixmap menu item - * @pixmap: Pointer to a pixmap widget - * - * Set the pixmap of the menu item. - * - **/ - -void -gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item, - GtkWidget *pixmap) -{ - g_return_if_fail (menu_item != NULL); - g_return_if_fail (pixmap != NULL); - g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (menu_item)); - g_return_if_fail (GTK_IS_WIDGET (pixmap)); - g_return_if_fail (menu_item->pixmap == NULL); - - gtk_widget_set_parent (pixmap, GTK_WIDGET (menu_item)); - menu_item->pixmap = pixmap; - - if (GTK_WIDGET_REALIZED (pixmap->parent) && - !GTK_WIDGET_REALIZED (pixmap)) - gtk_widget_realize (pixmap); - - if (GTK_WIDGET_VISIBLE (pixmap->parent)) { - if (GTK_WIDGET_MAPPED (pixmap->parent) && - 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); -} - -static void -gtk_pixmap_menu_item_map (GtkWidget *widget) -{ - GtkPixmapMenuItem *menu_item; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget)); - - menu_item = GTK_PIXMAP_MENU_ITEM(widget); - - GTK_WIDGET_CLASS(parent_class)->map(widget); - - if (menu_item->pixmap && - GTK_WIDGET_VISIBLE (menu_item->pixmap) && - !GTK_WIDGET_MAPPED (menu_item->pixmap)) - gtk_widget_map (menu_item->pixmap); -} - static void -gtk_pixmap_menu_item_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) +wxGetGtkAccel(const wxMenuItem* item, guint* accel_key, GdkModifierType* accel_mods) { - GtkPixmapMenuItem *pmenu_item; - - pmenu_item = GTK_PIXMAP_MENU_ITEM(widget); - - if (pmenu_item->pixmap && GTK_WIDGET_VISIBLE(pmenu_item)) + *accel_key = 0; + const wxString string = GetGtkHotKey(*item); + if (!string.empty()) + gtk_accelerator_parse(wxGTK_CONV_SYS(string), accel_key, accel_mods); + else { - GtkAllocation child_allocation; - int border_width; - - border_width = GTK_CONTAINER (widget)->border_width; - - child_allocation.width = pmenu_item->pixmap->requisition.width; - 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 */ - gtk_widget_size_allocate (pmenu_item->pixmap, &child_allocation); + GtkStockItem stock_item; + const char* stockid = wxGetStockGtkID(item->GetId()); + if (stockid && gtk_stock_lookup(stockid, &stock_item)) + { + *accel_key = stock_item.keyval; + *accel_mods = stock_item.modifier; + } } - - if (GTK_WIDGET_CLASS (parent_class)->size_allocate) - GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation); -} - -static void -gtk_pixmap_menu_item_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data) -{ - GtkPixmapMenuItem *menu_item; - - g_return_if_fail (container != NULL); - g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container)); - g_return_if_fail (callback != NULL); - - menu_item = GTK_PIXMAP_MENU_ITEM (container); - - if (menu_item->pixmap) - (* callback) (menu_item->pixmap, callback_data); - - GTK_CONTAINER_CLASS(parent_class)->forall(container,include_internals, - callback,callback_data); } +#endif // wxUSE_ACCEL -static void -gtk_pixmap_menu_item_size_request (GtkWidget *widget, - GtkRequisition *requisition) +const char *wxGetStockGtkID(wxWindowID id) { - GtkPixmapMenuItem *menu_item; - GtkRequisition req = {0, 0}; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_MENU_ITEM (widget)); - g_return_if_fail (requisition != NULL); - - GTK_WIDGET_CLASS(parent_class)->size_request(widget,requisition); - - menu_item = GTK_PIXMAP_MENU_ITEM (widget); + #define STOCKITEM(wx,gtk) \ + case wx: \ + return gtk; - if (menu_item->pixmap) - gtk_widget_size_request(menu_item->pixmap, &req); + #if GTK_CHECK_VERSION(2,6,0) + #define STOCKITEM_26(wx,gtk) STOCKITEM(wx,gtk) + #else + #define STOCKITEM_26(wx,gtk) + #endif - requisition->height = MAX(req.height + GTK_CONTAINER(widget)->border_width + BORDER_SPACING, (unsigned int) requisition->height); - requisition->width += (req.width + GTK_CONTAINER(widget)->border_width + BORDER_SPACING); -} + #if GTK_CHECK_VERSION(2,10,0) + #define STOCKITEM_210(wx,gtk) STOCKITEM(wx,gtk) + #else + #define STOCKITEM_210(wx,gtk) + #endif -static void -gtk_pixmap_menu_item_remove (GtkContainer *container, - GtkWidget *child) -{ - GtkBin *bin; - gboolean widget_was_visible; - - g_return_if_fail (container != NULL); - g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container)); - g_return_if_fail (child != NULL); - 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))); - - widget_was_visible = GTK_WIDGET_VISIBLE (child); - - gtk_widget_unparent (child); - if (bin->child == child) - 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)); -} + switch (id) + { + STOCKITEM_26(wxID_ABOUT, GTK_STOCK_ABOUT) + STOCKITEM(wxID_ADD, GTK_STOCK_ADD) + STOCKITEM(wxID_APPLY, GTK_STOCK_APPLY) + STOCKITEM(wxID_BOLD, GTK_STOCK_BOLD) + STOCKITEM(wxID_CANCEL, GTK_STOCK_CANCEL) + STOCKITEM(wxID_CLEAR, GTK_STOCK_CLEAR) + STOCKITEM(wxID_CLOSE, GTK_STOCK_CLOSE) + STOCKITEM(wxID_COPY, GTK_STOCK_COPY) + STOCKITEM(wxID_CUT, GTK_STOCK_CUT) + STOCKITEM(wxID_DELETE, GTK_STOCK_DELETE) + STOCKITEM_26(wxID_EDIT, GTK_STOCK_EDIT) + STOCKITEM(wxID_FIND, GTK_STOCK_FIND) + STOCKITEM_26(wxID_FILE, GTK_STOCK_FILE) + STOCKITEM(wxID_REPLACE, GTK_STOCK_FIND_AND_REPLACE) + STOCKITEM(wxID_BACKWARD, GTK_STOCK_GO_BACK) + STOCKITEM(wxID_DOWN, GTK_STOCK_GO_DOWN) + STOCKITEM(wxID_FORWARD, GTK_STOCK_GO_FORWARD) + STOCKITEM(wxID_UP, GTK_STOCK_GO_UP) + STOCKITEM(wxID_HELP, GTK_STOCK_HELP) + STOCKITEM(wxID_HOME, GTK_STOCK_HOME) + STOCKITEM(wxID_INDENT, GTK_STOCK_INDENT) + STOCKITEM(wxID_INDEX, GTK_STOCK_INDEX) + STOCKITEM(wxID_ITALIC, GTK_STOCK_ITALIC) + STOCKITEM(wxID_JUSTIFY_CENTER, GTK_STOCK_JUSTIFY_CENTER) + STOCKITEM(wxID_JUSTIFY_FILL, GTK_STOCK_JUSTIFY_FILL) + STOCKITEM(wxID_JUSTIFY_LEFT, GTK_STOCK_JUSTIFY_LEFT) + STOCKITEM(wxID_JUSTIFY_RIGHT, GTK_STOCK_JUSTIFY_RIGHT) + STOCKITEM(wxID_NEW, GTK_STOCK_NEW) + STOCKITEM(wxID_NO, GTK_STOCK_NO) + STOCKITEM(wxID_OK, GTK_STOCK_OK) + STOCKITEM(wxID_OPEN, GTK_STOCK_OPEN) + STOCKITEM(wxID_PASTE, GTK_STOCK_PASTE) + STOCKITEM(wxID_PREFERENCES, GTK_STOCK_PREFERENCES) + STOCKITEM(wxID_PRINT, GTK_STOCK_PRINT) + STOCKITEM(wxID_PREVIEW, GTK_STOCK_PRINT_PREVIEW) + STOCKITEM(wxID_PROPERTIES, GTK_STOCK_PROPERTIES) + STOCKITEM(wxID_EXIT, GTK_STOCK_QUIT) + STOCKITEM(wxID_REDO, GTK_STOCK_REDO) + STOCKITEM(wxID_REFRESH, GTK_STOCK_REFRESH) + STOCKITEM(wxID_REMOVE, GTK_STOCK_REMOVE) + STOCKITEM(wxID_REVERT_TO_SAVED, GTK_STOCK_REVERT_TO_SAVED) + STOCKITEM(wxID_SAVE, GTK_STOCK_SAVE) + STOCKITEM(wxID_SAVEAS, GTK_STOCK_SAVE_AS) + STOCKITEM_210(wxID_SELECTALL, GTK_STOCK_SELECT_ALL) + STOCKITEM(wxID_STOP, GTK_STOCK_STOP) + STOCKITEM(wxID_UNDELETE, GTK_STOCK_UNDELETE) + STOCKITEM(wxID_UNDERLINE, GTK_STOCK_UNDERLINE) + STOCKITEM(wxID_UNDO, GTK_STOCK_UNDO) + STOCKITEM(wxID_UNINDENT, GTK_STOCK_UNINDENT) + STOCKITEM(wxID_YES, GTK_STOCK_YES) + STOCKITEM(wxID_ZOOM_100, GTK_STOCK_ZOOM_100) + STOCKITEM(wxID_ZOOM_FIT, GTK_STOCK_ZOOM_FIT) + STOCKITEM(wxID_ZOOM_IN, GTK_STOCK_ZOOM_IN) + STOCKITEM(wxID_ZOOM_OUT, GTK_STOCK_ZOOM_OUT) -/* important to only call this if there was actually a _change_ in pixmap == NULL */ -static void -changed_have_pixmap_status (GtkPixmapMenuItem *menu_item) -{ - if (menu_item->pixmap != NULL) { - GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count += 1; + default: + break; + }; - if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 1) { - /* Install pixmap toggle size */ - GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = MAX(GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size, PMAP_WIDTH); - } - } else { - GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count -= 1; + #undef STOCKITEM - 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; - } - } - - /* Note that we actually need to do this for _all_ GtkPixmapMenuItem - whenever the klass->toggle_size changes; but by doing it anytime - 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))) - gtk_widget_queue_resize(GTK_WIDGET(menu_item)); + return NULL; } -} // extern "C" - -#endif // !__WXGTK20__ - +#endif // wxUSE_MENUS