X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6edf1107031284fdcf5e6eabc6b87a7367e28185..30ee79f7e95dc4903b4d17c66b947761c574dfd8:/src/gtk/menu.cpp diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 3d7ac67525..ed7a91f67f 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -46,6 +46,9 @@ #define ACCEL_OBJ_CAST(obj) GTK_OBJECT(obj) #endif +// we use normal item but with a special id for the menu title +static const int wxGTK_TITLE_ID = -3; + //----------------------------------------------------------------------------- // idle system //----------------------------------------------------------------------------- @@ -136,9 +139,9 @@ static wxString wxReplaceUnderscore( const wxString& title ) } ++pc; } - + // wxPrintf( wxT("before %s after %s\n"), title.c_str(), str.c_str() ); - + return str; } @@ -307,7 +310,7 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win ) 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) ); @@ -330,7 +333,7 @@ bool wxMenuBar::Append( wxMenu *menu, const wxString &title ) return GtkAppend(menu, title); } -bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) +bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos) { wxString str( wxReplaceUnderscore( title ) ); @@ -359,11 +362,14 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) #endif gtk_widget_show( menu->m_owner ); - + gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu ); - - gtk_menu_shell_append( GTK_MENU_SHELL(m_menubar), menu->m_owner ); - + + if (pos == -1) + gtk_menu_shell_append( GTK_MENU_SHELL(m_menubar), menu->m_owner ); + 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 ); @@ -395,8 +401,8 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) return FALSE; // TODO - - if ( !GtkAppend(menu, title) ) + + if ( !GtkAppend(menu, title, (int)pos) ) return FALSE; return TRUE; @@ -636,6 +642,12 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) wxMenuItem* item = menu->FindChildItem( id ); wxCHECK_RET( item, wxT("error in menu item callback") ); + if ( item->GetId() == wxGTK_TITLE_ID ) + { + // ignore events from the menu title + return; + } + if (item->IsCheckable()) { bool isReallyChecked = item->IsChecked(), @@ -797,6 +809,9 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text) 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" @@ -885,7 +900,7 @@ void wxMenuItem::DoSetText( const wxString& str ) { m_text << wxT("__"); } - else + else { m_text << *pc; } @@ -977,19 +992,19 @@ void wxMenu::Init() // Tearoffs are entries, just like separators. So if we want this // menu to be a tear-off one, we just append a tearoff entry // immediately. - if(m_style & wxMENU_TEAROFF) + if ( m_style & wxMENU_TEAROFF ) { - GtkWidget *tearoff = gtk_tearoff_menu_item_new(); + GtkWidget *tearoff = gtk_tearoff_menu_item_new(); - gtk_menu_append(GTK_MENU(m_menu), tearoff); - } + gtk_menu_append(GTK_MENU(m_menu), tearoff); + } - m_prevRadio = NULL; + m_prevRadio = NULL; // append the title as the very first entry if we have it - if ( !!m_title ) + if ( !m_title.empty() ) { - Append(-2, m_title); + Append(wxGTK_TITLE_ID, m_title); AppendSeparator(); } } @@ -1002,7 +1017,7 @@ wxMenu::~wxMenu() gtk_widget_destroy( m_menu ); } -bool wxMenu::GtkAppend(wxMenuItem *mitem) +bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) { GtkWidget *menuItem; @@ -1014,8 +1029,10 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) // TODO menuItem = gtk_menu_item_new(); #endif - gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem); - + 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() ) { @@ -1043,8 +1060,11 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) #endif gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu ); - gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem); - + 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 @@ -1061,20 +1081,23 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) const wxBitmap *bitmap = &mitem->GetBitmap(); GdkPixmap *gdk_pixmap = bitmap->GetPixmap(); GdkBitmap *gdk_bitmap = bitmap->GetMask() ? bitmap->GetMask()->GetBitmap() : (GdkBitmap*) NULL; - + #ifdef __WXGTK20__ menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV( text ) ); - + GtkWidget *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 ); - gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem); + 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 menuItem = gtk_pixmap_menu_item_new (); @@ -1123,7 +1146,10 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), (gpointer)this ); - gtk_menu_append( GTK_MENU(m_menu), menuItem ); + 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 @@ -1248,26 +1274,29 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), (gpointer)this ); - gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem); + 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() ); - + + // wxPrintf( wxT("item: %s hotkey %s\n"), mitem->GetText().c_str(), GetHotKey(*mitem).c_str() ); + gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods); if (accel_key != 0) { - gtk_widget_add_accelerator (GTK_WIDGET(menuItem), - "activate", + gtk_widget_add_accelerator (GTK_WIDGET(menuItem), + "activate", m_accel, - accel_key, + accel_key, accel_mods, GTK_ACCEL_VISIBLE); } - + gtk_widget_show( menuItem ); if ( !mitem->IsSeparator() ) @@ -1298,7 +1327,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem) { if (!GtkAppend(mitem)) return NULL; - + return wxMenuBase::DoAppend(mitem); } @@ -1308,7 +1337,7 @@ wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) return NULL; // TODO - if ( !GtkAppend(item) ) + if ( !GtkAppend(item, (int)pos) ) return NULL; return item;