Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for menu items with a bitmap and an accelerator, with thanks to

Browse Source 
Alberto Griggio.  (Previously sometimes an event was not sent for menu
items with an image and an accelerator.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@22414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-07-31 16:47:39 +00:00
parent 86f63b95c4
commit 3cf67e09d5
2 changed files with 60 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gtk/menu.cpp
View File

@@ -1184,13 +1184,32 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_container_add (GTK_CONTAINER (menuItem), label); gtk_container_add (GTK_CONTAINER (menuItem), label);
guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuItem); 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) if (accel_key != GDK_VoidSymbol)
{ {
gtk_widget_add_accelerator (menuItem, gtk_widget_add_accelerator (menuItem,
"activate_item", "activate_item",
gtk_menu_ensure_uline_accel_group (GTK_MENU (m_menu)), gtk_menu_get_accel_group(
GTK_MENU(m_menu)),
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, (GdkModifierType) 0, accel_key, (GdkModifierType) 0,
GTK_ACCEL_LOCKED); GTK_ACCEL_LOCKED);
} }
@@ -1203,7 +1222,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
gtk_widget_show(pixmap); gtk_widget_show(pixmap);
gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM( menuItem ), pixmap); gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM( menuItem ), pixmap);
gtk_signal_connect( GTK_OBJECT(menuItem), "activate_item", gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
(gpointer)this ); (gpointer)this );

25
src/gtk1/menu.cpp
View File

@@ -1184,13 +1184,32 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_container_add (GTK_CONTAINER (menuItem), label); gtk_container_add (GTK_CONTAINER (menuItem), label);
guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuItem); 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) if (accel_key != GDK_VoidSymbol)
{ {
gtk_widget_add_accelerator (menuItem, gtk_widget_add_accelerator (menuItem,
"activate_item", "activate_item",
gtk_menu_ensure_uline_accel_group (GTK_MENU (m_menu)), gtk_menu_get_accel_group(
GTK_MENU(m_menu)),
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, (GdkModifierType) 0, accel_key, (GdkModifierType) 0,
GTK_ACCEL_LOCKED); GTK_ACCEL_LOCKED);
} }
@@ -1203,7 +1222,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
gtk_widget_show(pixmap); gtk_widget_show(pixmap);
gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM( menuItem ), pixmap); gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM( menuItem ), pixmap);
gtk_signal_connect( GTK_OBJECT(menuItem), "activate_item", gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
(gpointer)this ); (gpointer)this );