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

flatten the single item submenus under Maemo

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-12 20:55:18 +00:00
parent c96d7bec67
commit 6c76d1ce59
1 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gtk/menu.cpp
View File

@@ -40,6 +40,8 @@
// we use normal item but with a special id for the menu title // we use normal item but with a special id for the menu title
static const int wxGTK_TITLE_ID = -3; static const int wxGTK_TITLE_ID = -3;
extern "C" static void gtk_menu_clicked_callback(GtkWidget *widget, wxMenu *menu);
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// idle system // idle system
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -295,6 +297,30 @@ bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos) bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
{ {
menu->SetLayoutDirection(GetLayoutDirection());
#if wxUSE_LIBHILDON
// if the menu has only one item, append it directly to the top level menu
// instead of inserting a useless submenu
if ( menu->GetMenuItemCount() == 1 )
{
wxMenuItem * const item = menu->FindItemByPosition(0);
// remove both mnemonics and accelerator: neither is useful under Maemo
const wxString str(wxStripMenuCodes(item->GetItemLabel()));
if ( item->IsSubMenu() )
return GtkAppend(item->GetSubMenu(), str, pos);
menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
g_signal_connect(menu->m_owner, "activate",
G_CALLBACK(gtk_menu_clicked_callback), menu);
item->SetMenuItem(menu->m_owner);
}
else
#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
{
const wxString str(wxConvertMnemonicsToGTK(title)); const wxString str(wxConvertMnemonicsToGTK(title));
// This doesn't have much effect right now. // This doesn't have much effect right now.
@@ -302,11 +328,11 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
// The "m_owner" is the "menu item" // The "m_owner" is the "menu item"
menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) ); menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
menu->SetLayoutDirection(GetLayoutDirection());
gtk_widget_show( menu->m_owner );
gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu ); gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
}
gtk_widget_show( menu->m_owner );
if (pos == -1) if (pos == -1)
gtk_menu_shell_append( GTK_MENU_SHELL(m_menubar), menu->m_owner ); gtk_menu_shell_append( GTK_MENU_SHELL(m_menubar), menu->m_owner );