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

41
src/gtk/menu.cpp
View File

@@ -78,7 +78,7 @@ typedef struct _GtkPixmapMenuItemClass GtkPixmapMenuItemClass;
struct _GtkPixmapMenuItem struct _GtkPixmapMenuItem
{ {
GtkMenuItem menu_item; GtkMenuItem menu_item;
GtkWidget *pixmap; GtkWidget *pixmap;
}; };
@@ -1183,18 +1183,37 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
GtkWidget *label = gtk_accel_label_new ( wxGTK_CONV( text ) ); GtkWidget *label = gtk_accel_label_new ( wxGTK_CONV( text ) );
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);
} }
gtk_widget_show (label); gtk_widget_show (label);
mitem->SetLabelWidget(label); mitem->SetLabelWidget(label);
@@ -1203,14 +1222,14 @@ 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 );
gtk_menu_append( GTK_MENU(m_menu), menuItem ); gtk_menu_append( GTK_MENU(m_menu), menuItem );
gtk_widget_show( menuItem ); gtk_widget_show( menuItem );
} }
#endif #endif
else // a normal item else // a normal item
{ {
// text has "_" instead of "&" after mitem->SetText() so don't use it // text has "_" instead of "&" after mitem->SetText() so don't use it
@@ -1290,14 +1309,14 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
unsigned char mask_b = image.GetMaskBlue(); unsigned char mask_b = image.GetMaskBlue();
unsigned char mask_g = image.GetMaskGreen(); unsigned char mask_g = image.GetMaskGreen();
wxUint32 tmp; wxUint32 tmp;
// Magic // Magic
*dest = 'G'; dest++; *dest = 'd'; dest++; *dest = 'k'; dest++; *dest = 'P'; dest++; *dest = 'G'; dest++; *dest = 'd'; dest++; *dest = 'k'; dest++; *dest = 'P'; dest++;
// Data size // Data size
tmp = size; tmp = size;
*dest = tmp >> 24; dest++; *dest = tmp >> 16; dest++; *dest = tmp >> 8; dest++; *dest = tmp; dest++; *dest = tmp >> 24; dest++; *dest = tmp >> 16; dest++; *dest = tmp >> 8; dest++; *dest = tmp; dest++;
// Pixdata type // Pixdata type
*dest = 1; dest++; *dest = 1; dest++; *dest = 0; dest++; *dest = 2; dest++; *dest = 1; dest++; *dest = 1; dest++; *dest = 0; dest++; *dest = 2; dest++;
// Rowstride // Rowstride
tmp = image.GetWidth()*4; tmp = image.GetWidth()*4;
*dest = tmp >> 24; dest++; *dest = tmp >> 16; dest++; *dest = tmp >> 8; dest++; *dest = tmp; dest++; *dest = tmp >> 24; dest++; *dest = tmp >> 16; dest++; *dest = tmp >> 8; dest++; *dest = tmp; dest++;
@@ -1551,7 +1570,7 @@ static wxString GetHotKey( const wxMenuItem& item )
// substitute for missing GtkPixmapMenuItem // substitute for missing GtkPixmapMenuItem
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef __WXGTK20__ #ifndef __WXGTK20__
/* /*
* Copyright (C) 1998, 1999, 2000 Free Software Foundation * Copyright (C) 1998, 1999, 2000 Free Software Foundation

41
src/gtk1/menu.cpp
View File

@@ -78,7 +78,7 @@ typedef struct _GtkPixmapMenuItemClass GtkPixmapMenuItemClass;
struct _GtkPixmapMenuItem struct _GtkPixmapMenuItem
{ {
GtkMenuItem menu_item; GtkMenuItem menu_item;
GtkWidget *pixmap; GtkWidget *pixmap;
}; };
@@ -1183,18 +1183,37 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
GtkWidget *label = gtk_accel_label_new ( wxGTK_CONV( text ) ); GtkWidget *label = gtk_accel_label_new ( wxGTK_CONV( text ) );
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);
} }
gtk_widget_show (label); gtk_widget_show (label);
mitem->SetLabelWidget(label); mitem->SetLabelWidget(label);
@@ -1203,14 +1222,14 @@ 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 );
gtk_menu_append( GTK_MENU(m_menu), menuItem ); gtk_menu_append( GTK_MENU(m_menu), menuItem );
gtk_widget_show( menuItem ); gtk_widget_show( menuItem );
} }
#endif #endif
else // a normal item else // a normal item
{ {
// text has "_" instead of "&" after mitem->SetText() so don't use it // text has "_" instead of "&" after mitem->SetText() so don't use it
@@ -1290,14 +1309,14 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
unsigned char mask_b = image.GetMaskBlue(); unsigned char mask_b = image.GetMaskBlue();
unsigned char mask_g = image.GetMaskGreen(); unsigned char mask_g = image.GetMaskGreen();
wxUint32 tmp; wxUint32 tmp;
// Magic // Magic
*dest = 'G'; dest++; *dest = 'd'; dest++; *dest = 'k'; dest++; *dest = 'P'; dest++; *dest = 'G'; dest++; *dest = 'd'; dest++; *dest = 'k'; dest++; *dest = 'P'; dest++;
// Data size // Data size
tmp = size; tmp = size;
*dest = tmp >> 24; dest++; *dest = tmp >> 16; dest++; *dest = tmp >> 8; dest++; *dest = tmp; dest++; *dest = tmp >> 24; dest++; *dest = tmp >> 16; dest++; *dest = tmp >> 8; dest++; *dest = tmp; dest++;
// Pixdata type // Pixdata type
*dest = 1; dest++; *dest = 1; dest++; *dest = 0; dest++; *dest = 2; dest++; *dest = 1; dest++; *dest = 1; dest++; *dest = 0; dest++; *dest = 2; dest++;
// Rowstride // Rowstride
tmp = image.GetWidth()*4; tmp = image.GetWidth()*4;
*dest = tmp >> 24; dest++; *dest = tmp >> 16; dest++; *dest = tmp >> 8; dest++; *dest = tmp; dest++; *dest = tmp >> 24; dest++; *dest = tmp >> 16; dest++; *dest = tmp >> 8; dest++; *dest = tmp; dest++;
@@ -1551,7 +1570,7 @@ static wxString GetHotKey( const wxMenuItem& item )
// substitute for missing GtkPixmapMenuItem // substitute for missing GtkPixmapMenuItem
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef __WXGTK20__ #ifndef __WXGTK20__
/* /*
* Copyright (C) 1998, 1999, 2000 Free Software Foundation * Copyright (C) 1998, 1999, 2000 Free Software Foundation