X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/294ea16de3359844cb884baad219b40ea04fac48..4cd4a9ff70cdfdfc054747d7dae6101da3f94c03:/src/gtk1/menu.cpp diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index 7922dd438b..a14e6b063a 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.cpp +// Name: src/gtk1/menu.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,48 +7,37 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#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/menu.h" -#include "wx/log.h" -#include "wx/intl.h" -#include "wx/app.h" -#include "wx/bitmap.h" +#include "wx/stockitem.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/app.h" + #include "wx/bitmap.h" +#endif #if wxUSE_ACCEL #include "wx/accel.h" #endif // wxUSE_ACCEL -#include "wx/gtk/private.h" +#include "wx/gtk1/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 +#define ACCEL_OBJECT GtkObject +#define ACCEL_OBJECTS(a) (a)->attach_objects +#define ACCEL_OBJ_CAST(obj) GTK_OBJECT(obj) // we use normal item but with a special id for the menu title static const int wxGTK_TITLE_ID = -3; +// defined in window.cpp +extern guint32 wxGtkTimeLastClick; + //----------------------------------------------------------------------------- // idle system //----------------------------------------------------------------------------- @@ -57,52 +46,9 @@ extern void wxapp_install_idle_handler(); extern bool g_isIdle; #if wxUSE_ACCEL -static wxString GetHotKey( 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))) +static wxString GetGtkHotKey( const wxMenuItem& item ); #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; -}; - - -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 //----------------------------------------------------------------------------- @@ -145,15 +91,50 @@ static wxString wxReplaceUnderscore( const wxString& title ) return str; } +static wxString wxConvertFromGTKToWXLabel(const wxString& gtkLabel) +{ + wxString label; + for ( const wxChar *pc = gtkLabel.c_str(); *pc; pc++ ) + { + // '_' is the escape character for GTK+. + + if ( *pc == wxT('_') && *(pc+1) == wxT('_')) + { + // An underscore was escaped. + label += wxT('_'); + pc++; + } + else if ( *pc == wxT('_') ) + { + // Convert GTK+ hotkey symbol to wxWidgets/Windows standard + label += wxT('&'); + } + else if ( *pc == wxT('&') ) + { + // Double the ampersand to escape it as far as wxWidgets is concerned + label += wxT("&&"); + } + else + { + // 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; +} + + //----------------------------------------------------------------------------- // activate message from GTK //----------------------------------------------------------------------------- -static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu ) +static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event) { - if (g_isIdle) wxapp_install_idle_handler(); + if (g_isIdle) + wxapp_install_idle_handler(); - wxMenuEvent event( wxEVT_MENU_OPEN, -1, menu ); event.SetEventObject( menu ); wxEvtHandler* handler = menu->GetEventHandler(); @@ -161,7 +142,32 @@ static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu ) return; wxWindow *win = menu->GetInvokingWindow(); - if (win) win->GetEventHandler()->ProcessEvent( event ); + if (win) + win->HandleWindowEvent( event ); +} + +extern "C" { + +static void gtk_menu_open_callback( GtkWidget *WXUNUSED(widget), wxMenu *menu ) +{ + wxMenuEvent event(wxEVT_MENU_OPEN, -1, menu); + + DoCommonMenuCallbackCode(menu, event); +} + +static void gtk_menu_close_callback( GtkWidget *WXUNUSED(widget), wxMenuBar *menubar ) +{ + if ( !menubar->GetMenuCount() ) + { + // if menubar is empty we can't call GetMenu(0) below + return; + } + + wxMenuEvent event( wxEVT_MENU_CLOSE, -1, NULL ); + + DoCommonMenuCallbackCode(menubar->GetMenu(0), event); +} + } //----------------------------------------------------------------------------- @@ -173,21 +179,19 @@ 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_needParent = false; m_style = style; - m_invokingWindow = (wxWindow*) NULL; + m_invokingWindow = NULL; - if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) || - !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") )) + 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) { @@ -206,6 +210,16 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st for (size_t i = 0; i < n; ++i ) Append(menus[i], titles[i]); + + // VZ: for some reason connecting to menus "deactivate" doesn't work (we + // don't get it when the menu is dismissed by clicking outside the + // toolbar) so we connect to the global one, even if it means that we + // can't pass the menu which was closed in wxMenuEvent object + gtk_signal_connect( GTK_OBJECT(GTK_MENU_SHELL(m_menubar)), + "deactivate", + GTK_SIGNAL_FUNC(gtk_menu_close_callback), + (gpointer)this ); + } wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style) @@ -229,16 +243,14 @@ wxMenuBar::~wxMenuBar() static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win ) { - menu->SetInvokingWindow( (wxWindow*) NULL ); + menu->SetInvokingWindow( 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 wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) @@ -280,12 +292,10 @@ void wxMenuBar::SetInvokingWindow( wxWindow *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) @@ -298,15 +308,13 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win ) void wxMenuBar::UnsetInvokingWindow( wxWindow *win ) { - m_invokingWindow = (wxWindow*) NULL; + m_invokingWindow = 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) @@ -320,7 +328,7 @@ 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); } @@ -333,9 +341,6 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos) menu->SetTitle( 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 @@ -345,13 +350,12 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos) if (accel_key != GDK_VoidSymbol) { 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); + "activate_item", + m_accel, //gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menubar)), + accel_key, + GDK_MOD1_MASK, + GTK_ACCEL_LOCKED); } -#endif gtk_widget_show( menu->m_owner ); @@ -384,20 +388,20 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos) 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) @@ -406,7 +410,7 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) wxMenu *menuOld = Remove(pos); if ( menuOld && !Insert(pos, menu, title) ) { - return (wxMenu*) NULL; + return NULL; } // either Insert() succeeded or Remove() failed and menuOld is NULL @@ -417,7 +421,7 @@ wxMenu *wxMenuBar::Remove(size_t pos) { wxMenu *menu = wxMenuBarBase::Remove(pos); if ( !menu ) - return (wxMenu*) NULL; + return NULL; gtk_menu_item_remove_submenu( GTK_MENU_ITEM(menu->m_owner) ); gtk_container_remove(GTK_CONTAINER(m_menubar), menu->m_owner); @@ -439,7 +443,7 @@ wxMenu *wxMenuBar::Remove(size_t pos) static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString ) { - if (wxMenuItem::GetLabelFromText(menu->GetTitle()) == wxMenuItem::GetLabelFromText(menuString)) + if (wxMenuItem::GetLabelText(wxConvertFromGTKToWXLabel(menu->GetTitle())) == wxMenuItem::GetLabelText(menuString)) { int res = menu->FindItem( itemString ); if (res != wxNOT_FOUND) @@ -506,7 +510,7 @@ wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const if ( menuForItem ) { - *menuForItem = result ? result->GetMenu() : (wxMenu *)NULL; + *menuForItem = result ? result->GetMenu() : NULL; } return result; @@ -524,7 +528,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 ); @@ -532,26 +536,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 wxConvertFromGTKToWXLabel(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 ); @@ -559,20 +547,20 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) wxMenu* menu = node->GetData(); - wxString str( wxReplaceUnderscore( label ) ); + const wxString str( wxReplaceUnderscore( label ) ); menu->SetTitle( str ); if (menu->m_owner) { - GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child ); + GtkLabel *glabel = GTK_LABEL( GTK_BIN(menu->m_owner)->child ); /* set new text */ - gtk_label_set( label, wxGTK_CONV( str ) ); + gtk_label_set( glabel, 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) ); + (void)gtk_label_parse_uline (GTK_LABEL(glabel), wxGTK_CONV( str ) ); + gtk_accel_label_refetch( GTK_ACCEL_LABEL(glabel) ); } } @@ -581,6 +569,7 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) // "activate" //----------------------------------------------------------------------------- +extern "C" { static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) { if (g_isIdle) @@ -590,7 +579,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) /* 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") ); + wxT("menu item not found in gtk_menu_clicked_callback") ); if (!menu->IsEnabled(id)) return; @@ -643,7 +632,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) commandEvent.SetInt(item->IsChecked()); commandEvent.SetEventObject(menu); - frame->GetEventHandler()->ProcessEvent(commandEvent); + frame->HandleWindowEvent(commandEvent); } else { @@ -651,11 +640,13 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); } } +} //----------------------------------------------------------------------------- // "select" //----------------------------------------------------------------------------- +extern "C" { static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -675,13 +666,15 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) return; wxWindow *win = menu->GetInvokingWindow(); - if (win) win->GetEventHandler()->ProcessEvent( event ); + if (win) win->HandleWindowEvent( event ); +} } //----------------------------------------------------------------------------- // "deselect" //----------------------------------------------------------------------------- +extern "C" { static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -702,7 +695,8 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) wxWindow *win = menu->GetInvokingWindow(); if (win) - win->GetEventHandler()->ProcessEvent( event ); + win->HandleWindowEvent( event ); +} } //----------------------------------------------------------------------------- @@ -729,7 +723,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu, wxMenu *subMenu) : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu) { - Init(text); + Init(); } wxMenuItem::wxMenuItem(wxMenu *parentMenu, @@ -741,15 +735,15 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu, : wxMenuItemBase(parentMenu, id, text, help, isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu) { - Init(text); + Init(); } -void wxMenuItem::Init(const wxString& text) +void wxMenuItem::Init() { - m_labelWidget = (GtkWidget *) NULL; - m_menuItem = (GtkWidget *) NULL; + m_labelWidget = NULL; + m_menuItem = NULL; - DoSetText(text); + DoSetText(m_text); } wxMenuItem::~wxMenuItem() @@ -757,62 +751,38 @@ wxMenuItem::~wxMenuItem() // don't delete menu items, the menus take care of that } -// return the menu item text without any menu accels -/* static */ -wxString wxMenuItemBase::GetLabelFromText(const wxString& text) +wxString wxMenuItem::GetItemLabel() const { - wxString label; - - for ( const wxChar *pc = text.c_str(); *pc; pc++ ) - { - if ( *pc == wxT('\t')) - break; - - if ( *pc == wxT('_') ) - { - // GTK 1.2 escapes "xxx_xxx" to "xxx__xxx" - pc++; - label += *pc; - continue; - } - -#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() ); - + wxString label = wxConvertFromGTKToWXLabel(m_text); + if (!m_hotKey.IsEmpty()) + label = label + wxT("\t") + m_hotKey; return label; } -void wxMenuItem::SetText( const wxString& str ) +void wxMenuItem::SetItemLabel( const wxString& string ) { + wxString str = string; + if ( str.empty() && !IsSeparator() ) + { + wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?")); + str = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR | + wxSTOCK_WITH_MNEMONIC); + } + // Some optimization to avoid flicker wxString oldLabel = m_text; - oldLabel = wxStripMenuCodes(oldLabel.BeforeFirst('\t')); - oldLabel.Replace(wxT("_"), wxT("")); - wxString label1 = wxStripMenuCodes(str.BeforeFirst('\t')); - if (oldLabel == label1) - return; + oldLabel = wxStripMenuCodes(oldLabel); + oldLabel.Replace(wxT("_"), wxEmptyString); + wxString label1 = wxStripMenuCodes(str); + wxString oldhotkey = GetHotKey(); // Store the old hotkey in Ctrl-foo format + wxCharBuffer oldbuf = wxGTK_CONV( GetGtkHotKey(*this) ); // and as foo DoSetText(str); + if (oldLabel == label1 && + oldhotkey == GetHotKey()) // Make sure we can change a hotkey even if the label is unaltered + return; + if (m_menuItem) { GtkLabel *label; @@ -821,16 +791,35 @@ void wxMenuItem::SetText( const wxString& str ) 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 + } + + guint accel_key; + GdkModifierType accel_mods; + gtk_accelerator_parse( (const char*) oldbuf, &accel_key, &accel_mods); + if (accel_key != 0) + { + gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem), + m_parentMenu->m_accel, + accel_key, + accel_mods ); + } + + wxCharBuffer buf = wxGTK_CONV( GetGtkHotKey(*this) ); + gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods); + if (accel_key != 0) + { + gtk_widget_add_accelerator( GTK_WIDGET(m_menuItem), + "activate", + m_parentMenu->m_accel, + accel_key, + accel_mods, + GTK_ACCEL_VISIBLE); } } @@ -838,7 +827,9 @@ void wxMenuItem::SetText( const wxString& str ) void wxMenuItem::DoSetText( const wxString& str ) { // '\t' is the deliminator indicating a hot key - m_text.Empty(); + wxString text; + text.reserve(str.length()); + const wxChar *pc = str; while ( (*pc != wxT('\0')) && (*pc != wxT('\t')) ) { @@ -846,32 +837,32 @@ void wxMenuItem::DoSetText( const wxString& str ) { // "&" is doubled to indicate "&" instead of accelerator ++pc; - m_text << wxT('&'); + text << wxT('&'); } else if (*pc == wxT('&')) { - m_text << wxT('_'); + text << wxT('_'); } else if ( *pc == wxT('_') ) // escape underscores { - m_text << wxT("__"); + text << wxT("__"); } else { - m_text << *pc; + text << *pc; } ++pc; } - // wxPrintf( wxT("DoSetText(): str %s m_text %s\n"), str.c_str(), m_text.c_str() ); + m_hotKey = wxEmptyString; - m_hotKey = wxT(""); - - if(*pc == wxT('\t')) + if ( *pc == wxT('\t') ) { pc++; m_hotKey = pc; } + + m_text = text; } #if wxUSE_ACCEL @@ -881,14 +872,15 @@ wxAcceleratorEntry *wxMenuItem::GetAccel() const if ( !GetHotKey() ) { // nothing - return (wxAcceleratorEntry *)NULL; + return NULL; } - // as wxGetAccelFromString() looks for TAB, insert a dummy one here + // accelerator parsing code looks for them after a TAB, so insert a dummy + // one here wxString label; label << wxT('\t') << GetHotKey(); - return wxGetAccelFromString(label); + return wxAcceleratorEntry::Create(label); } #endif // wxUSE_ACCEL @@ -910,7 +902,7 @@ void wxMenuItem::Check( bool check ) break; default: - wxFAIL_MSG( _T("can't check this item") ); + wxFAIL_MSG( wxT("can't check this item") ); } } @@ -924,9 +916,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; @@ -946,7 +938,7 @@ void wxMenu::Init() // our back by GTK+ e.g. when it is removed from menubar: gtk_widget_ref(m_menu); - m_owner = (GtkWidget*) NULL; + m_owner = NULL; // Tearoffs are entries, just like separators. So if we want this // menu to be a tear-off one, we just append a tearoff entry @@ -975,7 +967,7 @@ wxMenu::~wxMenu() if ( GTK_IS_WIDGET( m_menu )) { // see wxMenu::Init - gtk_widget_unref( m_menu ); + 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 ) @@ -987,181 +979,39 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) { GtkWidget *menuItem; + wxString text; + GtkLabel* label = NULL; + if ( mitem->IsSeparator() ) { -#ifdef __WXGTK20__ - menuItem = gtk_separator_menu_item_new(); -#else // TODO menuItem = gtk_menu_item_new(); -#endif - if (pos == -1) - gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem); - else - gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos); - } - else if ( mitem->IsSubMenu() ) - { - // text has "_" instead of "&" after mitem->SetText() - wxString text( mitem->GetText() ); - -#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 ); - if (pos == -1) - gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem); - else - gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos); - - gtk_widget_show( 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()) { - wxString text = mitem->GetText(); + text = mitem->wxMenuItemBase::GetItemLabel(); 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 ); - - gtk_signal_connect( GTK_OBJECT(menuItem), "activate", - GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), - (gpointer)this ); - - if (pos == -1) - gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem); - else - gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos); -#else - GdkPixmap *gdk_pixmap = bitmap->GetPixmap(); - GdkBitmap *gdk_bitmap = bitmap->GetMask() ? bitmap->GetMask()->GetBitmap() : (GdkBitmap*) NULL; - - 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); - } - - gtk_widget_show (label); - - 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 ); - - if (pos == -1) - gtk_menu_append( GTK_MENU(m_menu), menuItem ); - else - gtk_menu_insert( GTK_MENU(m_menu), menuItem, pos ); - gtk_widget_show( menuItem ); -#endif + // TODO + wxUnusedVar(bitmap); + menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) ); + label = GTK_LABEL( GTK_BIN(menuItem)->child ); m_prevRadio = NULL; } else // a normal item { - // text has "_" instead of "&" after mitem->SetText() so don't use it - wxString text( mitem->GetText() ); + // text has "_" instead of "&" after mitem->SetItemLabel() so don't use it + text = mitem->wxMenuItemBase::GetItemLabel() ; 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 ); + 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; } @@ -1172,99 +1022,40 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) 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 ); + 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 + label = GTK_LABEL( GTK_BIN(menuItem)->child ); } break; } default: - wxFAIL_MSG( _T("unexpected menu item kind") ); + wxFAIL_MSG( wxT("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 + label = GTK_LABEL( GTK_BIN(menuItem)->child ); m_prevRadio = NULL; break; } } - gtk_signal_connect( GTK_OBJECT(menuItem), "activate", - GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), - (gpointer)this ); - - 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); } 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() ); + wxCharBuffer buf = wxGTK_CONV( GetGtkHotKey(*mitem) ); + // wxPrintf( wxT("item: %s hotkey %s\n"), mitem->GetItemLabel().c_str(), GetGtkHotKey(*mitem).c_str() ); gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods); if (accel_key != 0) { @@ -1276,6 +1067,11 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) GTK_ACCEL_VISIBLE); } + if (pos == -1) + gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem); + else + gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos); + gtk_widget_show( menuItem ); if ( !mitem->IsSeparator() ) @@ -1289,6 +1085,36 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), (gpointer)this ); + + if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK ) + { + gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu ); + + gtk_widget_show( mitem->GetSubMenu()->m_menu ); + + // if adding a submenu to a menu already existing in the menu bar, we + // must set invoking window to allow processing events from this + // submenu + if ( m_invokingWindow ) + wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow); + } + else + { + gtk_signal_connect( GTK_OBJECT(menuItem), "activate", + GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), + (gpointer)this ); + } + + 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); + } } mitem->SetMenuItem(menuItem); @@ -1299,7 +1125,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) // gtk_widget_lock_accelerators(mitem->GetMenuItem()); } - return TRUE; + return true; } wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem) @@ -1325,7 +1151,7 @@ wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { if ( !wxMenuBase::DoRemove(item) ) - return (wxMenuItem *)NULL; + return NULL; // TODO: this code doesn't delete the item factory item and this seems // impossible as of GTK 1.2.6. @@ -1341,7 +1167,7 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const { wxMenuItem *item = node->GetData(); if (item->GetMenuItem() == menuItem) - return item->GetId(); + return item->GetId(); node = node->GetNext(); } @@ -1354,7 +1180,7 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const #if wxUSE_ACCEL -static wxString GetHotKey( const wxMenuItem& item ) +static wxString GetGtkHotKey( const wxMenuItem& item ) { wxString hotkey; @@ -1384,19 +1210,25 @@ static wxString GetHotKey( const wxMenuItem& item ) case WXK_F10: case WXK_F11: case WXK_F12: + case WXK_F13: + case WXK_F14: + case WXK_F15: + case WXK_F16: + case WXK_F17: + case WXK_F18: + case WXK_F19: + case WXK_F20: + case WXK_F21: + case WXK_F22: + case WXK_F23: + case WXK_F24: hotkey += wxString::Format(wxT("F%d"), code - WXK_F1 + 1); break; // TODO: we should use gdk_keyval_name() (a.k.a. // XKeysymToString) here as well as hardcoding the keysym // names this might be not portable - case WXK_NUMPAD_INSERT: - hotkey << wxT("KP_Insert" ); - break; - case WXK_NUMPAD_DELETE: - hotkey << wxT("KP_Delete" ); - break; - case WXK_INSERT: + case WXK_INSERT: hotkey << wxT("Insert" ); break; case WXK_DELETE: @@ -1409,12 +1241,10 @@ static wxString GetHotKey( 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" ); @@ -1431,15 +1261,173 @@ static wxString GetHotKey( const wxMenuItem& item ) case WXK_RETURN: hotkey << wxT("Return" ); break; - - // if there are any other keys wxGetAccelFromString() may + case WXK_BACK: + hotkey << wxT("BackSpace" ); + break; + case WXK_TAB: + hotkey << wxT("Tab" ); + break; + case WXK_ESCAPE: + hotkey << wxT("Esc" ); + break; + case WXK_SPACE: + hotkey << wxT("space" ); + break; + case WXK_MULTIPLY: + hotkey << wxT("Multiply" ); + break; + case WXK_ADD: + hotkey << wxT("Add" ); + break; + case WXK_SEPARATOR: + hotkey << wxT("Separator" ); + break; + case WXK_SUBTRACT: + hotkey << wxT("Subtract" ); + break; + case WXK_DECIMAL: + hotkey << wxT("Decimal" ); + break; + case WXK_DIVIDE: + hotkey << wxT("Divide" ); + break; + case WXK_CANCEL: + hotkey << wxT("Cancel" ); + break; + case WXK_CLEAR: + hotkey << wxT("Clear" ); + break; + case WXK_MENU: + hotkey << wxT("Menu" ); + break; + case WXK_PAUSE: + hotkey << wxT("Pause" ); + break; + case WXK_CAPITAL: + hotkey << wxT("Capital" ); + break; + case WXK_SELECT: + hotkey << wxT("Select" ); + break; + case WXK_PRINT: + hotkey << wxT("Print" ); + break; + case WXK_EXECUTE: + hotkey << wxT("Execute" ); + break; + case WXK_SNAPSHOT: + hotkey << wxT("Snapshot" ); + break; + case WXK_HELP: + hotkey << wxT("Help" ); + break; + case WXK_NUMLOCK: + hotkey << wxT("Num_Lock" ); + break; + case WXK_SCROLL: + hotkey << wxT("Scroll_Lock" ); + break; + case WXK_NUMPAD_INSERT: + hotkey << wxT("KP_Insert" ); + break; + case WXK_NUMPAD_DELETE: + hotkey << wxT("KP_Delete" ); + break; + case WXK_NUMPAD_SPACE: + hotkey << wxT("KP_Space" ); + break; + case WXK_NUMPAD_TAB: + hotkey << wxT("KP_Tab" ); + break; + case WXK_NUMPAD_ENTER: + hotkey << wxT("KP_Enter" ); + break; + case WXK_NUMPAD_F1: case WXK_NUMPAD_F2: case WXK_NUMPAD_F3: + case WXK_NUMPAD_F4: + hotkey += wxString::Format(wxT("KP_F%d"), code - WXK_NUMPAD_F1 + 1); + break; + case WXK_NUMPAD_HOME: + hotkey << wxT("KP_Home" ); + break; + case WXK_NUMPAD_LEFT: + hotkey << wxT("KP_Left" ); + break; + case WXK_NUMPAD_UP: + hotkey << wxT("KP_Up" ); + break; + case WXK_NUMPAD_RIGHT: + hotkey << wxT("KP_Right" ); + break; + case WXK_NUMPAD_DOWN: + hotkey << wxT("KP_Down" ); + break; + case WXK_NUMPAD_PAGEUP: + hotkey << wxT("KP_Page_Up" ); + break; + case WXK_NUMPAD_PAGEDOWN: + hotkey << wxT("KP_Page_Down" ); + break; + case WXK_NUMPAD_END: + hotkey << wxT("KP_End" ); + break; + case WXK_NUMPAD_BEGIN: + hotkey << wxT("KP_Begin" ); + break; + case WXK_NUMPAD_EQUAL: + hotkey << wxT("KP_Equal" ); + break; + case WXK_NUMPAD_MULTIPLY: + hotkey << wxT("KP_Multiply" ); + break; + case WXK_NUMPAD_ADD: + hotkey << wxT("KP_Add" ); + break; + case WXK_NUMPAD_SEPARATOR: + hotkey << wxT("KP_Separator" ); + break; + case WXK_NUMPAD_SUBTRACT: + hotkey << wxT("KP_Subtract" ); + break; + case WXK_NUMPAD_DECIMAL: + hotkey << wxT("KP_Decimal" ); + break; + case WXK_NUMPAD_DIVIDE: + hotkey << wxT("KP_Divide" ); + break; + case WXK_NUMPAD0: case WXK_NUMPAD1: case WXK_NUMPAD2: + case WXK_NUMPAD3: case WXK_NUMPAD4: case WXK_NUMPAD5: + case WXK_NUMPAD6: case WXK_NUMPAD7: case WXK_NUMPAD8: case WXK_NUMPAD9: + hotkey += wxString::Format(wxT("KP_%d"), code - WXK_NUMPAD0); + break; + case WXK_WINDOWS_LEFT: + hotkey << wxT("Super_L" ); + break; + case WXK_WINDOWS_RIGHT: + hotkey << wxT("Super_R" ); + break; + case WXK_WINDOWS_MENU: + hotkey << wxT("Menu" ); + break; + case WXK_COMMAND: + hotkey << wxT("Command" ); + break; + /* These probably wouldn't work as there is no SpecialX in gdk/keynames.txt + case WXK_SPECIAL1: case WXK_SPECIAL2: case WXK_SPECIAL3: case WXK_SPECIAL4: + case WXK_SPECIAL5: case WXK_SPECIAL6: case WXK_SPECIAL7: case WXK_SPECIAL8: + case WXK_SPECIAL9: case WXK_SPECIAL10: case WXK_SPECIAL11: case WXK_SPECIAL12: + case WXK_SPECIAL13: case WXK_SPECIAL14: case WXK_SPECIAL15: case WXK_SPECIAL16: + case WXK_SPECIAL17: case WXK_SPECIAL18: case WXK_SPECIAL19: case WXK_SPECIAL20: + hotkey += wxString::Format(wxT("Special%d"), code - WXK_SPECIAL1 + 1); + break; + */ + // if there are any other keys wxAcceleratorEntry::Create() may // return, we should process them here default: if ( code < 127 ) { wxString name = wxGTK_CONV_BACK( gdk_keyval_name((guint)code) ); - if ( name ) + if ( !name.empty() ) { hotkey << name; break; @@ -1457,382 +1445,115 @@ static wxString GetHotKey( const wxMenuItem& item ) #endif // wxUSE_ACCEL +// ---------------------------------------------------------------------------- +// Pop-up menu stuff +// ---------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -// substitute for missing GtkPixmapMenuItem -//----------------------------------------------------------------------------- +#if wxUSE_MENUS_NATIVE -#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" +extern "C" WXDLLIMPEXP_CORE +void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting ) { - -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; - + *is_waiting = false; } -#define BORDER_SPACING 3 -#define PMAP_WIDTH 20 - -GtkType -gtk_pixmap_menu_item_get_type (void) +WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win ) { - static GtkType pixmap_menu_item_type = 0; + menu->SetInvokingWindow( win ); - if (!pixmap_menu_item_type) + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); + while (node) { - 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; -} - -/** - * 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); + wxMenuItem *menuitem = node->GetData(); + if (menuitem->IsSubMenu()) + { + SetInvokingWindow( menuitem->GetSubMenu(), win ); + } - if (GTK_WIDGET_DRAWABLE (widget) && - GTK_PIXMAP_MENU_ITEM(widget)->pixmap) { - gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL); - } + node = node->GetNext(); + } } -static gint -gtk_pixmap_menu_item_expose (GtkWidget *widget, - GdkEventExpose *event) +extern "C" WXDLLIMPEXP_CORE +void wxPopupMenuPositionCallback( GtkMenu *menu, + gint *x, gint *y, + gpointer user_data ) { - 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); + // ensure that the menu appears entirely on screen + GtkRequisition req; + gtk_widget_get_child_requisition(GTK_WIDGET(menu), &req); - if (GTK_WIDGET_DRAWABLE (widget) && - GTK_PIXMAP_MENU_ITEM(widget)->pixmap) { - gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL); - } + wxSize sizeScreen = wxGetDisplaySize(); + wxPoint *pos = (wxPoint*)user_data; - return FALSE; -} + gint xmax = sizeScreen.x - req.width, + ymax = sizeScreen.y - req.height; -/** - * 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); + *x = pos->x < xmax ? pos->x : xmax; + *y = pos->y < ymax ? pos->y : ymax; } -static void -gtk_pixmap_menu_item_map (GtkWidget *widget) +bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) { - GtkPixmapMenuItem *menu_item; + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") ); - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget)); + wxCHECK_MSG( menu != NULL, false, wxT("invalid popup-menu") ); - menu_item = GTK_PIXMAP_MENU_ITEM(widget); + // NOTE: if you change this code, you need to update + // the same code in taskbar.cpp as well. This + // is ugly code duplication, I know. - GTK_WIDGET_CLASS(parent_class)->map(widget); + SetInvokingWindow( menu, this ); - if (menu_item->pixmap && - GTK_WIDGET_VISIBLE (menu_item->pixmap) && - !GTK_WIDGET_MAPPED (menu_item->pixmap)) - gtk_widget_map (menu_item->pixmap); -} + menu->UpdateUI(); -static void -gtk_pixmap_menu_item_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - GtkPixmapMenuItem *pmenu_item; + bool is_waiting = true; - pmenu_item = GTK_PIXMAP_MENU_ITEM(widget); + gulong handler = gtk_signal_connect( GTK_OBJECT(menu->m_menu), + "hide", + GTK_SIGNAL_FUNC(gtk_pop_hide_callback), + (gpointer)&is_waiting ); - if (pmenu_item->pixmap && GTK_WIDGET_VISIBLE(pmenu_item)) + wxPoint pos; + gpointer userdata; + GtkMenuPositionFunc posfunc; + if ( x == -1 && y == -1 ) { - 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); + // use GTK's default positioning algorithm + userdata = NULL; + posfunc = NULL; + } + else + { + pos = ClientToScreen(wxPoint(x, y)); + userdata = &pos; + posfunc = wxPopupMenuPositionCallback; } - 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); -} - -static void -gtk_pixmap_menu_item_size_request (GtkWidget *widget, - GtkRequisition *requisition) -{ - 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); - - if (menu_item->pixmap) - gtk_widget_size_request(menu_item->pixmap, &req); - - 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); -} + wxMenuEvent eventOpen(wxEVT_MENU_OPEN, -1, menu); + DoCommonMenuCallbackCode(menu, eventOpen); -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)); -} + gtk_menu_popup( + GTK_MENU(menu->m_menu), + NULL, // parent menu shell + NULL, // parent menu item + posfunc, // function to position it + userdata, // client data + 0, // button used to activate it + wxGtkTimeLastClick // the time of activation + ); + while (is_waiting) + { + gtk_main_iteration(); + } -/* 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; + gtk_signal_disconnect(GTK_OBJECT(menu->m_menu), handler); - 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; + wxMenuEvent eventClose(wxEVT_MENU_CLOSE, -1, menu); + DoCommonMenuCallbackCode(menu, eventClose); - 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 true; } -#endif - +#endif // wxUSE_MENUS_NATIVE