X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab46dc18ab5cee150a1cc7a52dae21a9bcae4043..e5d6aa2208e2cede142bd2cf703a75cbdff5df92:/src/gtk1/menu.cpp diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index b66fc7b9fb..8827eb6e8b 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -36,9 +36,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; + m_invokingWindow = (wxWindow*) NULL; - PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, style, "menu" ); + 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 ); @@ -47,7 +54,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 @@ -63,17 +70,22 @@ wxMenuBar::wxMenuBar( long style ) } PostCreation(); - - Show( TRUE ); } wxMenuBar::wxMenuBar() { /* the parent window is known after wxFrame::SetMenu() */ m_needParent = FALSE; + m_style = 0; + m_invokingWindow = (wxWindow*) NULL; - PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" ); - + 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 ); /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */ @@ -81,72 +93,177 @@ 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 m_widget = GTK_WIDGET(m_menubar); PostCreation(); - - Show( TRUE ); } wxMenuBar::~wxMenuBar() { - // how to destroy a GtkItemFactory ? +// gtk_object_unref( GTK_OBJECT(m_factory) ); why not ? +} + +static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win ) +{ + menu->SetInvokingWindow( (wxWindow*) NULL ); + +#if (GTK_MINOR_VERSION > 0) + wxWindow *top_frame = win; + while (top_frame->GetParent()) 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(); + while (node) + { + wxMenuItem *menuitem = (wxMenuItem*)node->Data(); + if (menuitem->IsSubMenu()) + wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win ); + node = node->Next(); + } +} + +static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) +{ + menu->SetInvokingWindow( win ); + +#if (GTK_MINOR_VERSION > 0) + wxWindow *top_frame = win; + while (top_frame->GetParent()) + 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(); + while (node) + { + wxMenuItem *menuitem = (wxMenuItem*)node->Data(); + if (menuitem->IsSubMenu()) + wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win ); + node = node->Next(); + } +} + +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(); + + /* 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(); + while (node) + { + wxMenu *menu = (wxMenu*)node->Data(); + wxMenubarSetInvokingWindow( menu, win ); + node = node->Next(); + } +} + +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(); + + /* 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(); + while (node) + { + wxMenu *menu = (wxMenu*)node->Data(); + wxMenubarUnsetInvokingWindow( menu, win ); + node = node->Next(); + } } void 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('_'); + 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 = ""; - + 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() ); @@ -154,8 +271,13 @@ 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 ); } static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString ) @@ -242,7 +364,7 @@ void wxMenuBar::Check( int id, bool check ) { wxMenuItem* item = FindMenuItemById( id ); - wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") ); + wxCHECK_RET( item, wxT("wxMenuBar::Check: no such item") ); item->Check(check); } @@ -251,7 +373,7 @@ bool wxMenuBar::IsChecked( int id ) const { wxMenuItem* item = FindMenuItemById( id ); - wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked: no such item") ); + wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsChecked: no such item") ); return item->IsChecked(); } @@ -260,7 +382,7 @@ void wxMenuBar::Enable( int id, bool enable ) { wxMenuItem* item = FindMenuItemById( id ); - wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") ); + wxCHECK_RET( item, wxT("wxMenuBar::Enable: no such item") ); item->Enable(enable); } @@ -269,7 +391,7 @@ bool wxMenuBar::IsEnabled( int id ) const { wxMenuItem* item = FindMenuItemById( id ); - wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled: no such item") ); + wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsEnabled: no such item") ); return item->IsEnabled(); } @@ -278,7 +400,7 @@ wxString wxMenuBar::GetLabel( int id ) const { wxMenuItem* item = FindMenuItemById( id ); - wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel: no such item") ); + wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetLabel: no such item") ); return item->GetText(); } @@ -287,7 +409,7 @@ void wxMenuBar::SetLabel( int id, const wxString &label ) { wxMenuItem* item = FindMenuItemById( id ); - wxCHECK_RET( item, _T("wxMenuBar::SetLabel: no such item") ); + wxCHECK_RET( item, wxT("wxMenuBar::SetLabel: no such item") ); item->SetText( label ); } @@ -296,7 +418,7 @@ void wxMenuBar::EnableTop( int pos, bool flag ) { wxNode *node = m_menus.Nth( pos ); - wxCHECK_RET( node, _T("menu not found") ); + wxCHECK_RET( node, wxT("menu not found") ); wxMenu* menu = (wxMenu*)node->Data(); @@ -308,7 +430,7 @@ wxString wxMenuBar::GetLabelTop( int pos ) const { wxNode *node = m_menus.Nth( pos ); - wxCHECK_MSG( node, _T("invalid"), _T("menu not found") ); + wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") ); wxMenu* menu = (wxMenu*)node->Data(); @@ -319,7 +441,7 @@ void wxMenuBar::SetLabelTop( int pos, const wxString& label ) { wxNode *node = m_menus.Nth( pos ); - wxCHECK_RET( node, _T("menu not found") ); + wxCHECK_RET( node, wxT("menu not found") ); wxMenu* menu = (wxMenu*)node->Data(); @@ -330,7 +452,7 @@ void wxMenuBar::SetHelpString( int id, const wxString& helpString ) { wxMenuItem* item = FindMenuItemById( id ); - wxCHECK_RET( item, _T("wxMenuBar::SetHelpString: no such item") ); + wxCHECK_RET( item, wxT("wxMenuBar::SetHelpString: no such item") ); item->SetHelp( helpString ); } @@ -339,7 +461,7 @@ wxString wxMenuBar::GetHelpString( int id ) const { wxMenuItem* item = FindMenuItemById( id ); - wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString: no such item") ); + wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetHelpString: no such item") ); return item->GetHelp(); } @@ -361,7 +483,7 @@ 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()) { @@ -413,15 +535,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; @@ -471,29 +584,45 @@ wxMenuItem::wxMenuItem() m_menuItem = (GtkWidget *) NULL; } +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 ) { /* '\t' is the deliminator indicating a hot key */ - m_text = _T(""); + m_text = wxT(""); const wxChar *pc = str; - for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ ) + for (; (*pc != wxT('\0')) && (*pc != wxT('\t')); pc++ ) { - if (*pc == _T('&')) - { + if (*pc == wxT('&')) + { #if (GTK_MINOR_VERSION > 0) - m_text << _T('_'); + m_text << wxT('_'); + } + else if ( *pc == 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 know about hot keys */ - m_hotKey = _T(""); + + /* only GTK 1.2 knows about hot keys */ + m_hotKey = wxT(""); #if (GTK_MINOR_VERSION > 0) - pc++; - m_hotKey = pc; + if(*pc == wxT('\t')) + { + pc++; + m_hotKey = pc; + } #endif if (m_menuItem) @@ -505,9 +634,9 @@ 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; @@ -517,7 +646,7 @@ void wxMenuItem::Check( bool 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; @@ -525,7 +654,7 @@ void wxMenuItem::Enable( bool enable ) bool wxMenuItem::IsChecked() const { - wxCHECK_MSG( m_menuItem, FALSE, _T("invalid menu item") ); + wxCHECK_MSG( m_menuItem, FALSE, wxT("invalid menu item") ); wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item! @@ -540,37 +669,72 @@ bool wxMenuItem::IsChecked() const IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler) -wxMenu::wxMenu( const wxString& title, const wxFunction func ) +void +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 ) @@ -589,14 +753,68 @@ void wxMenu::AppendSeparator() 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 ? */ + + /* 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) +static char* GetHotKey( const wxString &hotkey, char *hotbuf ) +{ + if (hotkey.IsEmpty()) return (char*) NULL; + + switch (hotkey[0]) + { + 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(); @@ -604,16 +822,16 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool mitem->SetText(item); mitem->SetHelp(helpStr); mitem->SetCheckable(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; @@ -622,67 +840,34 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool entry.item_type = ""; else entry.item_type = ""; - - entry.accelerator = (gchar*) NULL; + char hotbuf[50]; - wxString hotkey( mitem->GetHotKey() ); - if (!hotkey.IsEmpty()) - { - switch (hotkey[0]) - { - 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() ); - entry.accelerator = hotbuf; - break; - } - 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() ); - entry.accelerator = hotbuf; - break; - } - default: - { - } - } - } - + entry.accelerator = GetHotKey( mitem->GetHotKey(), hotbuf ); + gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ - + /* in order to get the pointer to the item we need the item text _without_ underscores */ - wxString s = _T("
/"); - for ( const wxChar *pc = text; *pc != _T('\0'); pc++ ) + wxString s = wxT("
/"); + for ( const wxChar *pc = text; *pc != wxT('\0'); pc++ ) { - if (*pc == _T('\t')) break; - 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", @@ -698,16 +883,48 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool m_items.Append( mitem ); } -void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxString &helpStr ) +void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr ) { wxMenuItem *mitem = new wxMenuItem(); mitem->SetId(id); - mitem->SetText(text); + mitem->SetText(item); mitem->SetHelp(helpStr); +#if (GTK_MINOR_VERSION > 0) + /* text has "_" instead of "&" after mitem->SetText() */ + wxString text( mitem->GetText() ); + + /* local buffer in multibyte form */ + char buf[200]; + strcpy( buf, "/" ); + strcat( buf, text.mb_str() ); + + 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++ ) + { + 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()); - mitem->SetMenuItem(menuItem); - mitem->SetSubMenu(subMenu); + + 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), @@ -718,8 +935,10 @@ void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxStri (gpointer*)this ); gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu ); - gtk_menu_append( GTK_MENU(m_menu), menuItem ); - gtk_widget_show( menuItem ); + + mitem->SetMenuItem(menuItem); + mitem->SetSubMenu(subMenu); + m_items.Append( mitem ); } @@ -760,16 +979,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; @@ -793,7 +1028,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); } @@ -802,7 +1037,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(); } @@ -811,7 +1046,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); } @@ -820,7 +1055,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(); } @@ -829,7 +1064,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); } @@ -838,7 +1073,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(); } @@ -847,7 +1082,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 ); } @@ -856,7 +1091,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(); }