X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/717a57c2fabb054c8f00dc5dae70df1d03cfe532..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/gtk1/menu.cpp diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index b1906645a9..d3aee69d38 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -15,14 +15,16 @@ #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 +#include +#include //----------------------------------------------------------------------------- // idle system @@ -35,6 +37,85 @@ extern bool g_isIdle; 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 //----------------------------------------------------------------------------- @@ -78,6 +159,8 @@ wxMenuBar::wxMenuBar( long style ) } PostCreation(); + + ApplyWidgetStyle(); } wxMenuBar::wxMenuBar() @@ -108,6 +191,8 @@ wxMenuBar::wxMenuBar() m_widget = GTK_WIDGET(m_menubar); PostCreation(); + + ApplyWidgetStyle(); } wxMenuBar::~wxMenuBar() @@ -121,20 +206,20 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win ) #if (GTK_MINOR_VERSION > 0) wxWindow *top_frame = win; - while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame)) + 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(); } } @@ -142,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->GetParent()->m_isFrame)) + 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(); } } @@ -166,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->GetParent()->m_isFrame)) + 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(); } } @@ -187,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->GetParent()->m_isFrame)) + 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(); } } 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 != 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 + 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 ); @@ -256,11 +322,12 @@ bool wxMenuBar::Append( wxMenu *menu, const wxString &title ) entry.accelerator = (gchar*) NULL; entry.callback = (GtkItemFactoryCallback) NULL; entry.callback_action = 0; - entry.item_type = ""; + entry.item_type = (char *)""; gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ /* in order to get the pointer to the item we need the item text _without_ underscores */ wxString tmp = wxT("
/"); + const wxChar *pc; for ( pc = str; *pc != wxT('\0'); pc++ ) { // contrary to the common sense, we must throw out _all_ underscores, @@ -296,48 +363,90 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) if ( !wxMenuBarBase::Insert(pos, menu, title) ) return FALSE; - wxFAIL_MSG(wxT("TODO")); +#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) { - if ( !wxMenuBarBase::Replace(pos, menu, title) ) - return FALSE; - - wxFAIL_MSG(wxT("TODO")); + // remove the old item and insert a new one + wxMenu *menuOld = Remove(pos); + if ( menuOld && !Insert(pos, menu, title) ) + { + return (wxMenu*) NULL; + } - return NULL; + // either Insert() succeeded or Remove() failed and menuOld is NULL + return menuOld; } wxMenu *wxMenuBar::Remove(size_t pos) { - if ( !wxMenuBarBase::Remove(pos) ) - return FALSE; + wxMenu *menu = wxMenuBarBase::Remove(pos); + if ( !menu ) + return (wxMenu*) NULL; - wxFAIL_MSG(wxT("TODO")); +/* + GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget); - return NULL; + 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; @@ -345,15 +454,17 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString 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 @@ -361,15 +472,15 @@ static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int 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; @@ -378,12 +489,12 @@ static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id) 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(); } if ( menuForItem ) @@ -414,7 +525,25 @@ wxString wxMenuBar::GetLabelTop( size_t pos ) const wxMenu* menu = node->GetData(); - return menu->GetTitle(); + 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; + } + + label += *pc; + } +#else // GTK+ 1.0 + label = text; +#endif // GTK+ 1.2/1.0 + + return label; } void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) @@ -425,7 +554,22 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) wxMenu* menu = node->GetData(); - menu->SetTitle( label ); + wxString str( wxReplaceUnderscore( label ) ); + + menu->SetTitle( str ); + + if (menu->m_owner) + { + GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child ); + + /* set new text */ + gtk_label_set( label, str.mb_str()); + + /* reparse key accel */ + (void)gtk_label_parse_uline (GTK_LABEL(label), str.mb_str() ); + gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) ); + } + } //----------------------------------------------------------------------------- @@ -434,12 +578,14 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) 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; @@ -463,22 +609,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) } } - 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); } //----------------------------------------------------------------------------- @@ -536,7 +667,7 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) // wxMenuItem //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase) +IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu, int id, @@ -563,6 +694,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu, m_parentMenu = parentMenu; m_help = help; + m_labelWidget = (GtkWidget *) NULL; m_menuItem = (GtkWidget *) NULL; DoSetText(text); @@ -574,23 +706,29 @@ wxMenuItem::~wxMenuItem() } // return the menu item text without any menu accels -wxString wxMenuItem::GetLabel() const +/* static */ +wxString wxMenuItemBase::GetLabelFromText(const wxString& text) { wxString label; -#if (GTK_MINOR_VERSION > 0) - for ( const wxChar *pc = m_text.c_str(); *pc; pc++ ) + + for ( const wxChar *pc = text.c_str(); *pc; pc++ ) { - if ( *pc == wxT('_') ) + if ( *pc == wxT('_') ) { - // this is the escape character for GTK+ - skip it + // wxGTK escapes "xxx_xxx" to "xxx__xxx" + pc++; + label += *pc; + continue; + } + + if ( *pc == wxT('&') ) + { + // wxMSW escapes & continue; } label += *pc; } -#else // GTK+ 1.0 - label = m_text; -#endif // GTK+ 1.2/1.0 return label; } @@ -601,13 +739,17 @@ void wxMenuItem::SetText( const wxString& str ) if (m_menuItem) { - GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child ); + 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 */ - guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), m_text.mb_str() ); + (void)gtk_label_parse_uline (GTK_LABEL(label), m_text.mb_str() ); gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) ); } } @@ -653,7 +795,7 @@ void wxMenuItem::DoSetText( const wxString& str ) wxAcceleratorEntry *wxMenuItem::GetAccel() const { - if ( !item.GetHotKey() ) + if ( !GetHotKey() ) { // nothing return (wxAcceleratorEntry *)NULL; @@ -661,7 +803,7 @@ wxAcceleratorEntry *wxMenuItem::GetAccel() const // as wxGetAccelFromString() looks for TAB, insert a dummy one here wxString label; - label << wxT('\t') << item.GetHotKey(); + label << wxT('\t') << GetHotKey(); return wxGetAccelFromString(label); } @@ -701,10 +843,21 @@ bool wxMenuItem::IsChecked() const wxString wxMenuItem::GetFactoryPath() const { - /* in order to get the pointer to the item we need the item text _without_ underscores */ + /* in order to get the pointer to the item we need the item text + _without_ underscores */ wxString path( wxT("
/") ); - path += GetLabel(); + for ( const wxChar *pc = m_text.c_str(); *pc; pc++ ) + { + if ( *pc == wxT('_') || *pc == wxT('&') ) + { + // remove '_' and '&' unconditionally + continue; + } + + path += *pc; + } + return path; } @@ -733,10 +886,10 @@ void wxMenu::Init() if(m_style & wxMENU_TEAROFF) { GtkItemFactoryEntry entry; - entry.path = "/tearoff"; + entry.path = (char *)"/tearoff"; entry.callback = (GtkItemFactoryCallback) NULL; entry.callback_action = 0; - entry.item_type = ""; + entry.item_type = (char *)""; entry.accelerator = (gchar*) NULL; gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ //GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "
/tearoff" ); @@ -753,25 +906,27 @@ void wxMenu::Init() wxMenu::~wxMenu() { + m_items.Clear(); + gtk_widget_destroy( m_menu ); gtk_object_unref( GTK_OBJECT(m_factory) ); - - // the menu items are deleted by the base class dtor } -virtual bool wxMenu::DoAppend(wxMenuItem *mitem) +bool wxMenu::GtkAppend(wxMenuItem *mitem) { GtkWidget *menuItem; + bool appended = FALSE; + if ( mitem->IsSeparator() ) { #if (GTK_MINOR_VERSION > 0) GtkItemFactoryEntry entry; - entry.path = "/sep"; + entry.path = (char *)"/sep"; entry.callback = (GtkItemFactoryCallback) NULL; entry.callback_action = 0; - entry.item_type = ""; + entry.item_type = (char *)""; entry.accelerator = (gchar*) NULL; gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ @@ -797,17 +952,59 @@ virtual bool wxMenu::DoAppend(wxMenuItem *mitem) entry.path = buf; entry.callback = (GtkItemFactoryCallback) 0; entry.callback_action = 0; - entry.item_type = ""; + entry.item_type = (char *)""; + entry.accelerator = (gchar*) NULL; gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ wxString path( mitem->GetFactoryPath() ); - GtkWidget *menuItem = gtk_item_factory_get_item( m_factory, path.mb_str() ); + menuItem = gtk_item_factory_get_item( m_factory, path.mb_str() ); #else // GTK+ 1.0 - GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str()); + 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), subMenu->m_menu ); + 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 + { + 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); + } + gtk_widget_show (label); + + mitem->SetLabelWidget(label); + + 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); + + gtk_signal_connect( GTK_OBJECT(menuItem), "activate", + GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), + (gpointer)this ); + gtk_menu_append( GTK_MENU(m_menu), menuItem ); + gtk_widget_show( menuItem ); + + appended = TRUE; // We've done this, don't do it again } else // a normal item { @@ -824,17 +1021,19 @@ virtual bool wxMenu::DoAppend(wxMenuItem *mitem) entry.path = buf; entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback; entry.callback_action = 0; - if (checkable) - entry.item_type = ""; + if ( mitem->IsCheckable() ) + entry.item_type = (char *)""; else - entry.item_type = ""; + entry.item_type = (char *)""; + 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[32]; // must be big enough for F12 - strncpy(s_accel, GetHotKey(*mitem).mb_str(), WXSIZEOF(s_accel)); + 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; @@ -843,10 +1042,10 @@ virtual bool wxMenu::DoAppend(wxMenuItem *mitem) gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ wxString path( mitem->GetFactoryPath() ); - GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, path.mb_str() ); + menuItem = gtk_item_factory_get_widget( m_factory, path.mb_str() ); #else // GTK+ 1.0 - GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label( mitem->GetText().mb_str() ) - : gtk_menu_item_new_with_label( mitem->GetText().mb_str() ); + 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), @@ -866,64 +1065,53 @@ virtual bool wxMenu::DoAppend(wxMenuItem *mitem) } #if GTK_MINOR_VERSION == 0 - gtk_menu_append( GTK_MENU(m_menu), menuItem ); - gtk_widget_show( menuItem ); + if (!appended) + { + gtk_menu_append( GTK_MENU(m_menu), menuItem ); + gtk_widget_show( menuItem ); + } #endif // GTK+ 1.0 mitem->SetMenuItem(menuItem); - return wxMenuBase::DoAppend(mitem); + return TRUE; } -// VZ: this seems to be GTK+ 1.0 only code, I don't understand why there were -// both specialized versions of Append() and this one before my changes, -// but it seems that the others are better... -#if 0 -void wxMenu::Append( wxMenuItem *item ) +bool wxMenu::DoAppend(wxMenuItem *mitem) { - GtkWidget *menuItem = (GtkWidget*) 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()); - - if (!item->IsSeparator()) - { - 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 ); - - if (!item->IsSubMenu()) - { - 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 ); - - item->SetMenuItem(menuItem); + return GtkAppend(mitem) && wxMenuBase::DoAppend(mitem); } -#endif // 0 bool wxMenu::DoInsert(size_t pos, wxMenuItem *item) { if ( !wxMenuBase::DoInsert(pos, item) ) return FALSE; - wxFAIL_MSG(wxT("not implemented")); +#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; + + if ( m_style & wxMENU_TEAROFF ) + { + // change the position as the first item is the tear-off marker + pos++; + } + + 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... + wxFAIL_MSG( wxT("not implemented") ); return FALSE; +#endif // GTK 1.2/1.0 } wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) @@ -957,6 +1145,7 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const // ---------------------------------------------------------------------------- #if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL + static wxString GetHotKey( const wxMenuItem& item ) { wxString hotkey; @@ -989,16 +1178,35 @@ static wxString GetHotKey( const wxMenuItem& item ) 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; - // if there are any other keys wxGetAccelFromString() may return, - // we should process them here + // if there are any other keys wxGetAccelFromString() may + // return, we should process them here default: - if ( wxIsalnum(code) ) + if ( code < 127 ) { - hotkey << (wxChar)code; - - break; + gchar *name = gdk_keyval_name((guint)code); + if ( name ) + { + hotkey << name; + break; + } } wxFAIL_MSG( wxT("unknown keyboard accel") ); @@ -1009,5 +1217,382 @@ static wxString GetHotKey( const wxMenuItem& item ) return hotkey; } + #endif // wxUSE_ACCEL + +//----------------------------------------------------------------------------- +// 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 + +extern "C" +{ + +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) +{ + 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); + } + + return pixmap_menu_item_type; +} + +/** + * 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 ())); +} + +static void +gtk_pixmap_menu_item_class_init (GtkPixmapMenuItemClass *klass) +{ + 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; + + container_class->forall = gtk_pixmap_menu_item_forall; + container_class->remove = gtk_pixmap_menu_item_remove; + + klass->orig_toggle_size = menu_item_class->toggle_size; + klass->have_pixmap_count = 0; +} + +static void +gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item) +{ + GtkMenuItem *mi; + + mi = GTK_MENU_ITEM (menu_item); + + menu_item->pixmap = NULL; +} + +static void +gtk_pixmap_menu_item_draw (GtkWidget *widget, + GdkRectangle *area) +{ + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget)); + g_return_if_fail (area != NULL); + + if (GTK_WIDGET_CLASS (parent_class)->draw) + (* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area); + + if (GTK_WIDGET_DRAWABLE (widget) && + GTK_PIXMAP_MENU_ITEM(widget)->pixmap) { + gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL); + } +} + +static gint +gtk_pixmap_menu_item_expose (GtkWidget *widget, + GdkEventExpose *event) +{ + 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); + + 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; +} + +/** + * 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) +{ + 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); + } + + changed_have_pixmap_status(menu_item); + + if (GTK_WIDGET_VISIBLE (pixmap) && GTK_WIDGET_VISIBLE (menu_item)) + gtk_widget_queue_resize (pixmap); +} + +static void +gtk_pixmap_menu_item_map (GtkWidget *widget) +{ + GtkPixmapMenuItem *menu_item; + + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget)); + + 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); +} + +static void +gtk_pixmap_menu_item_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + GtkPixmapMenuItem *pmenu_item; + + pmenu_item = GTK_PIXMAP_MENU_ITEM(widget); + + if (pmenu_item->pixmap && GTK_WIDGET_VISIBLE(pmenu_item)) + { + 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); + } + + if (GTK_WIDGET_CLASS (parent_class)->size_allocate) + GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation); +} + +static void +gtk_pixmap_menu_item_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, + gpointer callback_data) +{ + 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); + + 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); +} + +static void +gtk_pixmap_menu_item_size_request (GtkWidget *widget, + GtkRequisition *requisition) +{ + 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); +} + +static void +gtk_pixmap_menu_item_remove (GtkContainer *container, + GtkWidget *child) +{ + 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)); +} + + +/* important to only call this if there was actually a _change_ in pixmap == NULL */ +static void +changed_have_pixmap_status (GtkPixmapMenuItem *menu_item) +{ + if (menu_item->pixmap != NULL) { + GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count += 1; + + 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; + } + } + + /* 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)); +} + +