X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/90a53a3aedca499a8e11d8f474981f3bd29651e8..0d58bb65789a8efec581d2beb2117669d1d1db9d:/src/gtk/menu.cpp diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 6b95c406e7..9c28eb232c 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -12,13 +12,19 @@ #pragma implementation "menuitem.h" #endif -#include "wx/menu.h" #include "wx/log.h" #include "wx/intl.h" #include "wx/app.h" +#include "wx/bitmap.h" +#include "wx/menu.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#if wxUSE_ACCEL + #include "wx/accel.h" +#endif // wxUSE_ACCEL + +#include +#include +#include //----------------------------------------------------------------------------- // idle system @@ -27,6 +33,89 @@ extern void wxapp_install_idle_handler(); extern bool g_isIdle; +#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL +static wxString GetHotKey( const wxMenuItem& item ); +#endif + +//----------------------------------------------------------------------------- +// substitute for missing GtkPixmapMenuItem +//----------------------------------------------------------------------------- + +#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); + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +static wxString wxReplaceUnderscore( const wxString& title ) +{ + const wxChar *pc; + + /* GTK 1.2 wants to have "_" instead of "&" for accelerators */ + wxString str; + for ( pc = title; *pc != wxT('\0'); pc++ ) + { + if (*pc == wxT('&')) + { +#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) + str << wxT('_'); + } + else if (*pc == wxT('/')) + { + str << wxT('\\'); +#endif + } + else + { +#if __WXGTK12__ + if ( *pc == wxT('_') ) + { + // underscores must be doubled to prevent them from being + // interpreted as accelerator character prefix by GTK + str << *pc; + } +#endif // GTK+ 1.2 + + str << *pc; + } + } + return str; +} + //----------------------------------------------------------------------------- // wxMenuBar //----------------------------------------------------------------------------- @@ -41,9 +130,9 @@ wxMenuBar::wxMenuBar( long style ) m_invokingWindow = (wxWindow*) NULL; if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) || - !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, _T("menubar") )) + !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") )) { - wxFAIL_MSG( _T("wxMenuBar creation failed") ); + wxFAIL_MSG( wxT("wxMenuBar creation failed") ); return; } @@ -70,6 +159,8 @@ wxMenuBar::wxMenuBar( long style ) } PostCreation(); + + ApplyWidgetStyle(); } wxMenuBar::wxMenuBar() @@ -80,12 +171,12 @@ wxMenuBar::wxMenuBar() m_invokingWindow = (wxWindow*) NULL; if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) || - !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("menubar") )) + !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("menubar") )) { - wxFAIL_MSG( _T("wxMenuBar creation failed") ); + wxFAIL_MSG( wxT("wxMenuBar creation failed") ); return; } - + m_menus.DeleteContents( TRUE ); /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */ @@ -100,11 +191,13 @@ wxMenuBar::wxMenuBar() m_widget = GTK_WIDGET(m_menubar); PostCreation(); + + ApplyWidgetStyle(); } wxMenuBar::~wxMenuBar() { - // how to destroy a GtkItemFactory ? +// gtk_object_unref( GTK_OBJECT(m_factory) ); why not ? } static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win ) @@ -113,19 +206,20 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *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_detach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) ); #endif - wxNode *node = menu->GetItems().First(); + wxMenuItemList::Node *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(); } } @@ -133,22 +227,24 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( win ); -#if (GTK_MINOR_VERSION > 0) +#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_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) ); + GtkObject *obj = GTK_OBJECT(top_frame->m_widget); + if ( !g_slist_find( menu->m_accel->attach_objects, obj ) ) + gtk_accel_group_attach( menu->m_accel, obj ); #endif - wxNode *node = menu->GetItems().First(); + wxMenuItemList::Node *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(); } } @@ -157,19 +253,21 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win ) m_invokingWindow = win; #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_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 key accelerators indicated by underscroes */ - gtk_accel_group_attach( m_accel, GTK_OBJECT(top_frame->m_widget) ); + GtkObject *obj = GTK_OBJECT(top_frame->m_widget); + if ( !g_slist_find( m_accel->attach_objects, obj ) ) + gtk_accel_group_attach( m_accel, obj ); #endif - wxNode *node = m_menus.First(); + wxMenuList::Node *node = m_menus.GetFirst(); while (node) { - wxMenu *menu = (wxMenu*)node->Data(); + wxMenu *menu = node->GetData(); wxMenubarSetInvokingWindow( menu, win ); - node = node->Next(); + node = node->GetNext(); } } @@ -178,56 +276,33 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win ) m_invokingWindow = (wxWindow*) NULL; #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_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 key accelerators indicated by underscroes */ gtk_accel_group_detach( m_accel, GTK_OBJECT(top_frame->m_widget) ); #endif - wxNode *node = m_menus.First(); + wxMenuList::Node *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 ); - - const wxChar *pc; + if ( !wxMenuBarBase::Append( menu, title ) ) + return FALSE; - /* GTK 1.2 wants to have "_" instead of "&" for accelerators */ - wxString str; - for ( 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 - { -#if __WXGTK12__ - if ( *pc == _T('_') ) - { - // underscores must be doubled to prevent them from being - // interpreted as accelerator character prefix by GTK - str << *pc; - } -#endif // GTK+ 1.2 + return GtkAppend(menu, title); +} - str << *pc; - } - } +bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) +{ + wxString str( wxReplaceUnderscore( title ) ); /* this doesn't have much effect right now */ menu->SetTitle( str ); @@ -237,7 +312,7 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title ) /* local buffer in multibyte form */ wxString buf; - buf << _T('/') << str.c_str(); + buf << wxT('/') << str.c_str(); char *cbuf = new char[buf.Length()+1]; strcpy(cbuf, buf.mbc_str()); @@ -251,13 +326,14 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title ) 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 ( pc = str; *pc != _T('\0'); pc++ ) + wxString tmp = wxT("
/"); + const wxChar *pc; + for ( pc = str; *pc != wxT('\0'); pc++ ) { // contrary to the common sense, we must throw out _all_ underscores, // (i.e. "Hello__World" => "HelloWorld" and not "Hello_World" as we - // might naively think). IMHO it's a bug in GTK+ (VZ) - while (*pc == _T('_')) + // might naively think). IMHO it's a bug in GTK+ (VZ) + while (*pc == wxT('_')) pc++; tmp << *pc; } @@ -278,192 +354,222 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title ) // adding menu later on. if (m_invokingWindow) wxMenubarSetInvokingWindow( menu, m_invokingWindow ); + + return TRUE; +} + +bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) +{ + if ( !wxMenuBarBase::Insert(pos, menu, title) ) + return FALSE; + +#if __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(menu, title) ) + return FALSE; + + if (pos+1 >= m_menus.GetCount()) + return TRUE; + + GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget); + gpointer data = g_list_last(menu_shell->children)->data; + 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 with GTK 1.0 - can use standard functions for + // this and don't need any hacks like above, but as I don't have GTK 1.0 + // any more I can't do it + wxFAIL_MSG( wxT("TODO") ); + + return FALSE; +#endif // GTK 1.2/1.0 +} + +wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) +{ + // remove the old item and insert a new one + wxMenu *menuOld = Remove(pos); + if ( menuOld && !Insert(pos, menu, title) ) + { + return (wxMenu*) NULL; + } + + // either Insert() succeeded or Remove() failed and menuOld is NULL + return menuOld; +} + +wxMenu *wxMenuBar::Remove(size_t pos) +{ + wxMenu *menu = wxMenuBarBase::Remove(pos); + if ( !menu ) + return (wxMenu*) NULL; + +/* + GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget); + + printf( "factory entries before %d\n", (int)g_slist_length(m_factory->items) ); + printf( "menu shell entries before %d\n", (int)g_list_length( menu_shell->children ) ); +*/ + + // 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 ); + +/* + 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 ) ); +*/ + + return menu; } static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString ) { - if (menu->GetTitle() == menuString) + if (wxMenuItem::GetLabelFromText(menu->GetTitle()) == wxMenuItem::GetLabelFromText(menuString)) { int res = menu->FindItem( itemString ); if (res != wxNOT_FOUND) return res; } - wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast + wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); while (node) { - wxMenuItem *item = (wxMenuItem*)node->Data(); + wxMenuItem *item = node->GetData(); if (item->IsSubMenu()) return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString); - node = node->Next(); + node = node->GetNext(); } return wxNOT_FOUND; } -wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem ) const -{ - if ( menuForItem ) - { - // TODO return the pointer to the menu - - *menuForItem = NULL; - } - - return FindItem(itemId); -} - int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const { - wxNode *node = m_menus.First(); + wxMenuList::Node *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::Node *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::Node *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(); } - return result; -} - -void wxMenuBar::Check( int id, bool check ) -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") ); + if ( menuForItem ) + { + *menuForItem = result ? result->GetMenu() : (wxMenu *)NULL; + } - item->Check(check); + return result; } -bool wxMenuBar::IsChecked( int id ) const +void wxMenuBar::EnableTop( size_t pos, bool flag ) { - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked: no such item") ); + wxMenuList::Node *node = m_menus.Item( pos ); - return item->IsChecked(); -} + wxCHECK_RET( node, wxT("menu not found") ); -void wxMenuBar::Enable( int id, bool enable ) -{ - wxMenuItem* item = FindMenuItemById( id ); + wxMenu* menu = node->GetData(); - wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") ); - - item->Enable(enable); + if (menu->m_owner) + gtk_widget_set_sensitive( menu->m_owner, flag ); } -bool wxMenuBar::IsEnabled( int id ) const +wxString wxMenuBar::GetLabelTop( size_t pos ) const { - wxMenuItem* item = FindMenuItemById( id ); + wxMenuList::Node *node = m_menus.Item( pos ); - wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled: no such item") ); + wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") ); - return item->IsEnabled(); -} + wxMenu* menu = node->GetData(); -wxString wxMenuBar::GetLabel( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); + wxString label; + wxString text( menu->GetTitle() ); +#if (GTK_MINOR_VERSION > 0) + for ( const wxChar *pc = text.c_str(); *pc; pc++ ) + { + if ( *pc == wxT('_') || *pc == wxT('&') ) + { + // '_' is the escape character for GTK+ and '&' is the one for + // wxWindows - skip both of them + continue; + } - wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel: no such item") ); + label += *pc; + } +#else // GTK+ 1.0 + label = text; +#endif // GTK+ 1.2/1.0 - 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 ); - - wxCHECK_RET( item, _T("wxMenuBar::SetLabel: no such item") ); + wxMenuList::Node *node = m_menus.Item( pos ); - item->SetText( label ); -} + wxCHECK_RET( node, wxT("menu not found") ); -void wxMenuBar::EnableTop( int pos, bool flag ) -{ - wxNode *node = m_menus.Nth( pos ); + wxMenu* menu = node->GetData(); - 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, str.mb_str()); - wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString: no such item") ); + /* reparse key accel */ + (void)gtk_label_parse_uline (GTK_LABEL(label), str.mb_str() ); + gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) ); + } - return item->GetHelp(); } //----------------------------------------------------------------------------- @@ -472,49 +578,38 @@ 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(); + if ( item->wxMenuItemBase::IsChecked() == 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 */ + /* the user pressed on the menu item -> report and make consistent + * again */ + item->wxMenuItemBase::Check(isReallyChecked); } } - wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id ); - event.SetEventObject( menu ); - event.SetInt(id ); - - if (menu->GetCallback()) - { - (void) (*(menu->GetCallback())) (*menu, event); - return; - } - - if (menu->GetEventHandler()->ProcessEvent(event)) - return; - - wxWindow *win = menu->GetInvokingWindow(); - if (win) - win->GetEventHandler()->ProcessEvent( event ); + menu->SendEvent(item->GetId(), item->IsCheckable() ? item->IsChecked() : -1); } //----------------------------------------------------------------------------- @@ -572,90 +667,198 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) // wxMenuItem //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase) + +wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu, + int id, + const wxString& name, + const wxString& help, + bool isCheckable, + wxMenu *subMenu) +{ + return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu); +} -wxMenuItem::wxMenuItem() +wxMenuItem::wxMenuItem(wxMenu *parentMenu, + int id, + const wxString& text, + const wxString& help, + bool isCheckable, + wxMenu *subMenu) { - m_id = ID_SEPARATOR; - m_isCheckMenu = FALSE; + m_id = id; + m_isCheckable = isCheckable; m_isChecked = FALSE; m_isEnabled = TRUE; - m_subMenu = (wxMenu *) NULL; + m_subMenu = subMenu; + m_parentMenu = parentMenu; + m_help = help; + + m_labelWidget = (GtkWidget *) NULL; m_menuItem = (GtkWidget *) NULL; + + DoSetText(text); +} + +wxMenuItem::~wxMenuItem() +{ + // 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 == wxT('_') ) + { + // wxGTK escapes "xxx_xxx" to "xxx__xxx" + pc++; + label += *pc; + continue; + } + + if ( *pc == wxT('&') ) + { + // wxMSW escapes & + continue; + } + + label += *pc; + } + + return label; +} + +void wxMenuItem::SetText( const wxString& str ) +{ + DoSetText(str); + + if (m_menuItem) + { + GtkLabel *label; + if (m_labelWidget) + label = (GtkLabel*) m_labelWidget; + else + label = GTK_LABEL( GTK_BIN(m_menuItem)->child ); + + /* set new text */ + gtk_label_set( label, m_text.mb_str()); + + /* reparse key accel */ + (void)gtk_label_parse_uline (GTK_LABEL(label), m_text.mb_str() ); + gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) ); + } } // it's valid for this function to be called even if m_menuItem == NULL -void wxMenuItem::SetName( const wxString& str ) +void wxMenuItem::DoSetText( const wxString& str ) { /* '\t' is the deliminator indicating a hot key */ - m_text = _T(""); + m_text.Empty(); const wxChar *pc = str; - for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ ) + for (; (*pc != wxT('\0')) && (*pc != wxT('\t')); pc++ ) { - if (*pc == _T('&')) + if (*pc == wxT('&')) { #if (GTK_MINOR_VERSION > 0) - m_text << _T('_'); + m_text << wxT('_'); } - else if ( *pc == _T('_') ) // escape underscores + else if ( *pc == wxT('_') ) // escape underscores { - m_text << _T("__"); + m_text << wxT("__"); } - else if (*pc == _T('/')) /* we have to filter out slashes ... */ + else if (*pc == wxT('/')) /* we have to filter out slashes ... */ { - m_text << _T('\\'); /* ... and replace them with back slashes */ + m_text << wxT('\\'); /* ... and replace them with back slashes */ #endif } else - m_text << *pc; + m_text << *pc; } /* only GTK 1.2 knows about hot keys */ - m_hotKey = _T(""); + m_hotKey = wxT(""); #if (GTK_MINOR_VERSION > 0) - if(*pc == _T('\t')) + 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") ); - wxCHECK_RET( IsCheckable(), _T("Can't check uncheckable item!") ) + wxCHECK_RET( IsCheckable(), wxT("Can't check uncheckable item!") ) - if (check == m_isChecked) return; + if (check == m_isChecked) + return; - m_isChecked = check; + wxMenuItemBase::Check( check ); gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check ); } 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_MSG( m_menuItem, FALSE, wxT("invalid menu item") ); + + wxCHECK_MSG( IsCheckable(), FALSE, + wxT("can't get state of uncheckable item!") ); - wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item! + return ((GtkCheckMenuItem*)m_menuItem)->active != 0; +} - bool bIsChecked = ((GtkCheckMenuItem*)m_menuItem)->active != 0; +wxString wxMenuItem::GetFactoryPath() const +{ + /* in order to get the pointer to the item we need the item text + _without_ underscores */ + wxString path( wxT("
/") ); - return bIsChecked; + for ( const wxChar *pc = m_text.c_str(); *pc; pc++ ) + { + if ( *pc == wxT('_') || *pc == wxT('&') ) + { + // remove '_' and '&' unconditionally + continue; + } + + path += *pc; + } + + return path; } //----------------------------------------------------------------------------- @@ -664,17 +867,8 @@ bool wxMenuItem::IsChecked() const IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler) -void -wxMenu::Init( const wxString& title, - long style, - const wxFunction func - ) +void wxMenu::Init() { - m_title = title; - m_items.DeleteContents( TRUE ); - m_invokingWindow = (wxWindow *) NULL; - m_style = style; - #if (GTK_MINOR_VERSION > 0) m_accel = gtk_accel_group_new(); m_factory = gtk_item_factory_new( GTK_TYPE_MENU, "
", m_accel ); @@ -683,18 +877,6 @@ wxMenu::Init( const wxString& title, m_menu = gtk_menu_new(); // Do not show! #endif - m_callback = func; - - m_eventHandler = this; - m_clientData = (void*) NULL; - - if (m_title.IsNull()) m_title = _T(""); - if (m_title != _T("")) - { - Append(-2, m_title); - AppendSeparator(); - } - m_owner = (GtkWidget*) NULL; #if (GTK_MINOR_VERSION > 0) @@ -713,438 +895,692 @@ wxMenu::Init( const wxString& title, //GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "
/tearoff" ); } #endif + + // append the title as the very first entry if we have it + if ( !!m_title ) + { + Append(-2, m_title); + AppendSeparator(); + } } wxMenu::~wxMenu() { - /* how do we delete an item-factory ? */ - gtk_widget_destroy( m_menu ); + m_items.Clear(); -} + gtk_widget_destroy( m_menu ); -void wxMenu::SetTitle( const wxString& title ) -{ - // TODO Waiting for something better - m_title = title; + gtk_object_unref( GTK_OBJECT(m_factory) ); } -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); + bool appended = FALSE; + if ( mitem->IsSeparator() ) + { #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" ); -#else - GtkWidget *menuItem = gtk_menu_item_new(); - gtk_menu_append( GTK_MENU(m_menu), menuItem ); - gtk_widget_show( menuItem ); -#endif - - mitem->SetMenuItem(menuItem); - m_items.Append( mitem ); -} - + 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? */ + menuItem = gtk_item_factory_get_widget( m_factory, "
/sep" ); +#else // GTK+ 1.0 + menuItem = gtk_menu_item_new(); +#endif // GTK 1.2/1.0 + } + else if ( mitem->IsSubMenu() ) + { #if (GTK_MINOR_VERSION > 0) -static char* GetHotKey( const wxString &hotkey, char *hotbuf ) -{ - if (hotkey.IsEmpty()) return (char*) NULL; - - switch (hotkey[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 = ""; + entry.accelerator = (gchar*) NULL; + + 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, path.mb_str() ); +#else // GTK+ 1.0 + menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str()); +#endif // GTK 1.2/1.0 + + gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), 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); + } + else if (mitem->GetBitmap().Ok()) // An item with bitmap { - 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; - } - case _T('F'): /* function keys */ - { - strcpy( hotbuf, hotkey.mb_str() ); - return hotbuf; - } - default: - { + wxString text( mitem->GetText() ); + const wxBitmap *bitmap = &mitem->GetBitmap(); + + menuItem = gtk_pixmap_menu_item_new (); + GtkWidget *label = gtk_accel_label_new (text.mb_str()); + 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), text.mb_str() ); + gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuItem); + 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_ACCEL_LOCKED); } - } - return (char*) NULL; -} -#endif + gtk_widget_show (label); -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); + mitem->SetLabelWidget(label); -#if (GTK_MINOR_VERSION > 0) - /* text has "_" instead of "&" after mitem->SetText() */ - wxString text( mitem->GetText() ); + GtkWidget* pixmap = gtk_pixmap_new( bitmap->GetPixmap(), bitmap->GetMask() ? bitmap->GetMask()->GetBitmap() : (GdkBitmap* )NULL); + gtk_widget_show(pixmap); + gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM( menuItem ), pixmap); - /* local buffer in multibyte form */ - char buf[200]; - strcpy( buf, "/" ); - strcat( buf, text.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 ); - 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++ ) + appended = TRUE; // We've done this, don't do it again + } + else // a normal item { - while (*pc == _T('_')) pc++; /* skip it */ - s << *pc; +#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 ( mitem->IsCheckable() ) + entry.item_type = ""; + else + entry.item_type = ""; + entry.accelerator = (gchar*) NULL; + +#if wxUSE_ACCEL + // due to an apparent bug in GTK+, we have to use a static buffer here - + // otherwise GTK+ 1.2.2 manages to override the memory we pass to it + // somehow! (VZ) + static char s_accel[50]; // must be big enougg + wxString tmp( GetHotKey(*mitem) ); + strncpy(s_accel, tmp.mb_str(), WXSIZEOF(s_accel)); + entry.accelerator = s_accel; +#else // !wxUSE_ACCEL + entry.accelerator = (char*) NULL; +#endif // wxUSE_ACCEL/!wxUSE_ACCEL + + gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ + + wxString path( mitem->GetFactoryPath() ); + menuItem = gtk_item_factory_get_widget( m_factory, path.mb_str() ); +#else // GTK+ 1.0 + 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 ); +#endif // GTK+ 1.2/1.0 } - GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, s.mb_str() ); - -#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 + if ( !mitem->IsSeparator() ) + { + gtk_signal_connect( GTK_OBJECT(menuItem), "select", + GTK_SIGNAL_FUNC(gtk_menu_hilight_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_signal_connect( GTK_OBJECT(menuItem), "deselect", - GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), - (gpointer)this ); +#if GTK_MINOR_VERSION == 0 + if (!appended) + { + gtk_menu_append( GTK_MENU(m_menu), menuItem ); + gtk_widget_show( menuItem ); + } +#endif // GTK+ 1.0 mitem->SetMenuItem(menuItem); - m_items.Append( mitem ); + return TRUE; } -void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr ) +bool wxMenu::DoAppend(wxMenuItem *mitem) { - 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() ); + return GtkAppend(mitem) && wxMenuBase::DoAppend(mitem); +} - GtkItemFactoryEntry entry; - entry.path = buf; - entry.callback = (GtkItemFactoryCallback) 0; - entry.callback_action = 0; - entry.item_type = ""; +bool wxMenu::DoInsert(size_t pos, wxMenuItem *item) +{ + if ( !wxMenuBase::DoInsert(pos, item) ) + return FALSE; - gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ +#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; - /* 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 ( m_style & wxMENU_TEAROFF ) { - if (*pc == _T('_')) pc++; /* skip it */ - s << *pc; + // change the position as the first item is the tear-off marker + pos++; } - GtkWidget *menuItem = gtk_item_factory_get_item( m_factory, s.mb_str() ); - -#else + GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget); + gpointer data = g_list_last(menu_shell->children)->data; + menu_shell->children = g_list_remove(menu_shell->children, data); + menu_shell->children = g_list_insert(menu_shell->children, data, pos); - GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str()); - - gtk_menu_append( GTK_MENU(m_menu), menuItem ); - gtk_widget_show( menuItem ); - -#endif + return TRUE; +#else // GTK < 1.2 + // this should be easy to do... + wxFAIL_MSG( wxT("not implemented") ); - 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 ); + return FALSE; +#endif // GTK 1.2/1.0 +} - gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu ); +wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) +{ + if ( !wxMenuBase::DoRemove(item) ) + return (wxMenuItem *)NULL; - mitem->SetMenuItem(menuItem); - mitem->SetSubMenu(subMenu); + // 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() ); - m_items.Append( mitem ); + return item; } -void wxMenu::Append( wxMenuItem *item ) +int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const { - m_items.Append( item ); - - GtkWidget *menuItem = (GtkWidget*) NULL; + wxNode *node = m_items.First(); + while (node) + { + wxMenuItem *item = (wxMenuItem*)node->Data(); + if (item->GetMenuItem() == menuItem) + return item->GetId(); + node = node->Next(); + } - 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()); + return wxNOT_FOUND; +} - if (!item->IsSeparator()) - { - gtk_signal_connect( GTK_OBJECT(menuItem), "select", - GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), - (gpointer*)this ); +// ---------------------------------------------------------------------------- +// helpers +// ---------------------------------------------------------------------------- - gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", - GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), - (gpointer*)this ); +#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL +static wxString GetHotKey( const wxMenuItem& item ) +{ + wxString hotkey; - if (!item->IsSubMenu()) + wxAcceleratorEntry *accel = item.GetAccel(); + if ( accel ) + { + 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 ) { - gtk_signal_connect( GTK_OBJECT(menuItem), "activate", - GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), - (gpointer*)this ); + 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; + + // GTK seems to use XStringToKeySym here + 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; + + // if there are any other keys wxGetAccelFromString() may return, + // we should process them here + + default: + if ( wxIsalnum(code) ) + { + hotkey << (wxChar)code; + + break; + } + + wxFAIL_MSG( wxT("unknown keyboard accel") ); } + + delete accel; } - gtk_menu_append( GTK_MENU(m_menu), menuItem ); - gtk_widget_show( menuItem ); - item->SetMenuItem(menuItem); + return hotkey; } +#endif // wxUSE_ACCEL -int wxMenu::FindItem( const wxString itemString ) const + +//----------------------------------------------------------------------------- +// substitute for missing GtkPixmapMenuItem +//----------------------------------------------------------------------------- + +/* + * 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 + +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; + +#define BORDER_SPACING 3 +#define PMAP_WIDTH 20 + +GtkType +gtk_pixmap_menu_item_get_type (void) { - wxString s = _T(""); - for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ ) - { - if (*pc == _T('&')) - { - pc++; /* skip it */ -#if (GTK_MINOR_VERSION > 0) - s << _T('_'); -#endif - } - s << *pc; - } + static GtkType pixmap_menu_item_type = 0; - wxNode *node = m_items.First(); - while (node) + if (!pixmap_menu_item_type) { - wxMenuItem *item = (wxMenuItem*)node->Data(); - if (item->GetText() == s) - { - return item->GetId(); - } - node = node->Next(); + GtkTypeInfo pixmap_menu_item_info = + { + "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); } - return wxNOT_FOUND; + return pixmap_menu_item_type; } -void wxMenu::Enable( int id, bool enable ) +/** + * 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) { - wxMenuItem *item = FindItem(id); - - wxCHECK_RET( item, _T("wxMenu::Enable: no such item") ); - - item->Enable(enable); + return GTK_WIDGET (gtk_type_new (gtk_pixmap_menu_item_get_type ())); } -bool wxMenu::IsEnabled( int id ) const +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; - wxCHECK_MSG( item, FALSE, _T("wxMenu::IsEnabled: no such item") ); + object_class = (GtkObjectClass*) klass; + widget_class = (GtkWidgetClass*) klass; + menu_item_class = (GtkMenuItemClass*) klass; + container_class = (GtkContainerClass*) klass; - return item->IsEnabled(); -} + parent_class = (GtkMenuItemClass*) gtk_type_class (gtk_menu_item_get_type ()); -void wxMenu::Check( int id, bool enable ) -{ - wxMenuItem *item = FindItem(id); + 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); - wxCHECK_MSG( item, _T(""), _T("wxMenu::GetLabel: no such item") ); + if (GTK_WIDGET_CLASS (parent_class)->expose_event) + (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event); - return item->GetText(); + if (GTK_WIDGET_DRAWABLE (widget) && + GTK_PIXMAP_MENU_ITEM(widget)->pixmap) { + gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL); + } + + return FALSE; } -void wxMenu::SetHelpString( int id, const wxString& helpString ) -{ - wxMenuItem *item = FindItem(id); +/** + * 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. + * + **/ - wxCHECK_RET( item, _T("wxMenu::SetHelpString: no such item") ); +void +gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item, + GtkWidget *pixmap) +{ + 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); + } - item->SetHelp( helpString ); + changed_have_pixmap_status(menu_item); + + 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; + + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget)); - wxCHECK_MSG( item, _T(""), _T("wxMenu::GetHelpString: no such item") ); + menu_item = GTK_PIXMAP_MENU_ITEM(widget); - return item->GetHelp(); + 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; - /* Not finding anything here can be correct - * when search the entire menu system for - * an entry -> no error message. */ + g_return_if_fail (container != NULL); + g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container)); + g_return_if_fail (callback != NULL); - return (wxMenuItem *) NULL; + menu_item = GTK_PIXMAP_MENU_ITEM (container); + + 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)); } +