static wxString GetHotKey( const wxMenuItem& item );
#endif
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+static wxString wxReplaceUnderscore( const wxString& title )
+{
+ const wxChar *pc;
+
+ /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
+ wxString str;
+ for ( pc = title; *pc != wxT('\0'); pc++ )
+ {
+ if (*pc == wxT('&'))
+ {
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+ str << wxT('_');
+ }
+ else if (*pc == wxT('/'))
+ {
+ str << wxT('\\');
+#endif
+ }
+ else
+ {
+#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;
+ }
+ }
+ return str;
+}
+
//-----------------------------------------------------------------------------
// wxMenuBar
//-----------------------------------------------------------------------------
}
PostCreation();
+
+ ApplyWidgetStyle();
}
wxMenuBar::wxMenuBar()
m_widget = GTK_WIDGET(m_menubar);
PostCreation();
+
+ ApplyWidgetStyle();
}
wxMenuBar::~wxMenuBar()
{
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->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
wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
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
wxMenuList::Node *node = m_menus.GetFirst();
bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title)
{
- const wxChar *pc;
-
- /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
- wxString str;
- for ( pc = title; *pc != wxT('\0'); pc++ )
- {
- if (*pc == wxT('&'))
- {
-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
- str << wxT('_');
- }
- else if (*pc == wxT('/'))
- {
- str << wxT('\\');
-#endif
- }
- else
- {
-#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;
- }
- }
+ wxString str( wxReplaceUnderscore( title ) );
/* this doesn't have much effect right now */
menu->SetTitle( str );
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++ )
{
// contrary to the common sense, we must throw out _all_ underscores,
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);
wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
{
- if ( !wxMenuBarBase::Replace(pos, menu, title) )
- return (wxMenu*) NULL;
-
// remove the old item and insert a new one
wxMenu *menuOld = Remove(pos);
if ( menuOld && !Insert(pos, menu, title) )
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 )
{
- if (menu->GetTitle() == menuString)
+ if (wxMenuItem::GetLabelFromText(menu->GetTitle()) == wxMenuItem::GetLabelFromText(menuString))
{
int res = menu->FindItem( itemString );
if (res != wxNOT_FOUND)
wxMenu* menu = node->GetData();
- return menu->GetTitle();
+ wxString label;
+ wxString text( menu->GetTitle() );
+#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 wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
wxMenu* menu = node->GetData();
- menu->SetTitle( label );
+ wxString str( wxReplaceUnderscore( label ) );
+
+ menu->SetTitle( str );
+
+ if (menu->m_owner)
+ {
+ GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
+
+ /* set new text */
+ gtk_label_set( label, str.mb_str());
+
+ /* reparse key accel */
+ (void)gtk_label_parse_uline (GTK_LABEL(label), str.mb_str() );
+ gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );
+ }
+
}
//-----------------------------------------------------------------------------
wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id );
event.SetEventObject( menu );
- event.SetInt(id );
+ if (item->IsCheckable())
+ event.SetInt( item->IsChecked() );
#if wxUSE_MENU_CALLBACK
if (menu->GetCallback())
}
// return the menu item text without any menu accels
-wxString wxMenuItem::GetLabel() const
+/* static */
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
{
wxString label;
#if (GTK_MINOR_VERSION > 0)
- for ( const wxChar *pc = m_text.c_str(); *pc; pc++ )
+ for ( const wxChar *pc = text.c_str(); *pc; pc++ )
{
- if ( *pc == wxT('_') )
+ if ( *pc == wxT('_') || *pc == wxT('&') )
{
- // this is the escape character for GTK+ - skip it
+ // '_' is the escape character for GTK+ and '&' is the one for
+ // wxWindows - skip both of them
continue;
}
label += *pc;
}
#else // GTK+ 1.0
- label = m_text;
+ label = text;
#endif // GTK+ 1.2/1.0
return label;
#endif // GTK 1.2/1.0
gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
+
+ // if adding a submenu to a menu already existing in the menu bar, we
+ // must set invoking window to allow processing events from this
+ // submenu
+ if ( m_invokingWindow )
+ wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
}
else // a normal item
{
// 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 <control><alt><shift>F12
- strncpy(s_accel, GetHotKey(*mitem).mb_str(), WXSIZEOF(s_accel));
+ static char s_accel[50]; // must be big enougg
+ wxString tmp( GetHotKey(*mitem) );
+ strncpy(s_accel, tmp.mb_str(), WXSIZEOF(s_accel));
entry.accelerator = s_accel;
#else // !wxUSE_ACCEL
entry.accelerator = (char*) NULL;
if ( !GtkAppend(item) )
return FALSE;
+ if ( m_style & wxMENU_TEAROFF )
+ {
+ // change the position as the first item is the tear-off marker
+ pos++;
+ }
+
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);
#else // GTK < 1.2
// this should be easy to do...
wxFAIL_MSG( wxT("not implemented") );
-#endif // GTK 1.2/1.0
return FALSE;
+#endif // GTK 1.2/1.0
}
wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
case WXK_F12:
hotkey << wxT('F') << code - WXK_F1 + 1;
break;
+
+ // GTK seems to use XStringToKeySym here
+ case WXK_NUMPAD_INSERT:
+ hotkey << wxT("KP_Insert" );
+ break;
+ case WXK_NUMPAD_DELETE:
+ hotkey << wxT("KP_Delete" );
+ break;
+ case WXK_INSERT:
+ hotkey << wxT("Insert" );
+ break;
+ case WXK_DELETE:
+ hotkey << wxT("Delete" );
+ break;
// if there are any other keys wxGetAccelFromString() may return,
// we should process them here
projects / wxWidgets.git / blobdiff