X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/354aa1e366a57d896e2cf0943c687b24e8db688c..5d541a0366ec3611fd3cfac46e70b52f64652fac:/src/gtk/menu.cpp diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 69b01eda04..daff7c92be 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -21,8 +21,8 @@ #include "wx/accel.h" #endif // wxUSE_ACCEL -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // idle system @@ -31,6 +31,10 @@ extern void wxapp_install_idle_handler(); extern bool g_isIdle; +#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL +static wxString GetHotKey( const wxMenuItem& item ); +#endif + //----------------------------------------------------------------------------- // wxMenuBar //----------------------------------------------------------------------------- @@ -74,6 +78,8 @@ wxMenuBar::wxMenuBar( long style ) } PostCreation(); + + ApplyWidgetStyle(); } wxMenuBar::wxMenuBar() @@ -104,6 +110,8 @@ wxMenuBar::wxMenuBar() m_widget = GTK_WIDGET(m_menubar); PostCreation(); + + ApplyWidgetStyle(); } wxMenuBar::~wxMenuBar() @@ -117,20 +125,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(); } } @@ -140,20 +148,20 @@ static void wxMenubarSetInvokingWindow( 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_attach( 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()) wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win ); - node = node->Next(); + node = node->GetNext(); } } @@ -162,19 +170,19 @@ 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) ); #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(); } } @@ -183,26 +191,32 @@ 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 ); + if ( !wxMenuBarBase::Append( menu, title ) ) + return FALSE; + return GtkAppend(menu, title); +} + +bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) +{ const wxChar *pc; /* GTK 1.2 wants to have "_" instead of "&" for accelerators */ @@ -292,29 +306,66 @@ 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; + + 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; + return (wxMenu*) NULL; - 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")); - - return 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 ) @@ -326,14 +377,14 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString 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; @@ -341,31 +392,33 @@ 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 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; @@ -374,12 +427,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 ) @@ -431,7 +484,7 @@ 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(); - + int id = menu->FindMenuIdByMenuItem(widget); /* should find it for normal (not popup) menu */ @@ -440,7 +493,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) if (!menu->IsEnabled(id)) return; - wxMenuItem* item = menu->FindItem( id ); + wxMenuItem* item = menu->FindChildItem( id ); wxCHECK_RET( item, wxT("error in menu item callback") ); if (item->IsCheckable()) @@ -463,11 +516,13 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) event.SetEventObject( menu ); event.SetInt(id ); +#if wxUSE_MENU_CALLBACK if (menu->GetCallback()) { (void) (*(menu->GetCallback())) (*menu, event); return; } +#endif // wxUSE_MENU_CALLBACK if (menu->GetEventHandler()->ProcessEvent(event)) return; @@ -569,19 +624,42 @@ wxMenuItem::~wxMenuItem() // don't delete menu items, the menus take care of that } -void wxMenuItem::SetText( const wxString& str ) -{ - DoSetText(str); +// return the menu item text without any menu accels +/* static */ +wxString wxMenuItemBase::GetLabelFromText(const wxString& text) +{ + wxString label; +#if (GTK_MINOR_VERSION > 0) + for ( const wxChar *pc = text.c_str(); *pc; pc++ ) + { + if ( *pc == wxT('_') ) + { + // this is the escape character for GTK+ - skip it + continue; + } + + label += *pc; + } +#else // GTK+ 1.0 + label = text; +#endif // GTK+ 1.2/1.0 + + return label; +} + +void wxMenuItem::SetText( const wxString& str ) +{ + DoSetText(str); if (m_menuItem) { GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child ); - - /* set new text */ + + /* 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() ); + + /* reparse key accel */ + (void)gtk_label_parse_uline (GTK_LABEL(label), m_text.mb_str() ); gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) ); } } @@ -623,6 +701,25 @@ void wxMenuItem::DoSetText( const wxString& str ) #endif } +#if wxUSE_ACCEL + +wxAcceleratorEntry *wxMenuItem::GetAccel() const +{ + if ( !GetHotKey() ) + { + // 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, wxT("invalid menu item") ); @@ -656,14 +753,11 @@ 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("
/") ); - for ( const wxChar *pc = m_text; *pc != wxT('\0'); pc++ ) - { - while (*pc == wxT('_')) pc++; /* skip it */ - path << *pc; - } - + path += GetLabel(); + return path; } @@ -673,17 +767,8 @@ wxString wxMenuItem::GetFactoryPath() 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 ); @@ -692,18 +777,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 = wxT(""); - if (m_title != wxT("")) - { - Append(-2, m_title); - AppendSeparator(); - } - m_owner = (GtkWidget*) NULL; #if (GTK_MINOR_VERSION > 0) @@ -722,392 +795,182 @@ 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() { - wxNode *node = m_items.First(); - while (node) - { - wxMenuItem *item = (wxMenuItem*)node->Data(); - wxMenu *submenu = item->GetSubMenu(); - if (submenu) - delete submenu; - node = node->Next(); - } + m_items.Clear(); gtk_widget_destroy( m_menu ); gtk_object_unref( GTK_OBJECT(m_factory) ); } -void wxMenu::SetTitle( const wxString& title ) +bool wxMenu::GtkAppend(wxMenuItem *mitem) { - // TODO Waiting for something better - m_title = title; -} - -const wxString wxMenu::GetTitle() const -{ - return m_title; -} - -void wxMenu::AppendSeparator() -{ - wxMenuItem *mitem = new wxMenuItem(this, wxID_SEPARATOR); + GtkWidget *menuItem; + 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 ); -} - -#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL -static wxString GetHotKey( const wxMenuItem& item ) -{ - wxString hotkey; - - // as wxGetAccelFromString() looks for TAB, insert a dummy one here - wxString label; - label << wxT('\t') << item.GetHotKey(); - - // but if the hotkey is empty don't do anything - if ( label.length() > 1 ) + 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() ) { - wxAcceleratorEntry *accel = wxGetAccelFromString(label); - 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 ) - { - 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; - - // 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; - } +#if (GTK_MINOR_VERSION > 0) + /* text has "_" instead of "&" after mitem->SetText() */ + wxString text( mitem->GetText() ); + + /* local buffer in multibyte form */ + char buf[200]; + strcpy( buf, "/" ); + strcat( buf, text.mb_str() ); + + GtkItemFactoryEntry entry; + entry.path = buf; + entry.callback = (GtkItemFactoryCallback) 0; + entry.callback_action = 0; + entry.item_type = ""; + 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 ); } - - return hotkey; -} -#endif // wxUSE_ACCEL - -void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable ) -{ - wxMenuItem *mitem = new wxMenuItem(this, id, item, helpStr, checkable); - + else // a normal item + { #if (GTK_MINOR_VERSION > 0) - /* text has "_" instead of "&" after mitem->SetText() */ - wxString text( mitem->GetText() ); - - /* local buffer in multibyte form */ - char buf[200]; - strcpy( buf, "/" ); - strcat( buf, text.mb_str() ); - - GtkItemFactoryEntry entry; - entry.path = buf; - entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback; - entry.callback_action = 0; - if (checkable) - entry.item_type = ""; - else - entry.item_type = ""; + /* 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[32]; // must be big enough for F12 - strncpy(s_accel, GetHotKey(*mitem).mb_str(), WXSIZEOF(s_accel)); - entry.accelerator = s_accel; -#else - entry.accelerator = (char*) NULL; -#endif - - 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() ); - -#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 - - 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 ); - - mitem->SetMenuItem(menuItem); - - m_items.Append( mitem ); -} - -void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr ) -{ - wxMenuItem *mitem = new wxMenuItem(this, id, item, helpStr, FALSE, subMenu); - -#if (GTK_MINOR_VERSION > 0) - /* text has "_" instead of "&" after mitem->SetText() */ - wxString text( mitem->GetText() ); - - /* local buffer in multibyte form */ - char buf[200]; - strcpy( buf, "/" ); - strcat( buf, text.mb_str() ); - - GtkItemFactoryEntry entry; - entry.path = buf; - entry.callback = (GtkItemFactoryCallback) 0; - entry.callback_action = 0; - entry.item_type = ""; - - gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ - - wxString path( mitem->GetFactoryPath() ); - GtkWidget *menuItem = gtk_item_factory_get_item( m_factory, path.mb_str() ); - -#else - - 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 - - gtk_signal_connect( GTK_OBJECT(menuItem), "select", - GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), - (gpointer*)this ); - - gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", - GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), - (gpointer*)this ); - - gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu ); - - mitem->SetMenuItem(menuItem); - - m_items.Append( mitem ); -} - -void wxMenu::Append( wxMenuItem *item ) -{ - m_items.Append( item ); - - 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()); + // 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)); + 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 + } - if (!item->IsSeparator()) + if ( !mitem->IsSeparator() ) { gtk_signal_connect( GTK_OBJECT(menuItem), "select", GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), - (gpointer*)this ); + (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 ); - } + (gpointer)this ); } +#if GTK_MINOR_VERSION == 0 gtk_menu_append( GTK_MENU(m_menu), menuItem ); gtk_widget_show( menuItem ); - item->SetMenuItem(menuItem); -} - -void wxMenu::Delete( int id ) -{ - wxNode *node = m_items.First(); - while (node) - { - wxMenuItem *item = (wxMenuItem*)node->Data(); - if (item->GetId() == id) - { - /* 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.DeleteNode( node ); - return; - } - node = node->Next(); - } -} - -int wxMenu::FindItem( const wxString itemString ) const -{ - wxString s = wxT(""); - for ( const wxChar *pc = itemString; *pc != wxT('\0'); pc++ ) - { - if (*pc == wxT('&')) - { - pc++; /* skip it */ -#if (GTK_MINOR_VERSION > 0) - s << wxT('_'); -#endif - } - s << *pc; - } - - wxNode *node = m_items.First(); - while (node) - { - wxMenuItem *item = (wxMenuItem*)node->Data(); - if (item->GetText() == s) - { - return item->GetId(); - } - node = node->Next(); - } - - return wxNOT_FOUND; -} - -void wxMenu::Enable( int id, bool enable ) -{ - wxMenuItem *item = FindItem(id); - - wxCHECK_RET( item, wxT("wxMenu::Enable: no such item") ); - - item->Enable(enable); -} - -bool wxMenu::IsEnabled( int id ) const -{ - wxMenuItem *item = FindItem(id); - - wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsEnabled: no such item") ); - - return item->IsEnabled(); -} - -void wxMenu::Check( int id, bool enable ) -{ - wxMenuItem *item = FindItem(id); - - wxCHECK_RET( item, wxT("wxMenu::Check: no such item") ); - - item->Check(enable); -} - -bool wxMenu::IsChecked( int id ) const -{ - wxMenuItem *item = FindItem(id); +#endif // GTK+ 1.0 - wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsChecked: no such item") ); + mitem->SetMenuItem(menuItem); - return item->IsChecked(); + return TRUE; } -void wxMenu::SetLabel( int id, const wxString &label ) +bool wxMenu::DoAppend(wxMenuItem *mitem) { - wxMenuItem *item = FindItem(id); - - wxCHECK_RET( item, wxT("wxMenu::SetLabel: no such item") ); - - item->SetText(label); + return GtkAppend(mitem) && wxMenuBase::DoAppend(mitem); } -wxString wxMenu::GetLabel( int id ) const +bool wxMenu::DoInsert(size_t pos, wxMenuItem *item) { - wxMenuItem *item = FindItem(id); - - wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetLabel: no such item") ); + if ( !wxMenuBase::DoInsert(pos, item) ) + return FALSE; - return item->GetText(); -} +#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; -void wxMenu::SetHelpString( int id, const wxString& helpString ) -{ - wxMenuItem *item = FindItem(id); + 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); - wxCHECK_RET( item, wxT("wxMenu::SetHelpString: no such item") ); + return TRUE; +#else // GTK < 1.2 + // this should be easy to do... + wxFAIL_MSG( wxT("not implemented") ); - item->SetHelp( helpString ); + return FALSE; +#endif // GTK 1.2/1.0 } -wxString wxMenu::GetHelpString( int id ) const +wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { - wxMenuItem *item = FindItem(id); + if ( !wxMenuBase::DoRemove(item) ) + return (wxMenuItem *)NULL; - wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetHelpString: no such item") ); + // 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() ); - return item->GetHelp(); + return item; } int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const @@ -1124,72 +987,62 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const return wxNOT_FOUND; } -wxMenuItem *wxMenu::FindItem(int id) const +// ---------------------------------------------------------------------------- +// helpers +// ---------------------------------------------------------------------------- + +#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL +static wxString GetHotKey( const wxMenuItem& item ) { - wxNode *node = m_items.First(); - while (node) + wxString hotkey; + + wxAcceleratorEntry *accel = item.GetAccel(); + if ( accel ) { - wxMenuItem *item = (wxMenuItem*)node->Data(); - if (item->GetId() == id) + int flags = accel->GetFlags(); + if ( flags & wxACCEL_ALT ) + hotkey += wxT(""); + if ( flags & wxACCEL_CTRL ) + hotkey += wxT(""); + if ( flags & wxACCEL_SHIFT ) + hotkey += wxT(""); + + int code = accel->GetKeyCode(); + switch ( code ) { - return item; - } - node = node->Next(); - } + 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; - /* Not finding anything here can be correct - * when search the entire menu system for - * an entry -> no error message. */ + // if there are any other keys wxGetAccelFromString() may return, + // we should process them here - return (wxMenuItem *) NULL; -} + default: + if ( wxIsalnum(code) ) + { + hotkey << (wxChar)code; -void wxMenu::SetInvokingWindow( wxWindow *win ) -{ - m_invokingWindow = win; -} + break; + } -wxWindow *wxMenu::GetInvokingWindow() -{ - return m_invokingWindow; -} + wxFAIL_MSG( wxT("unknown keyboard accel") ); + } -// 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) -{ - 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 (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); + delete accel; } - node = node->Next(); - } + + return hotkey; } +#endif // wxUSE_ACCEL