#include "wx/accel.h"
#include "wx/stockitem.h"
#include "wx/gtk/private.h"
+#include "wx/gtk/private/mnemonics.h"
// FIXME: is this right? somehow I don't think so (VZ)
// we use normal item but with a special id for the menu title
static const int wxGTK_TITLE_ID = -3;
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+// forward declare it as it's used by wxMenuBar too when using Hildon
+extern "C"
+{
+ static void gtk_menu_clicked_callback(GtkWidget *widget, wxMenu *menu);
+}
#if wxUSE_ACCEL
+static bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key);
static wxString GetGtkHotKey( const wxMenuItem& item );
#endif
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-static wxString wxReplaceUnderscore( const wxString& title )
-{
- // GTK 1.2 wants to have "_" instead of "&" for accelerators
- wxString str;
-
- for ( wxString::const_iterator pc = title.begin(); pc != title.end(); ++pc )
- {
- if ((*pc == wxT('&')) && (pc+1 != title.end()) && (*(pc+1) == wxT('&')))
- {
- // "&" is doubled to indicate "&" instead of accelerator
- ++pc;
- str << wxT('&');
- }
- else if (*pc == wxT('&'))
- {
- str << wxT('_');
- }
- else
- {
- if ( *pc == wxT('_') )
- {
- // underscores must be doubled to prevent them from being
- // interpreted as accelerator character prefix by GTK
- str << *pc;
- }
-
- str << *pc;
- }
- }
-
- // wxPrintf( wxT("before %s after %s\n"), title.c_str(), str.c_str() );
-
- return str;
-}
-
-static wxString wxConvertFromGTKToWXLabel(const wxString& gtkLabel)
-{
- wxString label;
- for ( const wxChar *pc = gtkLabel.c_str(); *pc; pc++ )
- {
- // '_' is the escape character for GTK+.
-
- if ( *pc == wxT('_') && *(pc+1) == wxT('_'))
- {
- // An underscore was escaped.
- label += wxT('_');
- pc++;
- }
- else if ( *pc == wxT('_') )
- {
- // Convert GTK+ hotkey symbol to wxWidgets/Windows standard
- label += wxT('&');
- }
- else if ( *pc == wxT('&') )
- {
- // Double the ampersand to escape it as far as wxWidgets is concerned
- label += wxT("&&");
- }
- else
- {
- // 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;
- }
- }
-
- return label;
-}
-
//-----------------------------------------------------------------------------
// activate message from GTK
//-----------------------------------------------------------------------------
event.SetEventObject( menu );
wxEvtHandler* handler = menu->GetEventHandler();
- if (handler && handler->ProcessEvent(event))
+ if (handler && handler->SafelyProcessEvent(event))
return;
wxWindow *win = menu->GetInvokingWindow();
if (win)
- win->GetEventHandler()->ProcessEvent( event );
+ win->HandleWindowEvent( event );
}
extern "C" {
m_style = style;
m_invokingWindow = NULL;
+#if wxUSE_LIBHILDON
+ // Hildon window uses a single menu instead of a menu bar, so wxMenuBar is
+ // the same as menu in this case
+ m_widget =
+ m_menubar = gtk_menu_new();
+#else // !wxUSE_LIBHILDON
if (!PreCreation( NULL, wxDefaultPosition, wxDefaultSize ) ||
!CreateBase( NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") ))
{
PostCreation();
ApplyWidgetStyle();
+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
for (size_t i = 0; i < n; ++i )
Append(menus[i], titles[i]);
// can't pass the menu which was closed in wxMenuEvent object
g_signal_connect (m_menubar, "deactivate",
G_CALLBACK (gtk_menu_close_callback), this);
-
}
wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style)
bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
{
- wxString str( wxReplaceUnderscore( title ) );
+ menu->SetLayoutDirection(GetLayoutDirection());
- // This doesn't have much effect right now.
- menu->SetTitle( str );
+#if wxUSE_LIBHILDON
+ // if the menu has only one item, append it directly to the top level menu
+ // instead of inserting a useless submenu
+ if ( menu->GetMenuItemCount() == 1 )
+ {
+ wxMenuItem * const item = menu->FindItemByPosition(0);
- // The "m_owner" is the "menu item"
- menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
- menu->SetLayoutDirection(GetLayoutDirection());
+ // remove both mnemonics and accelerator: neither is useful under Maemo
+ const wxString str(wxStripMenuCodes(item->GetItemLabel()));
- gtk_widget_show( menu->m_owner );
+ if ( item->IsSubMenu() )
+ return GtkAppend(item->GetSubMenu(), str, pos);
+
+ menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
+
+ g_signal_connect(menu->m_owner, "activate",
+ G_CALLBACK(gtk_menu_clicked_callback), menu);
+ item->SetMenuItem(menu->m_owner);
+ }
+ else
+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+ {
+ const wxString str(wxConvertMnemonicsToGTK(title));
- gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
+ // This doesn't have much effect right now.
+ menu->SetTitle( str );
+
+ // The "m_owner" is the "menu item"
+ menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
+
+ gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
+ }
+
+ gtk_widget_show( menu->m_owner );
if (pos == -1)
gtk_menu_shell_append( GTK_MENU_SHELL(m_menubar), menu->m_owner );
static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
{
- if (wxMenuItem::GetLabelText(wxConvertFromGTKToWXLabel(menu->GetTitle())) == wxMenuItem::GetLabelText(menuString))
+ if (wxMenuItem::GetLabelText(wxConvertMnemonicsFromGTK(menu->GetTitle())) == wxMenuItem::GetLabelText(menuString))
{
int res = menu->FindItem( itemString );
if (res != wxNOT_FOUND)
wxMenu* menu = node->GetData();
- return wxConvertFromGTKToWXLabel(menu->GetTitle());
+ return wxConvertMnemonicsFromGTK(menu->GetTitle());
}
void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label )
wxMenu* menu = node->GetData();
- const wxString str( wxReplaceUnderscore( label ) );
+ const wxString str(wxConvertMnemonicsToGTK(label));
menu->SetTitle( str );
if (item->IsCheckable())
commandEvent.SetInt(item->IsChecked());
- frame->GetEventHandler()->ProcessEvent(commandEvent);
+ frame->HandleWindowEvent(commandEvent);
}
else
{
event.SetEventObject( menu );
wxEvtHandler* handler = menu->GetEventHandler();
- if (handler && handler->ProcessEvent(event))
+ if (handler && handler->SafelyProcessEvent(event))
return;
wxWindow *win = menu->GetInvokingWindow();
- if (win) win->GetEventHandler()->ProcessEvent( event );
+ if (win) win->HandleWindowEvent( event );
}
}
event.SetEventObject( menu );
wxEvtHandler* handler = menu->GetEventHandler();
- if (handler && handler->ProcessEvent(event))
+ if (handler && handler->SafelyProcessEvent(event))
return;
wxWindow *win = menu->GetInvokingWindow();
if (win)
- win->GetEventHandler()->ProcessEvent( event );
+ win->HandleWindowEvent( event );
}
}
wxString wxMenuItem::GetItemLabel() const
{
- wxString label = wxConvertFromGTKToWXLabel(m_text);
+ wxString label = wxConvertMnemonicsFromGTK(m_text);
if (!m_hotKey.IsEmpty())
- label = label + wxT("\t") + m_hotKey;
+ label << "\t" << m_hotKey;
return label;
}
oldLabel = wxStripMenuCodes(oldLabel);
oldLabel.Replace(wxT("_"), wxT(""));
wxString label1 = wxStripMenuCodes(str);
+#if wxUSE_ACCEL
wxString oldhotkey = GetHotKey(); // Store the old hotkey in Ctrl-foo format
wxCharBuffer oldbuf = wxGTK_CONV_SYS( GetGtkHotKey(*this) ); // and as <control>foo
+#endif // wxUSE_ACCEL
DoSetText(str);
+#if wxUSE_ACCEL
if (oldLabel == label1 &&
oldhotkey == GetHotKey()) // Make sure we can change a hotkey even if the label is unaltered
return;
accel_key,
accel_mods );
}
+#endif // wxUSE_ACCEL
}
// NOTE: this function is different from the similar functions GTKProcessMnemonics()
}
+#if wxUSE_ACCEL
guint accel_key;
GdkModifierType accel_mods;
wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*mitem) );
- // wxPrintf( wxT("item: %s hotkey %s\n"), mitem->GetItemLabel().c_str(), GetGtkHotKey(*mitem).c_str() );
if (buf[(size_t)0] != '\0')
{
gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
accel_mods,
GTK_ACCEL_VISIBLE);
}
+#endif // wxUSE_ACCEL
if (pos == -1)
gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem);
wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
{
if ( !wxMenuBase::DoRemove(item) )
- return (wxMenuItem *)NULL;
+ return NULL;
+
+ GtkWidget * const mitem = item->GetMenuItem();
+ if ( m_prevRadio == mitem )
+ {
+ // deleting an item starts a new radio group (has to as we shouldn't
+ // keep a deleted pointer anyhow)
+ m_prevRadio = NULL;
+ }
// 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() );
+ gtk_widget_destroy( mitem );
return item;
}
return NULL;
}
+#if wxUSE_ACCEL
+static
bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key)
{
if (!id)
return false;
}
+#endif // wxUSE_ACCEL
#endif // wxUSE_MENUS
projects / wxWidgets.git / blobdiff