X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1b15f03b8e614c83541ca3487f847f61122b514..2035e10e83324c6925d12725b842768f6e2b00a2:/src/gtk/menu.cpp?ds=inline diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 8827eb6e8b..12185fcd39 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -12,13 +12,17 @@ #pragma implementation "menuitem.h" #endif -#include "wx/menu.h" #include "wx/log.h" #include "wx/intl.h" #include "wx/app.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 //----------------------------------------------------------------------------- // idle system @@ -27,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 //----------------------------------------------------------------------------- @@ -70,6 +78,8 @@ wxMenuBar::wxMenuBar( long style ) } PostCreation(); + + ApplyWidgetStyle(); } wxMenuBar::wxMenuBar() @@ -85,7 +95,7 @@ wxMenuBar::wxMenuBar() 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,6 +110,8 @@ wxMenuBar::wxMenuBar() m_widget = GTK_WIDGET(m_menubar); PostCreation(); + + ApplyWidgetStyle(); } wxMenuBar::~wxMenuBar() @@ -113,19 +125,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 +146,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 +172,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,26 +195,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 = 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 ); + 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 */ @@ -256,7 +279,7 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title ) { // 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) + // might naively think). IMHO it's a bug in GTK+ (VZ) while (*pc == wxT('_')) pc++; tmp << *pc; @@ -278,6 +301,80 @@ 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 ) @@ -289,183 +386,106 @@ 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; } -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, wxT("wxMenuBar::Check: no such item") ); - - item->Check(check); -} - -bool wxMenuBar::IsChecked( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsChecked: no such item") ); - - return item->IsChecked(); -} - -void wxMenuBar::Enable( int id, bool enable ) -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_RET( item, wxT("wxMenuBar::Enable: no such item") ); - - item->Enable(enable); -} - -bool wxMenuBar::IsEnabled( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsEnabled: no such item") ); - - return item->IsEnabled(); -} - -wxString wxMenuBar::GetLabel( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetLabel: no such item") ); - - return item->GetText(); -} - -void wxMenuBar::SetLabel( int id, const wxString &label ) -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_RET( item, wxT("wxMenuBar::SetLabel: no such item") ); + if ( menuForItem ) + { + *menuForItem = result ? result->GetMenu() : (wxMenu *)NULL; + } - item->SetText( label ); + return result; } -void wxMenuBar::EnableTop( int pos, bool flag ) +void wxMenuBar::EnableTop( size_t pos, bool flag ) { - wxNode *node = m_menus.Nth( pos ); + wxMenuList::Node *node = m_menus.Item( pos ); wxCHECK_RET( node, wxT("menu not found") ); - wxMenu* menu = (wxMenu*)node->Data(); + wxMenu* menu = node->GetData(); if (menu->m_owner) gtk_widget_set_sensitive( menu->m_owner, flag ); } -wxString wxMenuBar::GetLabelTop( int pos ) const +wxString wxMenuBar::GetLabelTop( size_t pos ) const { - wxNode *node = m_menus.Nth( pos ); + wxMenuList::Node *node = m_menus.Item( pos ); wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") ); - wxMenu* menu = (wxMenu*)node->Data(); + wxMenu* menu = node->GetData(); return menu->GetTitle(); } -void wxMenuBar::SetLabelTop( int pos, const wxString& label ) +void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) { - wxNode *node = m_menus.Nth( pos ); + wxMenuList::Node *node = m_menus.Item( pos ); wxCHECK_RET( node, wxT("menu not found") ); - wxMenu* menu = (wxMenu*)node->Data(); + wxMenu* menu = node->GetData(); menu->SetTitle( label ); } -void wxMenuBar::SetHelpString( int id, const wxString& helpString ) -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_RET( item, wxT("wxMenuBar::SetHelpString: no such item") ); - - item->SetHelp( helpString ); -} - -wxString wxMenuBar::GetHelpString( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetHelpString: no such item") ); - - return item->GetHelp(); -} - //----------------------------------------------------------------------------- // "activate" //----------------------------------------------------------------------------- @@ -482,20 +502,22 @@ 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()) { - 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); } } @@ -503,11 +525,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; @@ -572,16 +596,36 @@ 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_menuItem = (GtkWidget *) NULL; + + DoSetText(text); } wxMenuItem::~wxMenuItem() @@ -589,11 +633,52 @@ 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; +#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 wxMenuItem::SetText( const wxString& str ) +{ + DoSetText(str); + + if (m_menuItem) + { + GtkLabel *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 = wxT(""); + m_text.Empty(); const wxChar *pc = str; for (; (*pc != wxT('\0')) && (*pc != wxT('\t')); pc++ ) { @@ -612,7 +697,7 @@ void wxMenuItem::SetName( const wxString& str ) #endif } else - m_text << *pc; + m_text << *pc; } /* only GTK 1.2 knows about hot keys */ @@ -624,23 +709,37 @@ void wxMenuItem::SetName( const wxString& str ) 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, wxT("invalid menu 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 ); } @@ -649,18 +748,27 @@ void wxMenuItem::Enable( bool enable ) 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, wxT("invalid menu item") ); - wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item! + wxCHECK_MSG( IsCheckable(), FALSE, + wxT("can't get state of uncheckable item!") ); - bool bIsChecked = ((GtkCheckMenuItem*)m_menuItem)->active != 0; + return ((GtkCheckMenuItem*)m_menuItem)->active != 0; +} - return bIsChecked; +wxString wxMenuItem::GetFactoryPath() const +{ + /* in order to get the pointer to the item we need the item text _without_ + underscores */ + wxString path( wxT("
/") ); + path += GetLabel(); + + return path; } //----------------------------------------------------------------------------- @@ -669,17 +777,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 ); @@ -688,18 +787,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) @@ -718,382 +805,182 @@ wxMenu::Init( const wxString& title, //GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "
/tearoff" ); } #endif -} -wxMenu::~wxMenu() -{ - wxNode *node = m_items.First(); - while (node) + // append the title as the very first entry if we have it + if ( !!m_title ) { - wxMenuItem *item = (wxMenuItem*)node->Data(); - wxMenu *submenu = item->GetSubMenu(); - if (submenu) - delete submenu; - node = node->Next(); + Append(-2, m_title); + AppendSeparator(); } - - gtk_widget_destroy( m_menu ); - - gtk_object_unref( GTK_OBJECT(m_factory) ); } -void wxMenu::SetTitle( const wxString& title ) -{ - // TODO Waiting for something better - m_title = title; -} - -const wxString wxMenu::GetTitle() const -{ - return m_title; -} - -void wxMenu::AppendSeparator() +wxMenu::~wxMenu() { - wxMenuItem *mitem = new wxMenuItem(); - mitem->SetId(ID_SEPARATOR); - -#if (GTK_MINOR_VERSION > 0) - GtkItemFactoryEntry entry; - entry.path = "/sep"; - entry.callback = (GtkItemFactoryCallback) NULL; - entry.callback_action = 0; - entry.item_type = ""; - entry.accelerator = (gchar*) NULL; - - gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ + m_items.Clear(); - /* 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 + gtk_widget_destroy( m_menu ); - mitem->SetMenuItem(menuItem); - m_items.Append( mitem ); + gtk_object_unref( GTK_OBJECT(m_factory) ); } -#if (GTK_MINOR_VERSION > 0) -static char* GetHotKey( const wxString &hotkey, char *hotbuf ) +bool wxMenu::GtkAppend(wxMenuItem *mitem) { - if (hotkey.IsEmpty()) return (char*) NULL; + GtkWidget *menuItem; - switch (hotkey[0]) + if ( mitem->IsSeparator() ) { - case wxT('a'): /* Alt */ - case wxT('A'): - case wxT('m'): /* Meta */ - case wxT('M'): - { - strcpy( hotbuf, "" ); - wxString last = hotkey.Right(1); - strcat( hotbuf, last.mb_str() ); - return hotbuf; - } - case wxT('c'): /* Ctrl */ - case wxT('C'): - case wxT('s'): /* Strg, yeah man, I'm German */ - case wxT('S'): - { - strcpy( hotbuf, "" ); - wxString last = hotkey.Right(1); - strcat( hotbuf, last.mb_str() ); - return hotbuf; - } - case wxT('F'): /* function keys */ - { - strcpy( hotbuf, hotkey.mb_str() ); - return hotbuf; - } - default: - { - } - } - return (char*) NULL; -} -#endif - -void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable ) -{ - wxMenuItem *mitem = new wxMenuItem(); - mitem->SetId(id); - mitem->SetText(item); - mitem->SetHelp(helpStr); - mitem->SetCheckable(checkable); - #if (GTK_MINOR_VERSION > 0) - /* text has "_" instead of "&" after mitem->SetText() */ - wxString text( mitem->GetText() ); - - /* local buffer in multibyte form */ - char buf[200]; - strcpy( buf, "/" ); - strcat( buf, text.mb_str() ); - - GtkItemFactoryEntry entry; - entry.path = buf; - entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback; - entry.callback_action = 0; - if (checkable) - entry.item_type = ""; - else - entry.item_type = ""; - - char hotbuf[50]; - entry.accelerator = GetHotKey( mitem->GetHotKey(), hotbuf ); - - gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ - - /* in order to get the pointer to the item we need the item text _without_ underscores */ - wxString s = wxT("
/"); - for ( const wxChar *pc = text; *pc != wxT('\0'); pc++ ) - { - while (*pc == wxT('_')) pc++; /* skip it */ - s << *pc; + 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 } - - 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 - - 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(); - mitem->SetId(id); - mitem->SetText(item); - mitem->SetHelp(helpStr); - + else if ( mitem->IsSubMenu() ) + { #if (GTK_MINOR_VERSION > 0) - /* text has "_" instead of "&" after mitem->SetText() */ - wxString text( mitem->GetText() ); - - /* local buffer in multibyte form */ - char buf[200]; - strcpy( buf, "/" ); - strcat( buf, text.mb_str() ); - - GtkItemFactoryEntry entry; - entry.path = buf; - entry.callback = (GtkItemFactoryCallback) 0; - entry.callback_action = 0; - entry.item_type = ""; - - gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ - - /* in order to get the pointer to the item we need the item text _without_ underscores */ - wxString s = wxT("
/"); - for ( const wxChar *pc = text; *pc != wxT('\0'); pc++ ) + /* 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 ); + } + else // a normal item { - if (*pc == wxT('_')) 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[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 } - GtkWidget *menuItem = gtk_item_factory_get_item( m_factory, s.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); - mitem->SetSubMenu(subMenu); - - 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()); - - 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) - { - 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(); - } +#endif // GTK+ 1.0 - 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); - - 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") ); - - return item->GetText(); + if ( !wxMenuBase::DoInsert(pos, item) ) + return FALSE; + +#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; + + 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 } -void wxMenu::SetHelpString( int id, const wxString& helpString ) +wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { - wxMenuItem *item = FindItem(id); + if ( !wxMenuBase::DoRemove(item) ) + return (wxMenuItem *)NULL; - wxCHECK_RET( item, wxT("wxMenu::SetHelpString: 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() ); - item->SetHelp( helpString ); -} - -wxString wxMenu::GetHelpString( int id ) const -{ - wxMenuItem *item = FindItem(id); - - wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetHelpString: no such item") ); - - return item->GetHelp(); + return item; } int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const @@ -1110,72 +997,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; + 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") ); } - node = node->Next(); - } - - /* Not finding anything here can be correct - * when search the entire menu system for - * an entry -> no error message. */ - - return (wxMenuItem *) NULL; -} -void wxMenu::SetInvokingWindow( wxWindow *win ) -{ - m_invokingWindow = win; -} - -wxWindow *wxMenu::GetInvokingWindow() -{ - return m_invokingWindow; -} - -// 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