X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43a11e2a507fe0300ac28c0667bfbecdcc51f432..9e15c718b3a9da121a2c5ca0b490959e5d472046:/src/gtk/menu.cpp diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index f0dad01dcf..ff7cac5e42 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.cpp +// Name: src/gtk/menu.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,35 +11,28 @@ #include "wx/wxprec.h" #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 + +#define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g)) +//#define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g)) +//#define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m) + +#define ACCEL_OBJECT GtkWindow +#define ACCEL_OBJECTS(a) (a)->acceleratables +#define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj) // we use normal item but with a special id for the menu title static const int wxGTK_TITLE_ID = -3; @@ -48,9 +41,6 @@ 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 @@ -150,7 +140,7 @@ 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; @@ -162,9 +152,6 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st } m_menubar = gtk_menu_bar_new(); -#ifndef __WXGTK20__ - m_accel = gtk_accel_group_new(); -#endif if (style & wxMB_DOCKABLE) { @@ -188,10 +175,8 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st // 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 ); + g_signal_connect (m_menubar, "deactivate", + G_CALLBACK (gtk_menu_close_callback), this); } @@ -222,11 +207,6 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *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) { @@ -267,13 +247,6 @@ 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) { @@ -283,6 +256,50 @@ 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; @@ -290,11 +307,6 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *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) { @@ -307,7 +319,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); } @@ -320,25 +332,8 @@ 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 - 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) - { - 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); - } -#endif + menu->SetLayoutDirection(GetLayoutDirection()); gtk_widget_show( menu->m_owner ); @@ -349,9 +344,9 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos) 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 ); + g_signal_connect (menu->m_owner, "activate", + G_CALLBACK (gtk_menu_open_callback), + menu); // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables // addings menu later on. @@ -371,20 +366,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) @@ -551,17 +546,7 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) menu->SetTitle( str ); if (menu->m_owner) - { - GtkLabel *glabel = GTK_LABEL( GTK_BIN(menu->m_owner)->child ); - - /* set new text */ - gtk_label_set( glabel, wxGTK_CONV( str ) ); - - /* reparse key accel */ - (void)gtk_label_parse_uline (GTK_LABEL(glabel), wxGTK_CONV( str ) ); - gtk_accel_label_refetch( GTK_ACCEL_LABEL(glabel) ); - } - + gtk_label_set_text_with_mnemonic( GTK_LABEL( GTK_BIN(menu->m_owner)->child), wxGTK_CONV(str) ); } //----------------------------------------------------------------------------- @@ -769,7 +754,6 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text) continue; } -#ifdef __WXGTK20__ if ( *pc == wxT('\\') ) { // GTK 2.0 escapes "xxx/xxx" to "xxx\/xxx" @@ -777,7 +761,6 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text) label += *pc; continue; } -#endif if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) ) { @@ -796,18 +779,24 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text) void wxMenuItem::SetText( const wxString& str ) { + // cache some data which must be used later + bool isstock = wxIsStockID(GetId()); + const char *stockid = NULL; + if (isstock) + stockid = wxGetStockGtkID(GetId()); + // Some optimization to avoid flicker wxString oldLabel = m_text; oldLabel = wxStripMenuCodes(oldLabel); oldLabel.Replace(wxT("_"), wxT("")); wxString label1 = wxStripMenuCodes(str); wxString oldhotkey = GetHotKey(); // Store the old hotkey in Ctrl-foo format - wxCharBuffer oldbuf = wxGTK_CONV( GetGtkHotKey(*this) ); // and as foo + wxCharBuffer oldbuf = wxGTK_CONV_SYS( GetGtkHotKey(*this) ); // and as foo DoSetText(str); if (oldLabel == label1 && - oldhotkey == GetHotKey()) // Make sure we can change a hotkey even if the label is unaltered + oldhotkey == GetHotKey()) // Make sure we can change a hotkey even if the label is unaltered return; if (m_menuItem) @@ -818,47 +807,78 @@ 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 ) ); + // stock menu items can have empty labels: + wxString text = m_text; + if (text.IsEmpty() && !IsSeparator()) + { + wxASSERT_MSG(isstock, wxT("A non-stock menu item with an empty label?")); + text = wxGetStockLabel(GetId()); + + // need & => _ conversion + text = GTKProcessMenuItemLabel(text, NULL); + } - // reparse key accel - (void)gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV(m_text) ); - gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) ); -#endif + gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV_SYS(text) ); } + // remove old accelerator from our parent's accelerator group, if present guint accel_key; GdkModifierType accel_mods; - gtk_accelerator_parse( (const char*) oldbuf, &accel_key, &accel_mods); - if (accel_key != 0) + if (oldbuf[(size_t)0] != '\0') + { + gtk_accelerator_parse( (const char*) oldbuf, &accel_key, &accel_mods); + if (accel_key != 0) + { + gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem), + m_parentMenu->m_accel, + accel_key, + accel_mods ); + } + } + else if (isstock) { - gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem), - m_parentMenu->m_accel, - accel_key, - accel_mods ); + // if the accelerator was taken from a stock ID, just get it back from GTK+ stock + if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key)) + gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem), + m_parentMenu->m_accel, + accel_key, + accel_mods ); } - wxCharBuffer buf = wxGTK_CONV( GetGtkHotKey(*this) ); - gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods); - if (accel_key != 0) + // add new accelerator to our parent's accelerator group + wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*this) ); + if (buf[(size_t)0] != '\0') { - gtk_widget_add_accelerator( GTK_WIDGET(m_menuItem), - "activate", - m_parentMenu->m_accel, - accel_key, - accel_mods, - GTK_ACCEL_VISIBLE); + gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods); + if (accel_key != 0) + { + gtk_widget_add_accelerator( GTK_WIDGET(m_menuItem), + "activate", + m_parentMenu->m_accel, + accel_key, + accel_mods, + GTK_ACCEL_VISIBLE); + } + } + else if (isstock) + { + // if the accelerator was taken from a stock ID, just get it back from GTK+ stock + if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key)) + gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem), + m_parentMenu->m_accel, + accel_key, + accel_mods ); } } -// it's valid for this function to be called even if m_menuItem == NULL -void wxMenuItem::DoSetText( const wxString& str ) +// NOTE: this function is different from the similar functions GTKProcessMnemonics() +// implemented in control.cpp and from wxMenuItemBase::GetLabelFromText... +// so there's no real code duplication +wxString wxMenuItem::GTKProcessMenuItemLabel(const wxString& str, wxString *hotKey) { + wxString text; + // '\t' is the deliminator indicating a hot key - m_text.Empty(); const wxChar *pc = str; while ( (*pc != wxT('\0')) && (*pc != wxT('\t')) ) { @@ -866,32 +886,41 @@ 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; } - m_hotKey = wxT(""); - - if(*pc == wxT('\t')) + if (hotKey) { - pc++; - m_hotKey = pc; + hotKey->Empty(); + if(*pc == wxT('\t')) + { + pc++; + *hotKey = pc; + } } - // wxPrintf( wxT("DoSetText(): str %s m_text %s hotkey %s\n"), str.c_str(), m_text.c_str(), m_hotKey.c_str() ); + return text; +} + +// it's valid for this function to be called even if m_menuItem == NULL +void wxMenuItem::DoSetText( const wxString& str ) +{ + m_text.Empty(); + m_text = GTKProcessMenuItemLabel(str, &m_hotKey); } #if wxUSE_ACCEL @@ -901,14 +930,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 @@ -926,7 +956,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: @@ -944,9 +974,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; @@ -975,7 +1005,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; @@ -1003,76 +1033,97 @@ wxMenu::~wxMenu() } } +void wxMenu::SetLayoutDirection(const wxLayoutDirection dir) +{ + if ( m_owner ) + wxWindow::GTKSetLayout(m_owner, dir); + //else: will be called later by wxMenuBar again +} + +wxLayoutDirection wxMenu::GetLayoutDirection() const +{ + return wxWindow::GTKGetLayout(m_owner); +} + bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) { GtkWidget *menuItem; - wxString text; -#ifndef __WXGTK20__ - GtkLabel* label; -#endif + // cache some data used later + wxString text = mitem->GetText(); + int id = mitem->GetId(); + bool isstock = wxIsStockID(id); + const char *stockid = NULL; + if (isstock) + stockid = wxGetStockGtkID(mitem->GetId()); + + // stock menu items can have an empty label + if (text.IsEmpty() && !mitem->IsSeparator()) + { + wxASSERT_MSG(isstock, wxT("A non-stock menu item with an empty label?")); + text = wxGetStockLabel(id); + + // need & => _ conversion + text = wxMenuItem::GTKProcessMenuItemLabel(text, NULL); + } if ( mitem->IsSeparator() ) { -#ifdef __WXGTK20__ menuItem = gtk_separator_menu_item_new(); -#else - // TODO - menuItem = gtk_menu_item_new(); -#endif } - else if (mitem->GetBitmap().Ok()) + else if ( mitem->GetBitmap().Ok() || + (mitem->GetKind() == wxITEM_NORMAL && isstock) ) { - text = mitem->GetText(); - const wxBitmap *bitmap = &mitem->GetBitmap(); + wxBitmap bitmap(mitem->GetBitmap()); -#ifdef __WXGTK20__ - menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV( text ) ); + menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) ); GtkWidget *image; - if (bitmap->HasPixbuf()) + if ( !bitmap.Ok() ) { - image = gtk_image_new_from_pixbuf(bitmap->GetPixbuf()); + // use stock bitmap for this item if available on the assumption + // that it never hurts to follow GTK+ conventions more closely + image = stockid ? gtk_image_new_from_stock(stockid, GTK_ICON_SIZE_MENU) + : NULL; } - else + else // we have a custom bitmap { - 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 ); - } + wxASSERT_MSG( mitem->GetKind() == wxITEM_NORMAL, + _T("only normal menu items can have bitmaps") ); - gtk_widget_show(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_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(menuItem), image ); + if ( image ) + { + gtk_widget_show(image); -#else - // TODO - wxUnusedVar(bitmap); - menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) ); - label = GTK_LABEL( GTK_BIN(menuItem)->child ); -#endif + gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(menuItem), image ); + } m_prevRadio = NULL; } else // a normal item { - // text has "_" instead of "&" after mitem->SetText() so don't use it - text = mitem->GetText() ; + // NB: 'text' variable has "_" instead of "&" after mitem->SetText() + // so don't use it 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 ) ); - label = GTK_LABEL( GTK_BIN(menuItem)->child ); - // set new text - gtk_label_set_text( label, wxGTK_CONV( text ) ); -#endif + menuItem = gtk_check_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) ); m_prevRadio = NULL; break; } @@ -1083,25 +1134,14 @@ 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 ) ); - label = GTK_LABEL( GTK_BIN(menuItem)->child ); - // set new text - gtk_label_set_text( label, wxGTK_CONV( text ) ); -#endif + m_prevRadio = menuItem = + gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV_SYS( text ) ); } 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 ) ); - label = GTK_LABEL( GTK_BIN(menuItem)->child ); -#endif + m_prevRadio = menuItem = + gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV_SYS( text ) ); } break; } @@ -1112,12 +1152,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) 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 + menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) ); m_prevRadio = NULL; break; } @@ -1127,18 +1162,32 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) guint accel_key; GdkModifierType accel_mods; - wxCharBuffer buf = wxGTK_CONV( GetGtkHotKey(*mitem) ); + wxCharBuffer buf = wxGTK_CONV_SYS( 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) + if (buf[(size_t)0] != '\0') + { + gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods); + if (accel_key != 0) + { + gtk_widget_add_accelerator (GTK_WIDGET(menuItem), + "activate", + m_accel, + accel_key, + accel_mods, + GTK_ACCEL_VISIBLE); + } + } + else if (isstock) { - gtk_widget_add_accelerator (GTK_WIDGET(menuItem), - "activate", - m_accel, - accel_key, - accel_mods, - GTK_ACCEL_VISIBLE); + // if the accelerator was taken from a stock ID, just get it back from GTK+ stock + if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key)) + gtk_widget_add_accelerator( GTK_WIDGET(menuItem), + "activate", + m_accel, + accel_key, + accel_mods, + GTK_ACCEL_VISIBLE); } if (pos == -1) @@ -1152,13 +1201,10 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) { 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 ); + g_signal_connect (menuItem, "select", + G_CALLBACK (gtk_menu_hilight_callback), this); + g_signal_connect (menuItem, "deselect", + G_CALLBACK (gtk_menu_nolight_callback), this); if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK ) { @@ -1174,23 +1220,10 @@ 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 (gtk_menu_clicked_callback), + this); } -#endif } mitem->SetMenuItem(menuItem); @@ -1201,7 +1234,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) // gtk_widget_lock_accelerators(mitem->GetMenuItem()); } - return TRUE; + return true; } wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem) @@ -1250,6 +1283,14 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const return wxNOT_FOUND; } +void wxMenu::Attach(wxMenuBarBase *menubar) +{ + wxMenuBase::Attach(menubar); + + // inherit layout direction from menubar. + SetLayoutDirection(menubar->GetLayoutDirection()); +} + // ---------------------------------------------------------------------------- // helpers // ---------------------------------------------------------------------------- @@ -1317,12 +1358,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item ) hotkey << wxT("Down" ); break; case WXK_PAGEUP: - case WXK_PRIOR: - hotkey << wxT("Prior" ); + hotkey << wxT("PgUp" ); break; case WXK_PAGEDOWN: - case WXK_NEXT: - hotkey << wxT("Next" ); + hotkey << wxT("PgDn" ); break; case WXK_LEFT: hotkey << wxT("Left" ); @@ -1439,11 +1478,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_PgUp" ); break; - case WXK_NUMPAD_NEXT: case WXK_NUMPAD_PAGEDOWN: - hotkey << wxT("KP_Next" ); + case WXK_NUMPAD_PAGEDOWN: + hotkey << wxT("KP_PgDn" ); break; case WXK_NUMPAD_END: hotkey << wxT("KP_End" ); @@ -1498,7 +1537,7 @@ 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: @@ -1529,13 +1568,13 @@ static wxString GetGtkHotKey( const wxMenuItem& item ) #if wxUSE_MENUS_NATIVE -extern "C" +extern "C" WXDLLIMPEXP_CORE void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting ) { - *is_waiting = FALSE; + *is_waiting = false; } -static void SetInvokingWindow( wxMenu *menu, wxWindow* win ) +WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win ) { menu->SetInvokingWindow( win ); @@ -1552,12 +1591,10 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow* win ) } } -extern "C" +extern "C" WXDLLIMPEXP_CORE void wxPopupMenuPositionCallback( GtkMenu *menu, gint *x, gint *y, -#ifdef __WXGTK20__ gboolean * WXUNUSED(whatever), -#endif gpointer user_data ) { // ensure that the menu appears entirely on screen @@ -1590,10 +1627,9 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) bool is_waiting = true; - gulong handler = gtk_signal_connect( GTK_OBJECT(menu->m_menu), - "hide", - GTK_SIGNAL_FUNC(gtk_pop_hide_callback), - (gpointer)&is_waiting ); + gulong handler = g_signal_connect (menu->m_menu, "hide", + G_CALLBACK (gtk_pop_hide_callback), + &is_waiting); wxPoint pos; gpointer userdata; @@ -1621,11 +1657,7 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) posfunc, // function to position it userdata, // client data 0, // button used to activate it -#ifdef __WXGTK20__ gtk_get_current_event_time() -#else - gs_timeLastClick // the time of activation -#endif ); while (is_waiting) @@ -1633,7 +1665,7 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) gtk_main_iteration(); } - gtk_signal_disconnect(GTK_OBJECT(menu->m_menu), handler); + g_signal_handler_disconnect (menu->m_menu, handler); wxMenuEvent eventClose(wxEVT_MENU_CLOSE, -1, menu); DoCommonMenuCallbackCode(menu, eventClose); @@ -1642,4 +1674,3 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) } #endif // wxUSE_MENUS_NATIVE -