X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5bd9e5192b0299100b06a1b982d031b87538961b..785f5eaa05195f5e44a974861864324667a3326e:/src/gtk1/menu.cpp?ds=sidebyside diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index e2b79dbf82..1d53ddd74f 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -7,18 +7,44 @@ // 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 -#include "wx/menu.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/log.h" #include "wx/intl.h" #include "wx/app.h" +#include "wx/bitmap.h" +#include "wx/menu.h" + +#if wxUSE_ACCEL + #include "wx/accel.h" +#endif // wxUSE_ACCEL -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include "wx/gtk/private.h" + +#include + +// FIXME: is this right? somehow I don't think so (VZ) +#ifdef __WXGTK20__ + #include + + #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g)) + #define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g)) + #define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m) + + #define ACCEL_OBJECT GtkWindow + #define ACCEL_OBJECTS(a) (a)->acceleratables + #define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj) +#else // GTK+ 1.x + #define ACCEL_OBJECT GtkObject + #define ACCEL_OBJECTS(a) (a)->attach_objects + #define ACCEL_OBJ_CAST(obj) GTK_OBJECT(obj) +#endif //----------------------------------------------------------------------------- // idle system @@ -27,6 +53,114 @@ extern void wxapp_install_idle_handler(); extern bool g_isIdle; +#if wxUSE_ACCEL +static wxString GetHotKey( const wxMenuItem& item ); +#endif + +//----------------------------------------------------------------------------- +// substitute for missing GtkPixmapMenuItem +//----------------------------------------------------------------------------- + +#ifndef __WXGTK20__ + +#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)) +#define GTK_PIXMAP_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PIXMAP_MENU_ITEM, GtkPixmapMenuItemClass)) +#define GTK_IS_PIXMAP_MENU_ITEM(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_PIXMAP_MENU_ITEM)) +#define GTK_IS_PIXMAP_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PIXMAP_MENU_ITEM)) +//#define GTK_PIXMAP_MENU_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PIXMAP_MENU_ITEM)) +#define GTK_PIXMAP_MENU_ITEM_GET_CLASS(obj) (GTK_PIXMAP_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj))) + +#ifndef GTK_MENU_ITEM_GET_CLASS +#define GTK_MENU_ITEM_GET_CLASS(obj) (GTK_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj))) +#endif + +typedef struct _GtkPixmapMenuItem GtkPixmapMenuItem; +typedef struct _GtkPixmapMenuItemClass GtkPixmapMenuItemClass; + +struct _GtkPixmapMenuItem +{ + GtkMenuItem menu_item; + + GtkWidget *pixmap; +}; + +struct _GtkPixmapMenuItemClass +{ + GtkMenuItemClass parent_class; + + guint orig_toggle_size; + guint have_pixmap_count; +}; + + +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 // GTK 2.0 + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +static wxString wxReplaceUnderscore( const wxString& title ) +{ + const wxChar *pc; + + // GTK 1.2 wants to have "_" instead of "&" for accelerators + wxString str; + pc = title; + while (*pc != wxT('\0')) + { + if ((*pc == wxT('&')) && (*(pc+1) == wxT('&'))) + { + // "&" is doubled to indicate "&" instead of accelerator + ++pc; + str << wxT('&'); + } + else if (*pc == wxT('&')) + { + str << wxT('_'); + } + else + { + if ( *pc == wxT('_') ) + { + // underscores must be doubled to prevent them from being + // interpreted as accelerator character prefix by GTK + str << *pc; + } + + str << *pc; + } + ++pc; + } + + // wxPrintf( wxT("before %s after %s\n"), title.c_str(), str.c_str() ); + + 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 //----------------------------------------------------------------------------- @@ -35,20 +169,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow) wxMenuBar::wxMenuBar( long style ) { - /* the parent window is known after wxFrame::SetMenu() */ - m_needParent = FALSE; - - PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, style, "menu" ); + // the parent window is known after wxFrame::SetMenu() + m_needParent = FALSE; + m_style = style; + m_invokingWindow = (wxWindow*) NULL; - m_menus.DeleteContents( TRUE ); + if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) || + !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") )) + { + wxFAIL_MSG( wxT("wxMenuBar creation failed") ); + return; + } - /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */ -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) - m_accel = gtk_accel_group_new(); - m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "
", m_accel ); - m_menubar = gtk_item_factory_get_widget( m_factory, "
" ); -#else m_menubar = gtk_menu_bar_new(); +#ifndef __WXGTK20__ + m_accel = gtk_accel_group_new(); #endif if (style & wxMB_DOCKABLE) @@ -63,55 +198,60 @@ wxMenuBar::wxMenuBar( long style ) } PostCreation(); + + ApplyWidgetStyle(); } wxMenuBar::wxMenuBar() { - /* the parent window is known after wxFrame::SetMenu() */ + // the parent window is known after wxFrame::SetMenu() m_needParent = FALSE; + m_style = 0; + m_invokingWindow = (wxWindow*) NULL; - PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" ); - - m_menus.DeleteContents( TRUE ); + if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) || + !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("menubar") )) + { + wxFAIL_MSG( wxT("wxMenuBar creation failed") ); + return; + } - /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */ -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) - m_accel = gtk_accel_group_new(); - m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "
", m_accel ); - m_menubar = gtk_item_factory_get_widget( m_factory, "
" ); -#else m_menubar = gtk_menu_bar_new(); +#ifndef __WXGTK20__ + m_accel = gtk_accel_group_new(); #endif m_widget = GTK_WIDGET(m_menubar); PostCreation(); + + ApplyWidgetStyle(); } wxMenuBar::~wxMenuBar() { - // how to destroy a GtkItemFactory ? } static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( (wxWindow*) NULL ); -#if (GTK_MINOR_VERSION > 0) wxWindow *top_frame = win; - while (top_frame->GetParent()) top_frame = top_frame->GetParent(); + while (top_frame->GetParent() && !(top_frame->IsTopLevel())) + top_frame = top_frame->GetParent(); - /* support for native hot keys */ - gtk_accel_group_detach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) ); +#ifndef __WXGTK20__ + // support for native hot keys + gtk_accel_group_detach( menu->m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) ); #endif - wxNode *node = menu->GetItems().First(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { - wxMenuItem *menuitem = (wxMenuItem*)node->Data(); + wxMenuItem *menuitem = node->GetData(); if (menuitem->IsSubMenu()) wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win ); - node = node->Next(); + node = node->GetNext(); } } @@ -119,314 +259,360 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( win ); -#if (GTK_MINOR_VERSION > 0) wxWindow *top_frame = win; - while (top_frame->GetParent()) - top_frame = top_frame->GetParent(); + while (top_frame->GetParent() && !(top_frame->IsTopLevel())) + top_frame = top_frame->GetParent(); - /* support for native hot keys */ - gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) ); -#endif + // support for native hot keys + ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget); + if ( !g_slist_find( ACCEL_OBJECTS(menu->m_accel), obj ) ) + gtk_accel_group_attach( menu->m_accel, obj ); - wxNode *node = menu->GetItems().First(); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { - wxMenuItem *menuitem = (wxMenuItem*)node->Data(); + wxMenuItem *menuitem = node->GetData(); if (menuitem->IsSubMenu()) wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win ); - node = node->Next(); + node = node->GetNext(); } } void wxMenuBar::SetInvokingWindow( wxWindow *win ) { -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) + m_invokingWindow = win; wxWindow *top_frame = win; - while (top_frame->GetParent()) - top_frame = top_frame->GetParent(); - - /* support for native key accelerators indicated by underscroes */ - gtk_accel_group_attach( m_accel, GTK_OBJECT(top_frame->m_widget) ); + while (top_frame->GetParent() && !(top_frame->IsTopLevel())) + top_frame = top_frame->GetParent(); + +#ifndef __WXGTK20__ + // support for native key accelerators indicated by underscroes + ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget); + if ( !g_slist_find( ACCEL_OBJECTS(m_accel), obj ) ) + gtk_accel_group_attach( m_accel, obj ); #endif - wxNode *node = m_menus.First(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node) { - wxMenu *menu = (wxMenu*)node->Data(); + wxMenu *menu = node->GetData(); wxMenubarSetInvokingWindow( menu, win ); - node = node->Next(); + node = node->GetNext(); } } void wxMenuBar::UnsetInvokingWindow( wxWindow *win ) { -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) + m_invokingWindow = (wxWindow*) NULL; wxWindow *top_frame = win; - while (top_frame->GetParent()) - top_frame = top_frame->GetParent(); - - /* support for native key accelerators indicated by underscroes */ - gtk_accel_group_detach( m_accel, GTK_OBJECT(top_frame->m_widget) ); + 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) ); #endif - wxNode *node = m_menus.First(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node) { - wxMenu *menu = (wxMenu*)node->Data(); + wxMenu *menu = node->GetData(); wxMenubarUnsetInvokingWindow( menu, win ); - node = node->Next(); + node = node->GetNext(); } } -void wxMenuBar::Append( wxMenu *menu, const wxString &title ) +bool wxMenuBar::Append( wxMenu *menu, const wxString &title ) { - m_menus.Append( menu ); - - /* GTK 1.2 wants to have "_" instead of "&" for accelerators */ - wxString str; - for ( const wxChar *pc = title; *pc != _T('\0'); pc++ ) - { - if (*pc == _T('&')) - { -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) - str << _T('_'); - } else - if (*pc == _T('/')) - { - str << _T('\\'); -#endif - } - else - str << *pc; - } + if ( !wxMenuBarBase::Append( menu, title ) ) + return FALSE; - /* this doesn't have much effect right now */ + return GtkAppend(menu, title); +} + +bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) +{ + wxString str( wxReplaceUnderscore( title ) ); + + // 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. */ -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) - /* local buffer in multibyte form */ - char buf[200]; - strcpy( buf, "/" ); - strcat( buf, str.mb_str() ); - - GtkItemFactoryEntry entry; - entry.path = buf; - entry.accelerator = (gchar*) NULL; - entry.callback = (GtkItemFactoryCallback) NULL; - entry.callback_action = 0; - entry.item_type = ""; - - 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 = _T("
/"); - for ( const wxChar *pc = str; *pc != _T('\0'); pc++ ) + // The "m_owner" is the "menu item" +#ifdef __WXGTK20__ + menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) ); +#else + menu->m_owner = gtk_menu_item_new_with_label( wxGTK_CONV( str ) ); + GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child ); + // set new text + gtk_label_set_text( label, wxGTK_CONV( str ) ); + // reparse key accel + guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( str ) ); + if (accel_key != GDK_VoidSymbol) { - if (*pc == _T('_')) pc++; /* skip it */ - tmp << *pc; + gtk_widget_add_accelerator (menu->m_owner, + "activate_item", + m_accel,//gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menubar)), + accel_key, + GDK_MOD1_MASK, + GTK_ACCEL_LOCKED); } - - menu->m_owner = gtk_item_factory_get_item( m_factory, tmp.mb_str() ); +#endif + + gtk_widget_show( menu->m_owner ); gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu ); -#else + gtk_menu_shell_append( GTK_MENU_SHELL(m_menubar), menu->m_owner ); + + gtk_signal_connect( GTK_OBJECT(menu->m_owner), "activate", + GTK_SIGNAL_FUNC(gtk_menu_open_callback), + (gpointer)menu ); - menu->m_owner = gtk_menu_item_new_with_label( str.mb_str() ); - gtk_widget_show( menu->m_owner ); - gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu ); + // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables + // addings menu later on. + if (m_invokingWindow) + { + wxMenubarSetInvokingWindow( menu, m_invokingWindow ); - gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner ); + // OPTIMISE ME: we should probably cache this, or pass it + // directly, but for now this is a minimal + // change to validate the new dynamic sizing. + // see (and refactor :) similar code in Remove + // below. + + wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame ); + + if( frame ) + frame->UpdateMenuBarSize(); + } + + return TRUE; +} + +bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) +{ + if ( !wxMenuBarBase::Insert(pos, menu, title) ) + return FALSE; + + // TODO -#endif + if ( !GtkAppend(menu, title) ) + return FALSE; + + return TRUE; } -static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString ) +wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) { - if (menu->GetTitle() == menuString) + // remove the old item and insert a new one + wxMenu *menuOld = Remove(pos); + if ( menuOld && !Insert(pos, menu, title) ) { - int res = menu->FindItem( itemString ); - if (res != wxNOT_FOUND) - return res; + return (wxMenu*) NULL; } - wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast + // either Insert() succeeded or Remove() failed and menuOld is NULL + return menuOld; +} + +static wxMenu *CopyMenu (wxMenu *menu) +{ + wxMenu *menucopy = new wxMenu (); + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while (node) { - wxMenuItem *item = (wxMenuItem*)node->Data(); - if (item->IsSubMenu()) - return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString); + 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->Next(); + node = node->GetNext(); } - return wxNOT_FOUND; + return menucopy; } -wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem ) const +wxMenu *wxMenuBar::Remove(size_t pos) { - if ( menuForItem ) + wxMenu *menu = wxMenuBarBase::Remove(pos); + if ( !menu ) + return (wxMenu*) NULL; + + 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; + + if (m_invokingWindow) + { + // OPTIMISE ME: see comment in GtkAppend + wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame ); + + if( frame ) + frame->UpdateMenuBarSize(); + } + + return menu; +} + +static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString ) +{ + if (wxMenuItem::GetLabelFromText(menu->GetTitle()) == wxMenuItem::GetLabelFromText(menuString)) + { + int res = menu->FindItem( itemString ); + if (res != wxNOT_FOUND) + return res; + } + + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); + while (node) { - // TODO return the pointer to the menu + wxMenuItem *item = node->GetData(); + if (item->IsSubMenu()) + return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString); - *menuForItem = NULL; + node = node->GetNext(); } - return FindItem(itemId); + return wxNOT_FOUND; } int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const { - wxNode *node = m_menus.First(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node) { - wxMenu *menu = (wxMenu*)node->Data(); + wxMenu *menu = node->GetData(); int res = FindMenuItemRecursive( menu, menuString, itemString); - if (res != -1) return res; - node = node->Next(); + if (res != -1) + return res; + node = node->GetNext(); } - return -1; + + return wxNOT_FOUND; } // Find a wxMenuItem using its id. Recurses down into sub-menus static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id) { - wxMenuItem* result = menu->FindItem(id); + wxMenuItem* result = menu->FindChildItem(id); - wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); while ( node && result == NULL ) { - wxMenuItem *item = (wxMenuItem*)node->Data(); + wxMenuItem *item = node->GetData(); if (item->IsSubMenu()) { result = FindMenuItemByIdRecursive( item->GetSubMenu(), id ); } - node = node->Next(); + node = node->GetNext(); } return result; } -wxMenuItem* wxMenuBar::FindItem( int id ) const +wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const { wxMenuItem* result = 0; - wxNode *node = m_menus.First(); + wxMenuList::compatibility_iterator node = m_menus.GetFirst(); while (node && result == 0) { - wxMenu *menu = (wxMenu*)node->Data(); + wxMenu *menu = node->GetData(); result = FindMenuItemByIdRecursive( menu, id ); - node = node->Next(); + node = node->GetNext(); + } + + if ( menuForItem ) + { + *menuForItem = result ? result->GetMenu() : (wxMenu *)NULL; } return result; } -void wxMenuBar::Check( int id, bool check ) +void wxMenuBar::EnableTop( size_t pos, bool flag ) { - wxMenuItem* item = FindMenuItemById( id ); + wxMenuList::compatibility_iterator node = m_menus.Item( pos ); - wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") ); + wxCHECK_RET( node, wxT("menu not found") ); - item->Check(check); -} + wxMenu* menu = node->GetData(); -bool wxMenuBar::IsChecked( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked: no such item") ); - - return item->IsChecked(); + if (menu->m_owner) + gtk_widget_set_sensitive( menu->m_owner, flag ); } -void wxMenuBar::Enable( int id, bool enable ) +wxString wxMenuBar::GetLabelTop( size_t pos ) const { - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") ); - - item->Enable(enable); -} + wxMenuList::compatibility_iterator node = m_menus.Item( pos ); -bool wxMenuBar::IsEnabled( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); + wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") ); - wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled: no such item") ); + wxMenu* menu = node->GetData(); - return item->IsEnabled(); -} + wxString label; + wxString text( menu->GetTitle() ); + for ( const wxChar *pc = text.c_str(); *pc; pc++ ) + { + if ( *pc == wxT('_') ) + { + // '_' is the escape character for GTK+ + continue; + } -wxString wxMenuBar::GetLabel( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); + // don't remove ampersands '&' since if we have them in the menu title + // it means that they were doubled to indicate "&" instead of accelerator - wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel: no such item") ); + label += *pc; + } - return item->GetText(); + return label; } -void wxMenuBar::SetLabel( int id, const wxString &label ) +void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) { - wxMenuItem* item = FindMenuItemById( id ); + wxMenuList::compatibility_iterator node = m_menus.Item( pos ); - wxCHECK_RET( item, _T("wxMenuBar::SetLabel: no such item") ); + wxCHECK_RET( node, wxT("menu not found") ); - item->SetText( label ); -} + wxMenu* menu = node->GetData(); -void wxMenuBar::EnableTop( int pos, bool flag ) -{ - wxNode *node = m_menus.Nth( pos ); - - wxCHECK_RET( node, _T("menu not found") ); + wxString str( wxReplaceUnderscore( label ) ); - wxMenu* menu = (wxMenu*)node->Data(); + menu->SetTitle( str ); if (menu->m_owner) - gtk_widget_set_sensitive( menu->m_owner, flag ); -} - -wxString wxMenuBar::GetLabelTop( int pos ) const -{ - wxNode *node = m_menus.Nth( pos ); - - wxCHECK_MSG( node, _T("invalid"), _T("menu not found") ); - - wxMenu* menu = (wxMenu*)node->Data(); - - return menu->GetTitle(); -} - -void wxMenuBar::SetLabelTop( int pos, const wxString& label ) -{ - wxNode *node = m_menus.Nth( pos ); - - wxCHECK_RET( node, _T("menu not found") ); - - wxMenu* menu = (wxMenu*)node->Data(); - - menu->SetTitle( label ); -} - -void wxMenuBar::SetHelpString( int id, const wxString& helpString ) -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_RET( item, _T("wxMenuBar::SetHelpString: no such item") ); - - item->SetHelp( helpString ); -} + { + GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child ); -wxString wxMenuBar::GetHelpString( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); + /* set new text */ + gtk_label_set( label, wxGTK_CONV( str ) ); - wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString: no such item") ); + /* reparse key accel */ + (void)gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( str ) ); + gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) ); + } - return item->GetHelp(); } //----------------------------------------------------------------------------- @@ -435,49 +621,72 @@ wxString wxMenuBar::GetHelpString( int id ) const static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) { - if (g_isIdle) wxapp_install_idle_handler(); + if (g_isIdle) + wxapp_install_idle_handler(); int id = menu->FindMenuIdByMenuItem(widget); /* should find it for normal (not popup) menu */ - wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) ); + wxASSERT_MSG( (id != -1) || (menu->GetInvokingWindow() != NULL), + _T("menu item not found in gtk_menu_clicked_callback") ); if (!menu->IsEnabled(id)) return; - wxMenuItem* item = menu->FindItem( id ); - wxCHECK_RET( item, _T("error in menu item callback") ); + wxMenuItem* item = menu->FindChildItem( id ); + wxCHECK_RET( item, wxT("error in menu item callback") ); if (item->IsCheckable()) { - if (item->GetCheckedFlag() == item->IsChecked()) + bool isReallyChecked = item->IsChecked(), + isInternallyChecked = item->wxMenuItemBase::IsChecked(); + + // ensure that the internal state is always consistent with what is + // shown on the screen + item->wxMenuItemBase::Check(isReallyChecked); + + // we must not report the events for the radio button going up nor the + // events resulting from the calls to wxMenuItem::Check() + if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) || + (isInternallyChecked == isReallyChecked) ) { - /* the menu item has been checked by calling wxMenuItem->Check() */ return; } - else - { - /* the user pressed on the menu item -> report */ - item->SetCheckedFlag(item->IsChecked()); /* make consistent again */ - } } - wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id ); - event.SetEventObject( menu ); - event.SetInt(id ); - if (menu->GetCallback()) + // Is this menu on a menubar? (possibly nested) + wxFrame* frame = NULL; + wxMenu* pm = menu; + while ( pm && !frame ) { - (void) (*(menu->GetCallback())) (*menu, event); - return; + if ( pm->IsAttached() ) + frame = pm->GetMenuBar()->GetFrame(); + pm = pm->GetParent(); } - if (menu->GetEventHandler()->ProcessEvent(event)) - return; - - wxWindow *win = menu->GetInvokingWindow(); - if (win) - win->GetEventHandler()->ProcessEvent( event ); + // 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); + } } //----------------------------------------------------------------------------- @@ -498,16 +707,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id ); event.SetEventObject( menu ); -/* wxMSW doesn't call callback here either - - if (menu->m_callback) - { - (void) (*(menu->m_callback)) (*menu, event); - return; - } -*/ - - if (menu->GetEventHandler()->ProcessEvent(event)) + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(event)) return; wxWindow *win = menu->GetInvokingWindow(); @@ -532,7 +733,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(); @@ -544,86 +746,224 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) // wxMenuItem //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) -wxMenuItem::wxMenuItem() +wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu, + int id, + const wxString& name, + const wxString& help, + wxItemKind kind, + wxMenu *subMenu) { - m_id = ID_SEPARATOR; - m_isCheckMenu = FALSE; - m_isChecked = FALSE; - m_isEnabled = TRUE; - m_subMenu = (wxMenu *) NULL; + return new wxMenuItem(parentMenu, id, name, help, kind, subMenu); +} + +wxMenuItem::wxMenuItem(wxMenu *parentMenu, + int id, + const wxString& text, + const wxString& help, + wxItemKind kind, + wxMenu *subMenu) + : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu) +{ + Init(text); +} + +wxMenuItem::wxMenuItem(wxMenu *parentMenu, + int id, + const wxString& text, + const wxString& help, + bool isCheckable, + wxMenu *subMenu) + : wxMenuItemBase(parentMenu, id, text, help, + isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu) +{ + Init(text); +} + +void wxMenuItem::Init(const wxString& text) +{ + m_labelWidget = (GtkWidget *) NULL; m_menuItem = (GtkWidget *) NULL; + + DoSetText(text); } -// it's valid for this function to be called even if m_menuItem == NULL -void wxMenuItem::SetName( const wxString& str ) +wxMenuItem::~wxMenuItem() { - /* '\t' is the deliminator indicating a hot key */ - m_text = _T(""); - const wxChar *pc = str; - for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ ) + // don't delete menu items, the menus take care of that +} + +// return the menu item text without any menu accels +/* static */ +wxString wxMenuItemBase::GetLabelFromText(const wxString& text) +{ + wxString label; + + for ( const wxChar *pc = text.c_str(); *pc; pc++ ) { - if (*pc == _T('&')) - { -#if (GTK_MINOR_VERSION > 0) - m_text << _T('_'); - } else - if (*pc == _T('/')) /* we have to filter out slashes ... */ - { - m_text << _T('\\'); /* ... and replace them with back slashes */ + if ( *pc == wxT('_') ) + { + // GTK 1.2 escapes "xxx_xxx" to "xxx__xxx" + pc++; + label += *pc; + continue; + } + +#ifdef __WXGTK20__ + if ( *pc == wxT('\\') ) + { + // GTK 2.0 escapes "xxx/xxx" to "xxx\/xxx" + pc++; + label += *pc; + continue; + } #endif + + if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) ) + { + // wxMSW escapes "&" + // "&" is doubled to indicate "&" instead of accelerator + continue; } + + label += *pc; + } + + // wxPrintf( wxT("GetLabelFromText(): text %s label %s\n"), text.c_str(), label.c_str() ); + + return label; +} + +void wxMenuItem::SetText( const wxString& str ) +{ + // Some optimization to avoid flicker + wxString oldLabel = m_text; + oldLabel = wxStripMenuCodes(oldLabel.BeforeFirst('\t')); + oldLabel.Replace(wxT("_"), wxT("")); + wxString label1 = wxStripMenuCodes(str.BeforeFirst('\t')); + if (oldLabel == label1) + return; + + DoSetText(str); + + if (m_menuItem) + { + GtkLabel *label; + if (m_labelWidget) + label = (GtkLabel*) m_labelWidget; else - m_text << *pc; + label = GTK_LABEL( GTK_BIN(m_menuItem)->child ); + +#ifdef __WXGTK20__ + gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV(m_text) ); +#else + // set new text + gtk_label_set( label, wxGTK_CONV( m_text ) ); + + // reparse key accel + (void)gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV(m_text) ); + gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) ); +#endif } - - /* only GTK 1.2 knows about hot keys */ - m_hotKey = _T(""); -#if (GTK_MINOR_VERSION > 0) - if(*pc == _T('\t')) +} + +// it's valid for this function to be called even if m_menuItem == NULL +void wxMenuItem::DoSetText( const wxString& str ) +{ + // '\t' is the deliminator indicating a hot key + m_text.Empty(); + const wxChar *pc = str; + while ( (*pc != wxT('\0')) && (*pc != wxT('\t')) ) + { + if ((*pc == wxT('&')) && (*(pc+1) == wxT('&'))) + { + // "&" is doubled to indicate "&" instead of accelerator + ++pc; + m_text << wxT('&'); + } + else if (*pc == wxT('&')) + { + m_text << wxT('_'); + } + else if ( *pc == wxT('_') ) // escape underscores + { + m_text << wxT("__"); + } + else + { + m_text << *pc; + } + ++pc; + } + + // wxPrintf( wxT("DoSetText(): str %s m_text %s\n"), str.c_str(), m_text.c_str() ); + + m_hotKey = wxT(""); + + if(*pc == wxT('\t')) { pc++; m_hotKey = pc; } -#endif +} - if (m_menuItem) +#if wxUSE_ACCEL + +wxAcceleratorEntry *wxMenuItem::GetAccel() const +{ + if ( !GetHotKey() ) { - GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child ); - gtk_label_set( label, m_text.mb_str()); + // nothing + return (wxAcceleratorEntry *)NULL; } + + // as wxGetAccelFromString() looks for TAB, insert a dummy one here + wxString label; + label << wxT('\t') << GetHotKey(); + + return wxGetAccelFromString(label); } +#endif // wxUSE_ACCEL + void wxMenuItem::Check( bool check ) { - wxCHECK_RET( m_menuItem, _T("invalid menu item") ); + wxCHECK_RET( m_menuItem, wxT("invalid menu item") ); + + if (check == m_isChecked) + return; - wxCHECK_RET( IsCheckable(), _T("Can't check uncheckable item!") ) + wxMenuItemBase::Check( check ); - if (check == m_isChecked) return; + switch ( GetKind() ) + { + case wxITEM_CHECK: + case wxITEM_RADIO: + gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check ); + break; - m_isChecked = check; - gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check ); + default: + wxFAIL_MSG( _T("can't check this item") ); + } } void wxMenuItem::Enable( bool enable ) { - wxCHECK_RET( m_menuItem, _T("invalid menu item") ); + wxCHECK_RET( m_menuItem, wxT("invalid menu item") ); gtk_widget_set_sensitive( m_menuItem, enable ); - m_isEnabled = enable; + wxMenuItemBase::Enable( enable ); } bool wxMenuItem::IsChecked() const { - wxCHECK_MSG( m_menuItem, FALSE, _T("invalid menu item") ); - - wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item! + wxCHECK_MSG( m_menuItem, FALSE, wxT("invalid menu item") ); - bool bIsChecked = ((GtkCheckMenuItem*)m_menuItem)->active != 0; + wxCHECK_MSG( IsCheckable(), FALSE, + wxT("can't get state of uncheckable item!") ); - return bIsChecked; + return ((GtkCheckMenuItem*)m_menuItem)->active != 0; } //----------------------------------------------------------------------------- @@ -632,460 +972,864 @@ bool wxMenuItem::IsChecked() const IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler) -wxMenu::wxMenu( const wxString& title, const wxFunction func ) +void wxMenu::Init() { - m_title = title; - m_items.DeleteContents( TRUE ); - m_invokingWindow = (wxWindow *) NULL; - -#if (GTK_MINOR_VERSION > 0) m_accel = gtk_accel_group_new(); - m_factory = gtk_item_factory_new( GTK_TYPE_MENU, "
", m_accel ); - m_menu = gtk_item_factory_get_widget( m_factory, "
" ); -#else - m_menu = gtk_menu_new(); // Do not show! -#endif + m_menu = gtk_menu_new(); - m_callback = func; - m_eventHandler = this; - m_clientData = (void*) NULL; + m_owner = (GtkWidget*) NULL; - if (m_title.IsNull()) m_title = _T(""); - if (m_title != _T("")) + // 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) + { + GtkWidget *tearoff = gtk_tearoff_menu_item_new(); + + gtk_menu_append(GTK_MENU(m_menu), tearoff); + } + + m_prevRadio = NULL; + + // append the title as the very first entry if we have it + if ( !!m_title ) { Append(-2, m_title); AppendSeparator(); } - - m_owner = (GtkWidget*) NULL; } wxMenu::~wxMenu() { - /* how do we delete an item-factory ? */ -} + WX_CLEAR_LIST(wxMenuItemList, m_items); -void wxMenu::SetTitle( const wxString& title ) -{ - // TODO Waiting for something better - m_title = title; + if ( GTK_IS_WIDGET( m_menu )) + gtk_widget_destroy( m_menu ); } -const wxString wxMenu::GetTitle() const +bool wxMenu::GtkAppend(wxMenuItem *mitem) { - return m_title; -} + GtkWidget *menuItem; -void wxMenu::AppendSeparator() -{ - wxMenuItem *mitem = new wxMenuItem(); - mitem->SetId(ID_SEPARATOR); - -#if (GTK_MINOR_VERSION > 0) - GtkItemFactoryEntry entry; - entry.path = "/sep"; - entry.callback = (GtkItemFactoryCallback) NULL; - entry.callback_action = 0; - entry.item_type = ""; - entry.accelerator = (gchar*) NULL; - - 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? */ - GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "
/sep" ); + if ( mitem->IsSeparator() ) + { +#ifdef __WXGTK20__ + menuItem = gtk_separator_menu_item_new(); #else - GtkWidget *menuItem = gtk_menu_item_new(); - gtk_menu_append( GTK_MENU(m_menu), menuItem ); - gtk_widget_show( menuItem ); + // TODO + menuItem = gtk_menu_item_new(); #endif - - mitem->SetMenuItem(menuItem); - m_items.Append( mitem ); -} + gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem); -static char* GetHotKey( const wxString &hotkey, char *hotbuf ) -{ - if (hotkey.IsEmpty()) return (char*) NULL; - - switch (hotkey[0]) + } + else if ( mitem->IsSubMenu() ) { - case _T('a'): /* Alt */ - case _T('A'): - case _T('m'): /* Meta */ - case _T('M'): - { - strcpy( hotbuf, "" ); - wxString last = hotkey.Right(1); - strcat( hotbuf, last.mb_str() ); - return hotbuf; - } - case _T('c'): /* Ctrl */ - case _T('C'): - case _T('s'): /* Strg, yeah man, I'm German */ - case _T('S'): - { - strcpy( hotbuf, "" ); - wxString last = hotkey.Right(1); - strcat( hotbuf, last.mb_str() ); - return hotbuf; + // text has "_" instead of "&" after mitem->SetText() + wxString text( mitem->GetText() ); + +#ifdef __WXGTK20__ + menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( text ) ); +#else + menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) ); + GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child ); + // set new text + gtk_label_set_text( label, wxGTK_CONV( text ) ); + // reparse key accel + guint 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, + GDK_MOD1_MASK, + GTK_ACCEL_LOCKED); } - case _T('F'): /* function keys */ - { - strcpy( hotbuf, hotkey.mb_str() ); - return hotbuf; - } - default: - { - } - } - return (char*) NULL; -} +#endif -void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable ) -{ - wxMenuItem *mitem = new wxMenuItem(); - mitem->SetId(id); - mitem->SetText(item); - mitem->SetHelp(helpStr); - mitem->SetCheckable(checkable); - -#if (GTK_MINOR_VERSION > 0) - /* text has "_" instead of "&" after mitem->SetText() */ - wxString text( mitem->GetText() ); - - /* local buffer in multibyte form */ - char buf[200]; - strcpy( buf, "/" ); - strcat( buf, text.mb_str() ); - - GtkItemFactoryEntry entry; - entry.path = buf; - entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback; - entry.callback_action = 0; - if (checkable) - entry.item_type = ""; - else - entry.item_type = ""; - - char hotbuf[50]; - entry.accelerator = GetHotKey( mitem->GetHotKey(), hotbuf ); - - 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 s = _T("
/"); - for ( const wxChar *pc = text; *pc != _T('\0'); pc++ ) - { - if (*pc == _T('_')) pc++; /* skip it */ - s << *pc; + gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu ); + gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem); + + gtk_widget_show( mitem->GetSubMenu()->m_menu ); + + // if adding a submenu to a menu already existing in the menu bar, we + // must set invoking window to allow processing events from this + // submenu + if ( m_invokingWindow ) + wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow); + + m_prevRadio = NULL; } - - GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, s.mb_str() ); - + else if (mitem->GetBitmap().Ok()) + { + wxString text = mitem->GetText(); + 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); #else - GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label( mitem->GetText().mb_str() ) - : gtk_menu_item_new_with_label( mitem->GetText().mb_str() ); - - 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 ); - -#endif + menuItem = gtk_pixmap_menu_item_new (); + 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); - gtk_signal_connect( GTK_OBJECT(menuItem), "select", - GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), - (gpointer)this ); + gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuItem); + guint accel_key; + GdkModifierType accel_mods; - gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", - GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), - (gpointer)this ); + // 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", + m_accel, + accel_key, accel_mods, + GTK_ACCEL_VISIBLE); + } - mitem->SetMenuItem(menuItem); + // 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, + GDK_MOD1_MASK, + GTK_ACCEL_LOCKED); + } - m_items.Append( mitem ); -} + gtk_widget_show (label); -void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr ) -{ - wxMenuItem *mitem = new wxMenuItem(); - mitem->SetId(id); - mitem->SetText(item); - mitem->SetHelp(helpStr); - -#if (GTK_MINOR_VERSION > 0) - /* text has "_" instead of "&" after mitem->SetText() */ - wxString text( mitem->GetText() ); - - /* local buffer in multibyte form */ - char buf[200]; - strcpy( buf, "/" ); - strcat( buf, text.mb_str() ); - - GtkItemFactoryEntry entry; - entry.path = buf; - entry.callback = (GtkItemFactoryCallback) 0; - entry.callback_action = 0; - entry.item_type = ""; - - 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 s = _T("
/"); - for ( const wxChar *pc = text; *pc != _T('\0'); pc++ ) + mitem->SetLabelWidget(label); + + GtkWidget* pixmap = gtk_pixmap_new( gdk_pixmap, gdk_bitmap ); + gtk_widget_show(pixmap); + gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM( menuItem ), pixmap); + + 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 ); +#endif + + m_prevRadio = NULL; + } + else // a normal item { - if (*pc == _T('_')) pc++; /* skip it */ - s << *pc; + // text has "_" instead of "&" after mitem->SetText() so don't use it + wxString text( mitem->GetText() ); + + switch ( mitem->GetKind() ) + { + case wxITEM_CHECK: + { +#ifdef __WXGTK20__ + menuItem = gtk_check_menu_item_new_with_mnemonic( wxGTK_CONV( text ) ); +#else + menuItem = gtk_check_menu_item_new_with_label( wxGTK_CONV( text ) ); + GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child ); + // set new text + gtk_label_set_text( label, wxGTK_CONV( text ) ); + // reparse key accel + guint 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, + GDK_MOD1_MASK, + GTK_ACCEL_LOCKED); + } +#endif + m_prevRadio = NULL; + break; + } + + case wxITEM_RADIO: + { + GSList *group = NULL; + if ( m_prevRadio == NULL ) + { + // start of a new radio group +#ifdef __WXGTK20__ + m_prevRadio = menuItem = gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV( text ) ); +#else + m_prevRadio = menuItem = gtk_radio_menu_item_new_with_label( group, wxGTK_CONV( text ) ); + GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child ); + // set new text + gtk_label_set_text( label, wxGTK_CONV( text ) ); + // reparse key accel + guint 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, + GDK_MOD1_MASK, + GTK_ACCEL_LOCKED); + } +#endif + } + else // continue the radio group + { +#ifdef __WXGTK20__ + group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (m_prevRadio)); + m_prevRadio = menuItem = gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV( text ) ); +#else + group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (m_prevRadio)); + m_prevRadio = menuItem = gtk_radio_menu_item_new_with_label( group, wxGTK_CONV( text ) ); + GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child ); + // set new text + gtk_label_set_text( label, wxGTK_CONV( text ) ); + // reparse key accel + guint 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, + GDK_MOD1_MASK, + GTK_ACCEL_LOCKED); + } +#endif + } + break; + } + + default: + wxFAIL_MSG( _T("unexpected menu item kind") ); + // fall through + + case wxITEM_NORMAL: + { +#ifdef __WXGTK20__ + menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( text ) ); +#else + menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) ); + GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child ); + // set new text + gtk_label_set_text( label, wxGTK_CONV( text ) ); + // reparse key accel + guint 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, + GDK_MOD1_MASK, + GTK_ACCEL_LOCKED); + } +#endif + m_prevRadio = NULL; + break; + } + } + + 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); } - GtkWidget *menuItem = gtk_item_factory_get_item( m_factory, s.mb_str() ); + guint accel_key; + GdkModifierType accel_mods; + wxCharBuffer buf = wxGTK_CONV( GetHotKey(*mitem) ); -#else - - GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str()); + // wxPrintf( wxT("item: %s hotkey %s\n"), mitem->GetText().c_str(), GetHotKey(*mitem).c_str() ); - gtk_menu_append( GTK_MENU(m_menu), menuItem ); + gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods); + if (accel_key != 0) + { + gtk_widget_add_accelerator (GTK_WIDGET(menuItem), + "activate", + m_accel, + accel_key, + accel_mods, + GTK_ACCEL_VISIBLE); + } + gtk_widget_show( menuItem ); - -#endif - gtk_signal_connect( GTK_OBJECT(menuItem), "select", - GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), - (gpointer*)this ); + if ( !mitem->IsSeparator() ) + { + wxASSERT_MSG( menuItem, wxT("invalid menuitem") ); - gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", - GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), - (gpointer*)this ); + gtk_signal_connect( GTK_OBJECT(menuItem), "select", + GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), + (gpointer)this ); + + gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", + GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), + (gpointer)this ); + } - gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu ); - mitem->SetMenuItem(menuItem); - mitem->SetSubMenu(subMenu); - m_items.Append( mitem ); + if (ms_locked) + { + // This doesn't even exist! + // gtk_widget_lock_accelerators(mitem->GetMenuItem()); + } + + return TRUE; } -void wxMenu::Append( wxMenuItem *item ) +wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem) { - m_items.Append( item ); + if (!GtkAppend(mitem)) + return NULL; + + return wxMenuBase::DoAppend(mitem); +} - GtkWidget *menuItem = (GtkWidget*) NULL; +wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) +{ + if ( !wxMenuBase::DoInsert(pos, item) ) + return NULL; - if (item->IsSeparator()) - menuItem = gtk_menu_item_new(); - else if (item->IsSubMenu()) - menuItem = gtk_menu_item_new_with_label(item->GetText().mbc_str()); - else - menuItem = item->IsCheckable() ? gtk_check_menu_item_new_with_label(item->GetText().mbc_str()) - : gtk_menu_item_new_with_label(item->GetText().mbc_str()); + // TODO + if ( !GtkAppend(item) ) + return NULL; - if (!item->IsSeparator()) - { - gtk_signal_connect( GTK_OBJECT(menuItem), "select", - GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), - (gpointer*)this ); + return item; +} - gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", - GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), - (gpointer*)this ); +wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) +{ + if ( !wxMenuBase::DoRemove(item) ) + return (wxMenuItem *)NULL; - if (!item->IsSubMenu()) - { - gtk_signal_connect( GTK_OBJECT(menuItem), "activate", - GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), - (gpointer*)this ); - } - } + // TODO: this code doesn't delete the item factory item and this seems + // impossible as of GTK 1.2.6. + gtk_widget_destroy( item->GetMenuItem() ); - gtk_menu_append( GTK_MENU(m_menu), menuItem ); - gtk_widget_show( menuItem ); - item->SetMenuItem(menuItem); + return item; } -int wxMenu::FindItem( const wxString itemString ) const +int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const { - wxString s = _T(""); - for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ ) + wxMenuItemList::compatibility_iterator node = m_items.GetFirst(); + while (node) { - if (*pc == _T('&')) - { - pc++; /* skip it */ -#if (GTK_MINOR_VERSION > 0) - s << _T('_'); -#endif - } - s << *pc; + wxMenuItem *item = node->GetData(); + if (item->GetMenuItem() == menuItem) + return item->GetId(); + node = node->GetNext(); } - wxNode *node = m_items.First(); - while (node) + return wxNOT_FOUND; +} + +// ---------------------------------------------------------------------------- +// helpers +// ---------------------------------------------------------------------------- + +#if wxUSE_ACCEL + +static wxString GetHotKey( const wxMenuItem& item ) +{ + wxString hotkey; + + wxAcceleratorEntry *accel = item.GetAccel(); + if ( accel ) { - wxMenuItem *item = (wxMenuItem*)node->Data(); - if (item->GetText() == s) + int flags = accel->GetFlags(); + if ( flags & wxACCEL_ALT ) + hotkey += wxT(""); + if ( flags & wxACCEL_CTRL ) + hotkey += wxT(""); + if ( flags & wxACCEL_SHIFT ) + hotkey += wxT(""); + + int code = accel->GetKeyCode(); + switch ( code ) { - return item->GetId(); + case WXK_F1: + case WXK_F2: + case WXK_F3: + case WXK_F4: + case WXK_F5: + case WXK_F6: + case WXK_F7: + case WXK_F8: + case WXK_F9: + case WXK_F10: + case WXK_F11: + case WXK_F12: + hotkey << wxT('F') << code - WXK_F1 + 1; + break; + + // TODO: we should use gdk_keyval_name() (a.k.a. + // XKeysymToString) here as well as hardcoding the keysym + // names this might be not portable + case WXK_NUMPAD_INSERT: + hotkey << wxT("KP_Insert" ); + break; + case WXK_NUMPAD_DELETE: + hotkey << wxT("KP_Delete" ); + break; + case WXK_INSERT: + hotkey << wxT("Insert" ); + break; + case WXK_DELETE: + hotkey << wxT("Delete" ); + break; + case WXK_UP: + hotkey << wxT("Up" ); + break; + case WXK_DOWN: + 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: + hotkey << wxT("Left" ); + break; + case WXK_RIGHT: + hotkey << wxT("Right" ); + break; + case WXK_HOME: + hotkey << wxT("Home" ); + break; + case WXK_END: + hotkey << wxT("End" ); + break; + case WXK_RETURN: + hotkey << wxT("Return" ); + break; + + // if there are any other keys wxGetAccelFromString() may + // return, we should process them here + + default: + if ( code < 127 ) + { + wxString name = wxGTK_CONV_BACK( gdk_keyval_name((guint)code) ); + if ( name ) + { + hotkey << name; + break; + } + } + + wxFAIL_MSG( wxT("unknown keyboard accel") ); } - node = node->Next(); + + delete accel; } - return wxNOT_FOUND; + return hotkey; } -void wxMenu::Enable( int id, bool enable ) +#endif // wxUSE_ACCEL + + +//----------------------------------------------------------------------------- +// substitute for missing GtkPixmapMenuItem +//----------------------------------------------------------------------------- + +#ifndef __WXGTK20__ + +/* + * Copyright (C) 1998, 1999, 2000 Free Software Foundation + * All rights reserved. + * + * This file is part of the Gnome Library. + * + * The Gnome Library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * The Gnome Library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with the Gnome Library; see the file COPYING.LIB. If not, + * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ +/* + @NOTATION@ + */ + +/* Author: Dietmar Maurer */ + +#include +#include +#include +#include +#include + +extern "C" { - wxMenuItem *item = FindItem(id); - wxCHECK_RET( item, _T("wxMenu::Enable: no such item") ); +static void gtk_pixmap_menu_item_class_init (GtkPixmapMenuItemClass *klass); +static void gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item); +static void gtk_pixmap_menu_item_draw (GtkWidget *widget, + GdkRectangle *area); +static gint gtk_pixmap_menu_item_expose (GtkWidget *widget, + GdkEventExpose *event); + +/* we must override the following functions */ + +static void gtk_pixmap_menu_item_map (GtkWidget *widget); +static void gtk_pixmap_menu_item_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); +static void gtk_pixmap_menu_item_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, + gpointer callback_data); +static void gtk_pixmap_menu_item_size_request (GtkWidget *widget, + GtkRequisition *requisition); +static void gtk_pixmap_menu_item_remove (GtkContainer *container, + GtkWidget *child); + +static void changed_have_pixmap_status (GtkPixmapMenuItem *menu_item); + +static GtkMenuItemClass *parent_class = NULL; - item->Enable(enable); } -bool wxMenu::IsEnabled( int id ) const +#define BORDER_SPACING 3 +#define PMAP_WIDTH 20 + +GtkType +gtk_pixmap_menu_item_get_type (void) { - wxMenuItem *item = FindItem(id); + static GtkType pixmap_menu_item_type = 0; + + if (!pixmap_menu_item_type) + { + GtkTypeInfo pixmap_menu_item_info = + { + (char *)"GtkPixmapMenuItem", + sizeof (GtkPixmapMenuItem), + sizeof (GtkPixmapMenuItemClass), + (GtkClassInitFunc) gtk_pixmap_menu_item_class_init, + (GtkObjectInitFunc) gtk_pixmap_menu_item_init, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, + (GtkClassInitFunc) NULL, + }; + + pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (), + &pixmap_menu_item_info); + } - wxCHECK_MSG( item, FALSE, _T("wxMenu::IsEnabled: no such item") ); + return pixmap_menu_item_type; +} - return item->IsEnabled(); +/** + * gtk_pixmap_menu_item_new + * + * Creates a new pixmap menu item. Use gtk_pixmap_menu_item_set_pixmap() + * to set the pixmap wich is displayed at the left side. + * + * Returns: + * &GtkWidget pointer to new menu item + **/ + +GtkWidget* +gtk_pixmap_menu_item_new (void) +{ + return GTK_WIDGET (gtk_type_new (gtk_pixmap_menu_item_get_type ())); } -void wxMenu::Check( int id, bool enable ) +static void +gtk_pixmap_menu_item_class_init (GtkPixmapMenuItemClass *klass) { - wxMenuItem *item = FindItem(id); + GtkObjectClass *object_class; + GtkWidgetClass *widget_class; + GtkMenuItemClass *menu_item_class; + GtkContainerClass *container_class; + + object_class = (GtkObjectClass*) klass; + widget_class = (GtkWidgetClass*) klass; + menu_item_class = (GtkMenuItemClass*) klass; + container_class = (GtkContainerClass*) klass; + + parent_class = (GtkMenuItemClass*) gtk_type_class (gtk_menu_item_get_type ()); + + widget_class->draw = gtk_pixmap_menu_item_draw; + widget_class->expose_event = gtk_pixmap_menu_item_expose; + widget_class->map = gtk_pixmap_menu_item_map; + widget_class->size_allocate = gtk_pixmap_menu_item_size_allocate; + widget_class->size_request = gtk_pixmap_menu_item_size_request; - wxCHECK_RET( item, _T("wxMenu::Check: no such item") ); + container_class->forall = gtk_pixmap_menu_item_forall; + container_class->remove = gtk_pixmap_menu_item_remove; - item->Check(enable); + klass->orig_toggle_size = menu_item_class->toggle_size; + klass->have_pixmap_count = 0; } -bool wxMenu::IsChecked( int id ) const +static void +gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item) { - wxMenuItem *item = FindItem(id); + GtkMenuItem *mi; - wxCHECK_MSG( item, FALSE, _T("wxMenu::IsChecked: no such item") ); + mi = GTK_MENU_ITEM (menu_item); - return item->IsChecked(); + menu_item->pixmap = NULL; } -void wxMenu::SetLabel( int id, const wxString &label ) +static void +gtk_pixmap_menu_item_draw (GtkWidget *widget, + GdkRectangle *area) { - wxMenuItem *item = FindItem(id); + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget)); + g_return_if_fail (area != NULL); - wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") ); + if (GTK_WIDGET_CLASS (parent_class)->draw) + (* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area); - item->SetText(label); + if (GTK_WIDGET_DRAWABLE (widget) && + GTK_PIXMAP_MENU_ITEM(widget)->pixmap) { + gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL); + } } -wxString wxMenu::GetLabel( int id ) const +static gint +gtk_pixmap_menu_item_expose (GtkWidget *widget, + GdkEventExpose *event) { - wxMenuItem *item = FindItem(id); + g_return_val_if_fail (widget != NULL, FALSE); + g_return_val_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget), FALSE); + g_return_val_if_fail (event != NULL, FALSE); + + if (GTK_WIDGET_CLASS (parent_class)->expose_event) + (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event); - wxCHECK_MSG( item, _T(""), _T("wxMenu::GetLabel: no such item") ); + if (GTK_WIDGET_DRAWABLE (widget) && + GTK_PIXMAP_MENU_ITEM(widget)->pixmap) { + gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL); + } - return item->GetText(); + return FALSE; } -void wxMenu::SetHelpString( int id, const wxString& helpString ) +/** + * gtk_pixmap_menu_item_set_pixmap + * @menu_item: Pointer to the pixmap menu item + * @pixmap: Pointer to a pixmap widget + * + * Set the pixmap of the menu item. + * + **/ + +void +gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item, + GtkWidget *pixmap) { - wxMenuItem *item = FindItem(id); + g_return_if_fail (menu_item != NULL); + g_return_if_fail (pixmap != NULL); + g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (menu_item)); + g_return_if_fail (GTK_IS_WIDGET (pixmap)); + g_return_if_fail (menu_item->pixmap == NULL); + + gtk_widget_set_parent (pixmap, GTK_WIDGET (menu_item)); + menu_item->pixmap = pixmap; + + if (GTK_WIDGET_REALIZED (pixmap->parent) && + !GTK_WIDGET_REALIZED (pixmap)) + gtk_widget_realize (pixmap); + + if (GTK_WIDGET_VISIBLE (pixmap->parent)) { + if (GTK_WIDGET_MAPPED (pixmap->parent) && + GTK_WIDGET_VISIBLE(pixmap) && + !GTK_WIDGET_MAPPED (pixmap)) + gtk_widget_map (pixmap); + } - wxCHECK_RET( item, _T("wxMenu::SetHelpString: no such item") ); + changed_have_pixmap_status(menu_item); - item->SetHelp( helpString ); + if (GTK_WIDGET_VISIBLE (pixmap) && GTK_WIDGET_VISIBLE (menu_item)) + gtk_widget_queue_resize (pixmap); } -wxString wxMenu::GetHelpString( int id ) const +static void +gtk_pixmap_menu_item_map (GtkWidget *widget) { - wxMenuItem *item = FindItem(id); + GtkPixmapMenuItem *menu_item; - wxCHECK_MSG( item, _T(""), _T("wxMenu::GetHelpString: no such item") ); + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget)); - return item->GetHelp(); + menu_item = GTK_PIXMAP_MENU_ITEM(widget); + + GTK_WIDGET_CLASS(parent_class)->map(widget); + + if (menu_item->pixmap && + GTK_WIDGET_VISIBLE (menu_item->pixmap) && + !GTK_WIDGET_MAPPED (menu_item->pixmap)) + gtk_widget_map (menu_item->pixmap); } -int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const +static void +gtk_pixmap_menu_item_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) { - wxNode *node = m_items.First(); - while (node) + GtkPixmapMenuItem *pmenu_item; + + pmenu_item = GTK_PIXMAP_MENU_ITEM(widget); + + if (pmenu_item->pixmap && GTK_WIDGET_VISIBLE(pmenu_item)) { - wxMenuItem *item = (wxMenuItem*)node->Data(); - if (item->GetMenuItem() == menuItem) - return item->GetId(); - node = node->Next(); + GtkAllocation child_allocation; + int border_width; + + border_width = GTK_CONTAINER (widget)->border_width; + + child_allocation.width = pmenu_item->pixmap->requisition.width; + child_allocation.height = pmenu_item->pixmap->requisition.height; + child_allocation.x = border_width + BORDER_SPACING; + child_allocation.y = (border_width + BORDER_SPACING + + (((allocation->height - child_allocation.height) - child_allocation.x) + / 2)); /* center pixmaps vertically */ + gtk_widget_size_allocate (pmenu_item->pixmap, &child_allocation); } - return wxNOT_FOUND; + if (GTK_WIDGET_CLASS (parent_class)->size_allocate) + GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation); } -wxMenuItem *wxMenu::FindItem(int id) const +static void +gtk_pixmap_menu_item_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, + gpointer callback_data) { - wxNode *node = m_items.First(); - while (node) - { - wxMenuItem *item = (wxMenuItem*)node->Data(); - if (item->GetId() == id) - { - return item; - } - node = node->Next(); - } + GtkPixmapMenuItem *menu_item; + + g_return_if_fail (container != NULL); + g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container)); + g_return_if_fail (callback != NULL); - /* Not finding anything here can be correct - * when search the entire menu system for - * an entry -> no error message. */ + menu_item = GTK_PIXMAP_MENU_ITEM (container); - return (wxMenuItem *) NULL; + if (menu_item->pixmap) + (* callback) (menu_item->pixmap, callback_data); + + GTK_CONTAINER_CLASS(parent_class)->forall(container,include_internals, + callback,callback_data); } -void wxMenu::SetInvokingWindow( wxWindow *win ) +static void +gtk_pixmap_menu_item_size_request (GtkWidget *widget, + GtkRequisition *requisition) { - m_invokingWindow = win; + GtkPixmapMenuItem *menu_item; + GtkRequisition req = {0, 0}; + + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_MENU_ITEM (widget)); + g_return_if_fail (requisition != NULL); + + GTK_WIDGET_CLASS(parent_class)->size_request(widget,requisition); + + menu_item = GTK_PIXMAP_MENU_ITEM (widget); + + if (menu_item->pixmap) + gtk_widget_size_request(menu_item->pixmap, &req); + + requisition->height = MAX(req.height + GTK_CONTAINER(widget)->border_width + BORDER_SPACING, (unsigned int) requisition->height); + requisition->width += (req.width + GTK_CONTAINER(widget)->border_width + BORDER_SPACING); } -wxWindow *wxMenu::GetInvokingWindow() +static void +gtk_pixmap_menu_item_remove (GtkContainer *container, + GtkWidget *child) { - return m_invokingWindow; + GtkBin *bin; + gboolean widget_was_visible; + + g_return_if_fail (container != NULL); + g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container)); + g_return_if_fail (child != NULL); + g_return_if_fail (GTK_IS_WIDGET (child)); + + bin = GTK_BIN (container); + g_return_if_fail ((bin->child == child || + (GTK_PIXMAP_MENU_ITEM(container)->pixmap == child))); + + widget_was_visible = GTK_WIDGET_VISIBLE (child); + + gtk_widget_unparent (child); + if (bin->child == child) + bin->child = NULL; + else { + GTK_PIXMAP_MENU_ITEM(container)->pixmap = NULL; + changed_have_pixmap_status(GTK_PIXMAP_MENU_ITEM(container)); + } + + if (widget_was_visible) + gtk_widget_queue_resize (GTK_WIDGET (container)); } -// Update a menu and all submenus recursively. source is the object that has -// the update event handlers defined for it. If NULL, the menu or associated -// window will be used. -void wxMenu::UpdateUI(wxEvtHandler* source) + +/* important to only call this if there was actually a _change_ in pixmap == NULL */ +static void +changed_have_pixmap_status (GtkPixmapMenuItem *menu_item) { - if (!source && GetInvokingWindow()) - source = GetInvokingWindow()->GetEventHandler(); - if (!source) - source = GetEventHandler(); - if (!source) - source = this; - - wxNode* node = GetItems().First(); - while (node) - { - wxMenuItem* item = (wxMenuItem*) node->Data(); - if ( !item->IsSeparator() ) - { - wxWindowID id = item->GetId(); - wxUpdateUIEvent event(id); - event.SetEventObject( source ); + if (menu_item->pixmap != NULL) { + GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count += 1; - if (source->ProcessEvent(event)) - { - if (event.GetSetText()) - SetLabel(id, event.GetText()); - if (event.GetSetChecked()) - Check(id, event.GetChecked()); - if (event.GetSetEnabled()) - Enable(id, event.GetEnabled()); - } - - if (item->GetSubMenu()) - item->GetSubMenu()->UpdateUI(source); + if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 1) { + /* Install pixmap toggle size */ + GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = MAX(GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size, PMAP_WIDTH); + } + } else { + GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count -= 1; + + if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 0) { + /* Install normal toggle size */ + GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size; } - node = node->Next(); } + + /* Note that we actually need to do this for _all_ GtkPixmapMenuItem + whenever the klass->toggle_size changes; but by doing it anytime + this function is called, we get the same effect, just because of + how the preferences option to show pixmaps works. Bogus, broken. + */ + if (GTK_WIDGET_VISIBLE(GTK_WIDGET(menu_item))) + gtk_widget_queue_resize(GTK_WIDGET(menu_item)); } +#endif +