#endif
else
{
-#if __WXGTK12__
+#ifdef __WXGTK12__
if ( *pc == wxT('_') )
{
// underscores must be doubled to prevent them from being
while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
- /* support for native key accelerators indicated by underscroes */
+ // support for native key accelerators indicated by underscroes
gtk_accel_group_detach( m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) );
#endif // GTK+ 1.2.1+
{
wxString str( wxReplaceUnderscore( title ) );
- /* this doesn't have much effect right now */
+ // 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. */
+ // GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has.
#if GTK_CHECK_VERSION(1, 2, 1)
wxString buf;
buf << wxT('/') << str.c_str();
- /* local buffer in multibyte form */
+ // local buffer in multibyte form
char cbuf[400];
strcpy(cbuf, wxGTK_CONV(buf) );
entry.callback_action = 0;
entry.item_type = (char *)"<Branch>";
- 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 */
+ gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); // what is 2 ?
+ // in order to get the pointer to the item we need the item text _without_ underscores
wxString tmp = wxT("<main>/");
const wxChar *pc;
for ( pc = str; *pc != wxT('\0'); pc++ )
// see (and refactor :) similar code in Remove
// below.
- wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
+ wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
if( frame )
frame->UpdateMenuBarSize();
return menuOld;
}
+static wxMenu *CopyMenu (wxMenu *menu)
+{
+ wxMenu *menucopy = new wxMenu ();
+ wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
+ while (node)
+ {
+ wxMenuItem *item = node->GetData();
+ int itemid = item->GetId();
+ wxString text = item->GetText();
+ text.Replace(wxT("_"), wxT("&"));
+ wxMenu *submenu = item->GetSubMenu();
+ if (!submenu)
+ {
+ wxMenuItem* itemcopy = new wxMenuItem(menucopy,
+ itemid, text,
+ menu->GetHelpString(itemid));
+ itemcopy->SetBitmap(item->GetBitmap());
+ itemcopy->SetCheckable(item->IsCheckable());
+ menucopy->Append(itemcopy);
+ }
+ else
+ menucopy->Append (itemid, text, CopyMenu(submenu),
+ menu->GetHelpString(itemid));
+
+ node = node->GetNext();
+ }
+
+ return menucopy;
+}
+
wxMenu *wxMenuBar::Remove(size_t pos)
{
wxMenu *menu = wxMenuBarBase::Remove(pos);
printf( "menu shell entries before %d\n", (int)g_list_length( menu_shell->children ) );
*/
+ wxMenu *menucopy = CopyMenu( menu );
+
// 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 );
+ delete menu;
+ menu = menucopy;
/*
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 ) );
{
// OPTIMISE ME: see comment in GtkAppend
- wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
+ wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
- if( frame )
+ if( frame )
frame->UpdateMenuBarSize();
}
continue;
}
+ // don't remove ampersands '&' since if we have them in the menu title
+ // it means that they were doubled to indicate "&" instead of accelerator
+
label += *pc;
}
for ( const wxChar *pc = text.c_str(); *pc; pc++ )
{
- if ( *pc == wxT('_') )
+ if ( *pc == wxT('_') )
{
// GTK 1.2 escapes "xxx_xxx" to "xxx__xxx"
pc++;
}
#endif
+ if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) )
+ {
+ // wxMSW escapes "&"
+ // "&" is doubled to indicate "&" instead of accelerator
+ continue;
+ }
+
label += *pc;
}
+
+ // wxPrintf( L"text %s label %s\n", text.c_str(), label.c_str() );
return label;
}
else if ( *pc == wxT('_') ) // escape underscores
{
// m_text << wxT("__"); doesn't work
+ m_text << wxT("__");
}
else if (*pc == wxT('/')) // we have to escape slashes
{
++pc;
}
+ // wxPrintf( L"str %s m_text %s\n", str.c_str(), m_text.c_str() );
+
m_hotKey = wxT("");
if(*pc == wxT('\t'))
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 in GTK 1.2
wxString path( wxT("<main>/") );
for ( const wxChar *pc = m_text.c_str(); *pc; pc++ )
{
if ( *pc == wxT('_') )
{
+#ifdef __WXGTK20__
+ pc++;
+#else
// remove '_' unconditionally
continue;
+#endif
}
+ // don't remove ampersands '&' since if we have them in the menu item title
+ // it means that they were doubled to indicate "&" instead of accelerator
+
path += *pc;
}
m_owner = (GtkWidget*) NULL;
- /* 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. */
+ // 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.callback_action = 0;
entry.item_type = (char *)"<Tearoff>";
entry.accelerator = (gchar*) NULL;
- gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
+ gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); // what is 2 ?
//GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/tearoff" );
}
entry.item_type = (char *)"<Separator>";
entry.accelerator = (gchar*) NULL;
- gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
+ 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? */
+ // this will be wrong for more than one separator. do we care?
menuItem = gtk_item_factory_get_widget( m_factory, "<main>/sep" );
// we might have a separator inside a radio group
}
else if ( mitem->IsSubMenu() )
{
- /* text has "_" instead of "&" after mitem->SetText() */
+ // text has "_" instead of "&" after mitem->SetText()
wxString text( mitem->GetText() );
- /* local buffer in multibyte form */
+ // local buffer in multibyte form
char buf[200];
strcpy( buf, "/" );
strcat( buf, wxGTK_CONV( text ) );
entry.item_type = (char *)"<Branch>";
entry.accelerator = (gchar*) NULL;
- gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
+ 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, wxGTK_CONV( path ) );
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
menu_shell->children = g_list_insert(menu_shell->children, data, pos);
return TRUE;
-#else // GTK < 1.2
- // this should be easy to do...
- wxFAIL_MSG( wxT("not implemented") );
-
- return FALSE;
-#endif // GTK 1.2/1.0
}
wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
{
- wxNode *node = m_items.First();
+ wxMenuItemList::Node *node = m_items.GetFirst();
while (node)
{
- wxMenuItem *item = (wxMenuItem*)node->Data();
+ wxMenuItem *item = node->GetData();
if (item->GetMenuItem() == menuItem)
return item->GetId();
- node = node->Next();
+ node = node->GetNext();
}
return wxNOT_FOUND;
projects / wxWidgets.git / blobdiff