X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..60848fcfefa649f4e1275281639881452374a350:/src/gtk/menu.cpp diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 3701f416ee..97d7f22a84 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -7,11 +7,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "menu.h" -#pragma implementation "menuitem.h" +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) + #pragma implementation "menu.h" + #pragma implementation "menuitem.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/log.h" #include "wx/intl.h" #include "wx/app.h" @@ -58,12 +61,7 @@ extern bool g_isIdle; // substitute for missing GtkPixmapMenuItem //----------------------------------------------------------------------------- -// FIXME: I can't make this compile with GTK+ 2.0, disabling for now (VZ) #ifndef __WXGTK20__ - #define USE_MENU_BITMAPS -#endif - -#ifdef USE_MENU_BITMAPS #define GTK_TYPE_PIXMAP_MENU_ITEM (gtk_pixmap_menu_item_get_type ()) #define GTK_PIXMAP_MENU_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PIXMAP_MENU_ITEM, GtkPixmapMenuItem)) @@ -96,12 +94,11 @@ struct _GtkPixmapMenuItemClass }; -GtkType gtk_pixmap_menu_item_get_type (void); +GtkType gtk_pixmap_menu_item_get_type (void); GtkWidget* gtk_pixmap_menu_item_new (void); void gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item, GtkWidget *pixmap); - -#endif // USE_MENU_BITMAPS +#endif // GTK 2.0 //----------------------------------------------------------------------------- // idle system @@ -145,7 +142,7 @@ static wxString wxReplaceUnderscore( const wxString& title ) #endif else { -#if __WXGTK12__ +#ifdef __WXGTK12__ if ( *pc == wxT('_') ) { // underscores must be doubled to prevent them from being @@ -161,6 +158,25 @@ static wxString wxReplaceUnderscore( const wxString& title ) return str; } +//----------------------------------------------------------------------------- +// activate message from GTK +//----------------------------------------------------------------------------- + +static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu ) +{ + if (g_isIdle) wxapp_install_idle_handler(); + + wxMenuEvent event( wxEVT_MENU_OPEN, -1, menu ); + event.SetEventObject( menu ); + + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(event)) + return; + + wxWindow *win = menu->GetInvokingWindow(); + if (win) win->GetEventHandler()->ProcessEvent( event ); +} + //----------------------------------------------------------------------------- // wxMenuBar //----------------------------------------------------------------------------- @@ -181,8 +197,6 @@ wxMenuBar::wxMenuBar( long style ) return; } - m_menus.DeleteContents( TRUE ); - /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */ #if GTK_CHECK_VERSION(1, 2, 1) m_accel = gtk_accel_group_new(); @@ -222,8 +236,6 @@ wxMenuBar::wxMenuBar() return; } - m_menus.DeleteContents( TRUE ); - /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */ #if GTK_CHECK_VERSION(1, 2, 1) m_accel = gtk_accel_group_new(); @@ -256,7 +268,7 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win ) /* support for native hot keys */ gtk_accel_group_detach( menu->m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) ); - wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { wxMenuItem *menuitem = node->GetData(); @@ -281,7 +293,7 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) gtk_accel_group_attach( menu->m_accel, obj ); #endif // GTK+ 1.2.1+ - wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { wxMenuItem *menuitem = node->GetData(); @@ -305,7 +317,7 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win ) gtk_accel_group_attach( m_accel, obj ); #endif // GTK+ 1.2.1+ - wxMenuList::Node *node = m_menus.GetFirst(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node) { wxMenu *menu = node->GetData(); @@ -322,11 +334,11 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win ) while (top_frame->GetParent() && !(top_frame->IsTopLevel())) top_frame = top_frame->GetParent(); - /* support for native key accelerators indicated by underscroes */ + // support for native key accelerators indicated by underscroes gtk_accel_group_detach( m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) ); #endif // GTK+ 1.2.1+ - wxMenuList::Node *node = m_menus.GetFirst(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node) { wxMenu *menu = node->GetData(); @@ -347,17 +359,17 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) { wxString str( wxReplaceUnderscore( title ) ); - /* this doesn't have much effect right now */ + // This doesn't have much effect right now. menu->SetTitle( str ); - /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */ + // GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. #if GTK_CHECK_VERSION(1, 2, 1) wxString buf; buf << wxT('/') << str.c_str(); - /* local buffer in multibyte form */ - char cbuf[400]; + // local buffer in multibyte form + char cbuf[400]; strcpy(cbuf, wxGTK_CONV(buf) ); GtkItemFactoryEntry entry; @@ -367,8 +379,8 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) entry.callback_action = 0; entry.item_type = (char *)""; - gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ - /* in order to get the pointer to the item we need the item text _without_ underscores */ + gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); // what is 2 ? + // in order to get the pointer to the item we need the item text _without_ underscores wxString tmp = wxT("
/"); const wxChar *pc; for ( pc = str; *pc != wxT('\0'); pc++ ) @@ -392,6 +404,10 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) #endif + gtk_signal_connect( GTK_OBJECT(menu->m_owner), "activate", + GTK_SIGNAL_FUNC(gtk_menu_open_callback), + (gpointer)menu ); + // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables // addings menu later on. if (m_invokingWindow) @@ -404,7 +420,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) // see (and refactor :) similar code in Remove // below. - wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame ); + wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame ); if( frame ) frame->UpdateMenuBarSize(); @@ -448,6 +464,36 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) return menuOld; } +static wxMenu *CopyMenu (wxMenu *menu) +{ + wxMenu *menucopy = new wxMenu (); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); + while (node) + { + wxMenuItem *item = node->GetData(); + int itemid = item->GetId(); + wxString text = item->GetText(); + text.Replace(wxT("_"), wxT("&")); + wxMenu *submenu = item->GetSubMenu(); + if (!submenu) + { + wxMenuItem* itemcopy = new wxMenuItem(menucopy, + itemid, text, + menu->GetHelpString(itemid)); + itemcopy->SetBitmap(item->GetBitmap()); + itemcopy->SetCheckable(item->IsCheckable()); + menucopy->Append(itemcopy); + } + else + menucopy->Append (itemid, text, CopyMenu(submenu), + menu->GetHelpString(itemid)); + + node = node->GetNext(); + } + + return menucopy; +} + wxMenu *wxMenuBar::Remove(size_t pos) { wxMenu *menu = wxMenuBarBase::Remove(pos); @@ -461,13 +507,17 @@ wxMenu *wxMenuBar::Remove(size_t pos) printf( "menu shell entries before %d\n", (int)g_list_length( menu_shell->children ) ); */ + wxMenu *menucopy = CopyMenu( menu ); + // unparent calls unref() and that would delete the widget so we raise // the ref count to 2 artificially before invoking unparent. gtk_widget_ref( menu->m_menu ); gtk_widget_unparent( menu->m_menu ); gtk_widget_destroy( menu->m_owner ); + delete menu; + menu = menucopy; /* printf( "factory entries after %d\n", (int)g_slist_length(m_factory->items) ); printf( "menu shell entries after %d\n", (int)g_list_length( menu_shell->children ) ); @@ -477,9 +527,9 @@ wxMenu *wxMenuBar::Remove(size_t pos) { // OPTIMISE ME: see comment in GtkAppend - wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame ); + wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame ); - if( frame ) + if( frame ) frame->UpdateMenuBarSize(); } @@ -495,7 +545,7 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString return res; } - wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { wxMenuItem *item = node->GetData(); @@ -510,7 +560,7 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const { - wxMenuList::Node *node = m_menus.GetFirst(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node) { wxMenu *menu = node->GetData(); @@ -528,7 +578,7 @@ static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id) { wxMenuItem* result = menu->FindChildItem(id); - wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while ( node && result == NULL ) { wxMenuItem *item = node->GetData(); @@ -545,7 +595,7 @@ static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id) wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const { wxMenuItem* result = 0; - wxMenuList::Node *node = m_menus.GetFirst(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node && result == 0) { wxMenu *menu = node->GetData(); @@ -563,7 +613,7 @@ wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const void wxMenuBar::EnableTop( size_t pos, bool flag ) { - wxMenuList::Node *node = m_menus.Item( pos ); + wxMenuList::compatibility_iterator node = m_menus.Item( pos ); wxCHECK_RET( node, wxT("menu not found") ); @@ -575,7 +625,7 @@ void wxMenuBar::EnableTop( size_t pos, bool flag ) wxString wxMenuBar::GetLabelTop( size_t pos ) const { - wxMenuList::Node *node = m_menus.Item( pos ); + wxMenuList::compatibility_iterator node = m_menus.Item( pos ); wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") ); @@ -591,6 +641,9 @@ wxString wxMenuBar::GetLabelTop( size_t pos ) const continue; } + // don't remove ampersands '&' since if we have them in the menu title + // it means that they were doubled to indicate "&" instead of accelerator + label += *pc; } @@ -599,7 +652,7 @@ wxString wxMenuBar::GetLabelTop( size_t pos ) const void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) { - wxMenuList::Node *node = m_menus.Item( pos ); + wxMenuList::compatibility_iterator node = m_menus.Item( pos ); wxCHECK_RET( node, wxT("menu not found") ); @@ -647,7 +700,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) if (item->IsCheckable()) { bool isReallyChecked = item->IsChecked(), - isInternallyChecked = item->wxMenuItemBase::IsChecked(); + isInternallyChecked = item->wxMenuItemBase::IsChecked(); // ensure that the internal state is always consistent with what is // shown on the screen @@ -660,11 +713,41 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) { return; } + } - // the user pressed on the menu item: report the event below + + // Is this menu on a menubar? (possibly nested) + wxFrame* frame = NULL; + wxMenu* pm = menu; + while ( pm && !frame ) + { + if ( pm->IsAttached() ) + frame = pm->GetMenuBar()->GetFrame(); + pm = pm->GetParent(); } - menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); + // FIXME: why do we have to call wxFrame::GetEventHandler() directly here? + // normally wxMenu::SendEvent() should be enough, if it doesn't work + // in wxGTK then we have a bug in wxMenu::GetInvokingWindow() which + // should be fixed instead of working around it here... + if (frame) + { + // If it is attached then let the frame send the event. + // Don't call frame->ProcessCommand(id) because it toggles + // checkable items and we've already done that above. + wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id); + commandEvent.SetEventObject(frame); + if (item->IsCheckable()) + commandEvent.SetInt(item->IsChecked()); + commandEvent.SetEventObject(menu); + + frame->GetEventHandler()->ProcessEvent(commandEvent); + } + else + { + // otherwise let the menu have it + menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); + } } //----------------------------------------------------------------------------- @@ -685,7 +768,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id ); event.SetEventObject( menu ); - if (menu->GetEventHandler()->ProcessEvent(event)) + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(event)) return; wxWindow *win = menu->GetInvokingWindow(); @@ -710,7 +794,8 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 ); event.SetEventObject( menu ); - if (menu->GetEventHandler()->ProcessEvent(event)) + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(event)) return; wxWindow *win = menu->GetInvokingWindow(); @@ -778,7 +863,7 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text) for ( const wxChar *pc = text.c_str(); *pc; pc++ ) { - if ( *pc == wxT('_') ) + if ( *pc == wxT('_') ) { // GTK 1.2 escapes "xxx_xxx" to "xxx__xxx" pc++; @@ -796,9 +881,18 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text) } #endif + if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) ) + { + // wxMSW escapes "&" + // "&" is doubled to indicate "&" instead of accelerator + continue; + } + label += *pc; } + // wxPrintf( L"text %s label %s\n", text.c_str(), label.c_str() ); + return label; } @@ -811,7 +905,7 @@ void wxMenuItem::SetText( const wxString& str ) wxString label1 = wxStripMenuCodes(str.BeforeFirst('\t')); if (oldLabel == label1) return; - + DoSetText(str); if (m_menuItem) @@ -830,7 +924,7 @@ void wxMenuItem::SetText( const wxString& str ) if (m_text[n] != wxT('\\')) tmp += m_text[n]; } - + gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV(tmp) ); #else // set new text @@ -865,6 +959,7 @@ void wxMenuItem::DoSetText( const wxString& str ) else if ( *pc == wxT('_') ) // escape underscores { // m_text << wxT("__"); doesn't work + m_text << wxT("__"); } else if (*pc == wxT('/')) // we have to escape slashes { @@ -889,7 +984,9 @@ void wxMenuItem::DoSetText( const wxString& str ) } ++pc; } - + + // wxPrintf( L"str %s m_text %s\n", str.c_str(), m_text.c_str() ); + m_hotKey = wxT(""); if(*pc == wxT('\t')) @@ -959,18 +1056,25 @@ bool wxMenuItem::IsChecked() const wxString wxMenuItem::GetFactoryPath() const { - /* in order to get the pointer to the item we need the item text - _without_ underscores */ + // In order to get the pointer to the item we need the item + // text _without_ underscores in GTK 1.2 wxString path( wxT("
/") ); for ( const wxChar *pc = m_text.c_str(); *pc; pc++ ) { if ( *pc == wxT('_') ) { +#ifdef __WXGTK20__ + pc++; +#else // remove '_' unconditionally continue; +#endif } + // don't remove ampersands '&' since if we have them in the menu item title + // it means that they were doubled to indicate "&" instead of accelerator + path += *pc; } @@ -991,9 +1095,9 @@ void wxMenu::Init() m_owner = (GtkWidget*) NULL; - /* 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. */ + // 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) { GtkItemFactoryEntry entry; @@ -1002,7 +1106,7 @@ void wxMenu::Init() entry.callback_action = 0; entry.item_type = (char *)""; entry.accelerator = (gchar*) NULL; - gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ + gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); // what is 2 ? //GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "
/tearoff" ); } @@ -1016,9 +1120,10 @@ void wxMenu::Init() wxMenu::~wxMenu() { - m_items.Clear(); + WX_CLEAR_LIST(wxMenuItemList, m_items); - gtk_widget_destroy( m_menu ); + if ( GTK_IS_WIDGET( m_menu )) + gtk_widget_destroy( m_menu ); gtk_object_unref( GTK_OBJECT(m_factory) ); } @@ -1027,10 +1132,6 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) { GtkWidget *menuItem; -#if defined(USE_MENU_BITMAPS) || !GTK_CHECK_VERSION(1, 2, 0) - bool appended = FALSE; -#endif - // does this item terminate the current radio group? bool endOfRadioGroup = TRUE; @@ -1043,9 +1144,9 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) entry.item_type = (char *)""; entry.accelerator = (gchar*) NULL; - gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ + gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); // what is 2 ? - /* this will be wrong for more than one separator. do we care? */ + // this will be wrong for more than one separator. do we care? menuItem = gtk_item_factory_get_widget( m_factory, "
/sep" ); // we might have a separator inside a radio group @@ -1053,10 +1154,10 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) } else if ( mitem->IsSubMenu() ) { - /* text has "_" instead of "&" after mitem->SetText() */ + // text has "_" instead of "&" after mitem->SetText() wxString text( mitem->GetText() ); - /* local buffer in multibyte form */ + // local buffer in multibyte form char buf[200]; strcpy( buf, "/" ); strcat( buf, wxGTK_CONV( text ) ); @@ -1068,7 +1169,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) entry.item_type = (char *)""; entry.accelerator = (gchar*) NULL; - gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ + gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); // what is 2 ? wxString path( mitem->GetFactoryPath() ); menuItem = gtk_item_factory_get_item( m_factory, wxGTK_CONV( path ) ); @@ -1081,9 +1182,10 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) if ( m_invokingWindow ) wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow); } -#ifdef USE_MENU_BITMAPS - else if (mitem->GetBitmap().Ok()) // An item with bitmap +#ifndef __WXGTK20__ + else if (mitem->GetBitmap().Ok()) { + // Our extra code for Bitmaps in GTK 1.2 wxString text( mitem->GetText() ); const wxBitmap *bitmap = &mitem->GetBitmap(); @@ -1091,16 +1193,37 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) GtkWidget *label = gtk_accel_label_new ( wxGTK_CONV( text ) ); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); 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); + 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) + { + gtk_widget_add_accelerator (menuItem, + "activate_item", + 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, 0, + gtk_menu_ensure_uline_accel_group ( + GTK_MENU (m_menu)), + accel_key, (GdkModifierType) 0, GTK_ACCEL_LOCKED); } + gtk_widget_show (label); mitem->SetLabelWidget(label); @@ -1112,13 +1235,11 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) gtk_signal_connect( GTK_OBJECT(menuItem), "activate", GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), (gpointer)this ); - + gtk_menu_append( GTK_MENU(m_menu), menuItem ); gtk_widget_show( menuItem ); - - appended = TRUE; // We've done this, don't do it again } -#endif // USE_MENU_BITMAPS +#endif else // a normal item { // text has "_" instead of "&" after mitem->SetText() so don't use it @@ -1175,6 +1296,63 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) case wxITEM_NORMAL: item_type = ""; +#if defined(__WXGTK20__) && wxUSE_IMAGE + if (mitem->GetBitmap().Ok()) + { + item_type = ""; + // GTK2's image factory know about image items, but they need to + // get a GdkPixbuf structure, which we need to create on the fly. + // This Pixbuf structure needs to be static so we create it and + // just make it a memory leak... + wxImage image( mitem->GetBitmap().ConvertToImage() ); + size_t size = 4 + // magic + 20 + // header + image.GetHeight() * image.GetWidth() * 4; // RGBA + + unsigned char *dest = new unsigned char[size]; + entry.extra_data = dest; + + unsigned char *source = image.GetData(); + bool has_mask = image.HasMask(); + unsigned char mask_r = image.GetMaskRed(); + unsigned char mask_b = image.GetMaskBlue(); + unsigned char mask_g = image.GetMaskGreen(); + wxUint32 tmp; + + // Magic + *dest = 'G'; dest++; *dest = 'd'; dest++; *dest = 'k'; dest++; *dest = 'P'; dest++; + // Data size + tmp = size; + *dest = tmp >> 24; dest++; *dest = tmp >> 16; dest++; *dest = tmp >> 8; dest++; *dest = tmp; dest++; + // Pixdata type + *dest = 1; dest++; *dest = 1; dest++; *dest = 0; dest++; *dest = 2; dest++; + // Rowstride + tmp = image.GetWidth()*4; + *dest = tmp >> 24; dest++; *dest = tmp >> 16; dest++; *dest = tmp >> 8; dest++; *dest = tmp; dest++; + // Width + tmp = image.GetWidth(); + *dest = tmp >> 24; dest++; *dest = tmp >> 16; dest++; *dest = tmp >> 8; dest++; *dest = tmp; dest++; + // Height + tmp = image.GetHeight(); + *dest = tmp >> 24; dest++; *dest = tmp >> 16; dest++; *dest = tmp >> 8; dest++; *dest = tmp; dest++; + + for (int i = 0; i < image.GetWidth()*image.GetHeight(); i++) + { + unsigned char r = *source; source++; + unsigned char g = *source; source++; + unsigned char b = *source; source++; + *dest = r; dest++; + *dest = g; dest++; + *dest = b; dest++; + if (has_mask && (r == mask_r) && (g == mask_g) && (b == mask_b)) + *dest = 0; + else + *dest = 255; + dest++; + } + break; + } +#endif // GTK 2.0+ break; } @@ -1198,7 +1376,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) wxString path( mitem->GetFactoryPath() ); menuItem = gtk_item_factory_get_widget( m_factory, wxGTK_CONV( path ) ); - + if (!menuItem) wxLogError( wxT("Wrong menu path: %s\n"), path.c_str() ); } @@ -1206,7 +1384,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) if ( !mitem->IsSeparator() ) { wxASSERT_MSG( menuItem, wxT("invalid menuitem") ); - + gtk_signal_connect( GTK_OBJECT(menuItem), "select", GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), (gpointer)this ); @@ -1226,22 +1404,23 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) return TRUE; } -bool wxMenu::DoAppend(wxMenuItem *mitem) +wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem) { - return GtkAppend(mitem) && wxMenuBase::DoAppend(mitem); + if (!GtkAppend(mitem)) + return NULL; + return wxMenuBase::DoAppend(mitem); } -bool wxMenu::DoInsert(size_t pos, wxMenuItem *item) +wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) { if ( !wxMenuBase::DoInsert(pos, item) ) - return FALSE; + return NULL; -#ifdef __WXGTK12__ // GTK+ doesn't have a function to insert a menu using GtkItemFactory (as // of version 1.2.6), so we first append the item and then change its // index if ( !GtkAppend(item) ) - return FALSE; + return NULL; if ( m_style & wxMENU_TEAROFF ) { @@ -1254,13 +1433,7 @@ bool wxMenu::DoInsert(size_t pos, wxMenuItem *item) menu_shell->children = g_list_remove(menu_shell->children, data); menu_shell->children = g_list_insert(menu_shell->children, data, pos); - return TRUE; -#else // GTK < 1.2 - // this should be easy to do... - wxFAIL_MSG( wxT("not implemented") ); - - return FALSE; -#endif // GTK 1.2/1.0 + return item; } wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) @@ -1277,13 +1450,13 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const { - wxNode *node = m_items.First(); + wxMenuItemList::compatibility_iterator node = m_items.GetFirst(); while (node) { - wxMenuItem *item = (wxMenuItem*)node->Data(); + wxMenuItem *item = node->GetData(); if (item->GetMenuItem() == menuItem) return item->GetId(); - node = node->Next(); + node = node->GetNext(); } return wxNOT_FOUND; @@ -1350,9 +1523,11 @@ static wxString GetHotKey( const wxMenuItem& item ) hotkey << wxT("Down" ); break; case WXK_PAGEUP: + case WXK_PRIOR: hotkey << wxT("Prior" ); break; case WXK_PAGEDOWN: + case WXK_NEXT: hotkey << wxT("Next" ); break; case WXK_LEFT: @@ -1401,7 +1576,7 @@ static wxString GetHotKey( const wxMenuItem& item ) // substitute for missing GtkPixmapMenuItem //----------------------------------------------------------------------------- -#ifdef USE_MENU_BITMAPS +#ifndef __WXGTK20__ /* * Copyright (C) 1998, 1999, 2000 Free Software Foundation @@ -1773,5 +1948,5 @@ changed_have_pixmap_status (GtkPixmapMenuItem *menu_item) gtk_widget_queue_resize(GTK_WIDGET(menu_item)); } -#endif // USE_MENU_BITMAPS +#endif