X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae53c98c9f71acb0876846b9c5b1e56adfdb6186..e08ee38353a26f5305148257028d8ad0f1fa75cc:/src/gtk/menu.cpp diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index a267b1bab8..1d042b817d 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -12,10 +12,14 @@ #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" @@ -36,10 +40,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow) wxMenuBar::wxMenuBar( long style ) { /* the parent window is known after wxFrame::SetMenu() */ - m_needParent = FALSE; + m_needParent = FALSE; m_style = style; - - PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, style, "menu" ); + m_invokingWindow = (wxWindow*) NULL; + + if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) || + !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") )) + { + wxFAIL_MSG( wxT("wxMenuBar creation failed") ); + return; + } m_menus.DeleteContents( TRUE ); @@ -48,7 +58,7 @@ wxMenuBar::wxMenuBar( long style ) m_accel = gtk_accel_group_new(); m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "
", m_accel ); m_menubar = gtk_item_factory_get_widget( m_factory, "
" ); -#else +#else m_menubar = gtk_menu_bar_new(); #endif @@ -71,8 +81,14 @@ wxMenuBar::wxMenuBar() /* the parent window is known after wxFrame::SetMenu() */ m_needParent = FALSE; m_style = 0; - - PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" ); + m_invokingWindow = (wxWindow*) NULL; + + if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) || + !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("menubar") )) + { + wxFAIL_MSG( wxT("wxMenuBar creation failed") ); + return; + } m_menus.DeleteContents( TRUE ); @@ -81,7 +97,7 @@ wxMenuBar::wxMenuBar() m_accel = gtk_accel_group_new(); m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "
", m_accel ); m_menubar = gtk_item_factory_get_widget( m_factory, "
" ); -#else +#else m_menubar = gtk_menu_bar_new(); #endif @@ -92,7 +108,7 @@ wxMenuBar::wxMenuBar() wxMenuBar::~wxMenuBar() { - // how to destroy a GtkItemFactory ? +// gtk_object_unref( GTK_OBJECT(m_factory) ); why not ? } static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win ) @@ -101,7 +117,8 @@ 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->GetParent()->m_isFrame)) + top_frame = top_frame->GetParent(); /* support for native hot keys */ gtk_accel_group_detach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) ); @@ -123,8 +140,8 @@ static void wxMenubarSetInvokingWindow( 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->GetParent()->m_isFrame)) + top_frame = top_frame->GetParent(); /* support for native hot keys */ gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) ); @@ -142,10 +159,11 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) 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->GetParent()->m_isFrame)) + 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) ); @@ -162,10 +180,11 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win ) 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->GetParent()->m_isFrame)) + 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) ); @@ -180,62 +199,76 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win ) } } -void wxMenuBar::Append( wxMenu *menu, const wxString &title ) +bool wxMenuBar::Append( wxMenu *menu, const wxString &title ) { m_menus.Append( menu ); - + + const wxChar *pc; + /* GTK 1.2 wants to have "_" instead of "&" for accelerators */ wxString str; - for ( const wxChar *pc = title; *pc != _T('\0'); pc++ ) + for ( pc = title; *pc != wxT('\0'); pc++ ) { - if (*pc == _T('&')) - { + if (*pc == wxT('&')) + { #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) - str << _T('_'); - } else - if (*pc == _T('/')) - { - str << _T('\\'); + str << wxT('_'); + } + else if (*pc == wxT('/')) + { + str << wxT('\\'); #endif - } + } else - str << *pc; + { +#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; + } } /* this doesn't have much effect right now */ menu->SetTitle( str ); - + /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */ #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) /* local buffer in multibyte form */ - char buf[200]; - strcpy( buf, "/" ); - strcat( buf, str.mb_str() ); - + wxString buf; + buf << wxT('/') << str.c_str(); + + char *cbuf = new char[buf.Length()+1]; + strcpy(cbuf, buf.mbc_str()); + GtkItemFactoryEntry entry; - entry.path = buf; + entry.path = (gchar *)cbuf; // const_cast entry.accelerator = (gchar*) NULL; entry.callback = (GtkItemFactoryCallback) NULL; entry.callback_action = 0; - entry.item_type = (m_style & wxMB_TEAROFF || menu->GetStyle() & - wxMENU_TEAROFF) ? - "" : ""; - + entry.item_type = ""; + gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ - /* in order to get the pointer to the item we need the item text _without_ underscores */ - wxString tmp = _T("
/"); - for ( const wxChar *pc = str; *pc != _T('\0'); pc++ ) + wxString tmp = wxT("
/"); + for ( pc = str; *pc != wxT('\0'); pc++ ) { - if (*pc == _T('_')) pc++; /* skip it */ - tmp << *pc; + // contrary to the common sense, we must throw out _all_ underscores, + // (i.e. "Hello__World" => "HelloWorld" and not "Hello_World" as we + // might naively think). IMHO it's a bug in GTK+ (VZ) + while (*pc == wxT('_')) + pc++; + tmp << *pc; } - menu->m_owner = gtk_item_factory_get_item( m_factory, tmp.mb_str() ); - gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu ); - + delete [] cbuf; #else menu->m_owner = gtk_menu_item_new_with_label( str.mb_str() ); @@ -243,8 +276,45 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title ) gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu ); gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner ); - + #endif + + // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables + // 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; + + wxFAIL_MSG(wxT("TODO")); + + return FALSE; +} + +wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) +{ + if ( !wxMenuBarBase::Replace(pos, menu, title) ) + return FALSE; + + wxFAIL_MSG(wxT("TODO")); + + return NULL; +} + +wxMenu *wxMenuBar::Remove(size_t pos) +{ + if ( !wxMenuBarBase::Remove(pos) ) + return FALSE; + + wxFAIL_MSG(wxT("TODO")); + + return NULL; } static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString ) @@ -269,18 +339,6 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString 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(); @@ -313,7 +371,7 @@ static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id) return result; } -wxMenuItem* wxMenuBar::FindItem( int id ) const +wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const { wxMenuItem* result = 0; wxNode *node = m_menus.First(); @@ -324,115 +382,48 @@ wxMenuItem* wxMenuBar::FindItem( int id ) const node = node->Next(); } - return result; -} - -void wxMenuBar::Check( int id, bool check ) -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") ); - - item->Check(check); -} - -bool wxMenuBar::IsChecked( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked: no such item") ); - - return item->IsChecked(); -} - -void wxMenuBar::Enable( int id, bool enable ) -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") ); - - item->Enable(enable); -} - -bool wxMenuBar::IsEnabled( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled: no such item") ); - - return item->IsEnabled(); -} - -wxString wxMenuBar::GetLabel( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel: no such item") ); - - return item->GetText(); -} - -void wxMenuBar::SetLabel( int id, const wxString &label ) -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_RET( item, _T("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, _T("menu not found") ); + 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, _T("invalid"), _T("menu not found") ); + 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, _T("menu not found") ); + 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, _T("wxMenuBar::SetHelpString: no such item") ); - - item->SetHelp( helpString ); -} - -wxString wxMenuBar::GetHelpString( int id ) const -{ - wxMenuItem* item = FindMenuItemById( id ); - - wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString: no such item") ); - - return item->GetHelp(); -} - //----------------------------------------------------------------------------- // "activate" //----------------------------------------------------------------------------- @@ -450,19 +441,21 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) return; wxMenuItem* item = menu->FindItem( id ); - wxCHECK_RET( item, _T("error in menu item callback") ); + 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); } } @@ -502,15 +495,6 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id ); event.SetEventObject( menu ); -/* wxMSW doesn't call callback here either - - if (menu->m_callback) - { - (void) (*(menu->m_callback)) (*menu, event); - return; - } -*/ - if (menu->GetEventHandler()->ProcessEvent(event)) return; @@ -548,44 +532,74 @@ 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; + + // call it after initializing m_menuItem to NULL + DoSetText(text); +} + +wxMenuItem::~wxMenuItem() +{ + // don't delete menu items, the menus take care of that } // it's valid for this function to be called even if m_menuItem == NULL -void wxMenuItem::SetName( const wxString& str ) +void wxMenuItem::DoSetText( const wxString& str ) { /* '\t' is the deliminator indicating a hot key */ - m_text = _T(""); + m_text.Empty(); const wxChar *pc = str; - for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ ) + for (; (*pc != wxT('\0')) && (*pc != wxT('\t')); pc++ ) { - if (*pc == _T('&')) - { + if (*pc == wxT('&')) + { #if (GTK_MINOR_VERSION > 0) - m_text << _T('_'); - } else - if (*pc == _T('/')) /* we have to filter out slashes ... */ - { - m_text << _T('\\'); /* ... and replace them with back slashes */ + m_text << wxT('_'); + } + else if ( *pc == wxT('_') ) // escape underscores + { + m_text << wxT("__"); + } + else if (*pc == wxT('/')) /* we have to filter out slashes ... */ + { + m_text << wxT('\\'); /* ... and replace them with back slashes */ #endif } else m_text << *pc; } - + /* only GTK 1.2 knows about hot keys */ - m_hotKey = _T(""); + m_hotKey = wxT(""); #if (GTK_MINOR_VERSION > 0) - if(*pc == _T('\t')) + if(*pc == wxT('\t')) { pc++; m_hotKey = pc; @@ -601,33 +615,33 @@ void wxMenuItem::SetName( const wxString& str ) void wxMenuItem::Check( bool check ) { - wxCHECK_RET( m_menuItem, _T("invalid menu item") ); + wxCHECK_RET( m_menuItem, wxT("invalid menu item") ); - wxCHECK_RET( IsCheckable(), _T("Can't check uncheckable item!") ) + wxCHECK_RET( IsCheckable(), wxT("Can't check uncheckable item!") ) - if (check == m_isChecked) return; + if (check == m_isChecked) + return; - m_isChecked = check; + wxMenuItemBase::Check( check ); gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check ); } void wxMenuItem::Enable( bool enable ) { - wxCHECK_RET( m_menuItem, _T("invalid menu item") ); + wxCHECK_RET( m_menuItem, wxT("invalid menu item") ); gtk_widget_set_sensitive( m_menuItem, enable ); - m_isEnabled = enable; + wxMenuItemBase::Enable( enable ); } bool wxMenuItem::IsChecked() const { - wxCHECK_MSG( m_menuItem, FALSE, _T("invalid menu item") ); - - wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item! + wxCHECK_MSG( m_menuItem, FALSE, wxT("invalid menu item") ); - bool bIsChecked = ((GtkCheckMenuItem*)m_menuItem)->active != 0; + wxCHECK_MSG( IsCheckable(), FALSE, + wxT("can't get state of uncheckable item!") ); - return bIsChecked; + return ((GtkCheckMenuItem*)m_menuItem)->active != 0; } //----------------------------------------------------------------------------- @@ -636,49 +650,72 @@ bool wxMenuItem::IsChecked() const IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler) -wxMenu::wxMenu( const wxString& title, const wxFunction func, long style ) -{ - Init(title, func, style); -} - -wxMenu::wxMenu(long style) -{ - Init(wxEmptyString, (wxFunction) NULL, style); -} - void -wxMenu::Init( const wxString& title, const wxFunction func, long style ) +wxMenu::Init( const wxString& title, + long style, + const wxFunction func + ) { 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 ); m_menu = gtk_item_factory_get_widget( m_factory, "
" ); -#else +#else m_menu = gtk_menu_new(); // Do not show! #endif m_callback = func; + m_eventHandler = this; m_clientData = (void*) NULL; - if (m_title.IsNull()) m_title = _T(""); - if (m_title != _T("")) + 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) + /* Tearoffs are entries, just like separators. So if we want this + menu to be a tear-off one, we just append a tearoff entry + immediately. */ + if(m_style & wxMENU_TEAROFF) + { + GtkItemFactoryEntry entry; + entry.path = "/tearoff"; + 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 ? */ + //GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "
/tearoff" ); + } +#endif } wxMenu::~wxMenu() { - /* how do we delete an item-factory ? */ + wxNode *node = m_items.First(); + while (node) + { + wxMenuItem *item = (wxMenuItem*)node->Data(); + wxMenu *submenu = item->GetSubMenu(); + if (submenu) + delete submenu; + node = node->Next(); + } + + gtk_widget_destroy( m_menu ); + + gtk_object_unref( GTK_OBJECT(m_factory) ); } void wxMenu::SetTitle( const wxString& title ) @@ -694,8 +731,7 @@ const wxString wxMenu::GetTitle() const void wxMenu::AppendSeparator() { - wxMenuItem *mitem = new wxMenuItem(); - mitem->SetId(ID_SEPARATOR); + wxMenuItem *mitem = new wxMenuItem(this, wxID_SEPARATOR); #if (GTK_MINOR_VERSION > 0) GtkItemFactoryEntry entry; @@ -704,9 +740,9 @@ void wxMenu::AppendSeparator() 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 @@ -714,66 +750,87 @@ void wxMenu::AppendSeparator() gtk_menu_append( GTK_MENU(m_menu), menuItem ); gtk_widget_show( menuItem ); #endif - + mitem->SetMenuItem(menuItem); m_items.Append( mitem ); } -static char* GetHotKey( const wxString &hotkey, char *hotbuf ) +#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL +static wxString GetHotKey( const wxMenuItem& item ) { - if (hotkey.IsEmpty()) return (char*) NULL; - - switch (hotkey[0]) + 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 ) { - case _T('a'): /* Alt */ - case _T('A'): - case _T('m'): /* Meta */ - case _T('M'): - { - strcpy( hotbuf, "" ); - wxString last = hotkey.Right(1); - strcat( hotbuf, last.mb_str() ); - return hotbuf; - } - case _T('c'): /* Ctrl */ - case _T('C'): - case _T('s'): /* Strg, yeah man, I'm German */ - case _T('S'): - { - strcpy( hotbuf, "" ); - wxString last = hotkey.Right(1); - strcat( hotbuf, last.mb_str() ); - return hotbuf; + 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; } - case _T('F'): /* function keys */ - { - strcpy( hotbuf, hotkey.mb_str() ); - return hotbuf; - } - default: - { - } } - return (char*) NULL; + + return hotkey; } +#endif // wxUSE_ACCEL 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); - + wxMenuItem *mitem = new wxMenuItem(this, id, item, helpStr, checkable); + #if (GTK_MINOR_VERSION > 0) - /* text has "_" instead of "&" after mitem->SetText() */ + /* 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; @@ -782,34 +839,42 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool entry.item_type = ""; else entry.item_type = ""; - - char hotbuf[50]; - entry.accelerator = GetHotKey( mitem->GetHotKey(), hotbuf ); - + +#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 = NULL; +#endif + gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ - + /* in order to get the pointer to the item we need the item text _without_ underscores */ - wxString s = _T("
/"); - for ( const wxChar *pc = text; *pc != _T('\0'); pc++ ) + wxString s = wxT("
/"); + for ( const wxChar *pc = text; *pc != wxT('\0'); pc++ ) { - if (*pc == _T('_')) pc++; /* skip it */ + while (*pc == wxT('_')) pc++; /* skip it */ s << *pc; } - + 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", @@ -827,46 +892,43 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool 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); + wxMenuItem *mitem = new wxMenuItem(this, id, item, helpStr, FALSE, subMenu); #if (GTK_MINOR_VERSION > 0) - /* text has "_" instead of "&" after mitem->SetText() */ + /* 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 = (m_style & wxMENU_TEAROFF) ? "" : ""; - + entry.item_type = ""; + gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ - + /* in order to get the pointer to the item we need the item text _without_ underscores */ - wxString s = _T("
/"); - for ( const wxChar *pc = text; *pc != _T('\0'); pc++ ) + wxString s = wxT("
/"); + for ( const wxChar *pc = text; *pc != wxT('\0'); pc++ ) { - if (*pc == _T('_')) pc++; /* skip it */ + if (*pc == wxT('_')) pc++; /* skip it */ s << *pc; } - + 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 + +#endif gtk_signal_connect( GTK_OBJECT(menuItem), "select", GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), @@ -877,9 +939,8 @@ void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxStri (gpointer*)this ); gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu ); - + mitem->SetMenuItem(menuItem); - mitem->SetSubMenu(subMenu); m_items.Append( mitem ); } @@ -921,16 +982,32 @@ void wxMenu::Append( wxMenuItem *item ) 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 = _T(""); - for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ ) + wxString s = wxT(""); + for ( const wxChar *pc = itemString; *pc != wxT('\0'); pc++ ) { - if (*pc == _T('&')) - { - pc++; /* skip it */ + if (*pc == wxT('&')) + { + pc++; /* skip it */ #if (GTK_MINOR_VERSION > 0) - s << _T('_'); + s << wxT('_'); #endif } s << *pc; @@ -954,7 +1031,7 @@ void wxMenu::Enable( int id, bool enable ) { wxMenuItem *item = FindItem(id); - wxCHECK_RET( item, _T("wxMenu::Enable: no such item") ); + wxCHECK_RET( item, wxT("wxMenu::Enable: no such item") ); item->Enable(enable); } @@ -963,7 +1040,7 @@ bool wxMenu::IsEnabled( int id ) const { wxMenuItem *item = FindItem(id); - wxCHECK_MSG( item, FALSE, _T("wxMenu::IsEnabled: no such item") ); + wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsEnabled: no such item") ); return item->IsEnabled(); } @@ -972,7 +1049,7 @@ void wxMenu::Check( int id, bool enable ) { wxMenuItem *item = FindItem(id); - wxCHECK_RET( item, _T("wxMenu::Check: no such item") ); + wxCHECK_RET( item, wxT("wxMenu::Check: no such item") ); item->Check(enable); } @@ -981,7 +1058,7 @@ bool wxMenu::IsChecked( int id ) const { wxMenuItem *item = FindItem(id); - wxCHECK_MSG( item, FALSE, _T("wxMenu::IsChecked: no such item") ); + wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsChecked: no such item") ); return item->IsChecked(); } @@ -990,7 +1067,7 @@ void wxMenu::SetLabel( int id, const wxString &label ) { wxMenuItem *item = FindItem(id); - wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") ); + wxCHECK_RET( item, wxT("wxMenu::SetLabel: no such item") ); item->SetText(label); } @@ -999,7 +1076,7 @@ wxString wxMenu::GetLabel( int id ) const { wxMenuItem *item = FindItem(id); - wxCHECK_MSG( item, _T(""), _T("wxMenu::GetLabel: no such item") ); + wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetLabel: no such item") ); return item->GetText(); } @@ -1008,7 +1085,7 @@ void wxMenu::SetHelpString( int id, const wxString& helpString ) { wxMenuItem *item = FindItem(id); - wxCHECK_RET( item, _T("wxMenu::SetHelpString: no such item") ); + wxCHECK_RET( item, wxT("wxMenu::SetHelpString: no such item") ); item->SetHelp( helpString ); } @@ -1017,7 +1094,7 @@ wxString wxMenu::GetHelpString( int id ) const { wxMenuItem *item = FindItem(id); - wxCHECK_MSG( item, _T(""), _T("wxMenu::GetHelpString: no such item") ); + wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetHelpString: no such item") ); return item->GetHelp(); }