/////////////////////////////////////////////////////////////////////////////
-// Name: menu.cpp
-// Purpose:
+// Name: src/gtk/menu.cpp
+// Purpose: implementation of wxMenuBar and wxMenu classes for wxGTK
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "menu.h"
-#pragma implementation "menuitem.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_MENUS
#include "wx/menu.h"
-#include "wx/log.h"
-#include "wx/intl.h"
-#include "wx/app.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/frame.h"
+ #include "wx/bitmap.h"
+ #include "wx/app.h"
+#endif
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+#include "wx/accel.h"
+#include "wx/stockitem.h"
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/mnemonics.h"
+
+// we use normal item but with a special id for the menu title
+static const int wxGTK_TITLE_ID = -3;
+
+// 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
+
+static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
+{
+ event.SetEventObject( menu );
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+ wxEvtHandler* handler = menu->GetEventHandler();
+ if (handler && handler->SafelyProcessEvent(event))
+ return;
+
+ wxWindow *win = menu->GetInvokingWindow();
+ if (win)
+ win->HandleWindowEvent( event );
+}
//-----------------------------------------------------------------------------
// wxMenuBar
IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
-wxMenuBar::wxMenuBar( long style )
+void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
{
- /* the parent window is known after wxFrame::SetMenu() */
- m_needParent = FALSE;
-
- PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, style, "menu" );
-
- m_menus.DeleteContents( TRUE );
+ 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") ))
+ {
+ wxFAIL_MSG( wxT("wxMenuBar creation failed") );
+ return;
+ }
- /* 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)
- m_accel = gtk_accel_group_new();
- m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
- m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
-#else
m_menubar = gtk_menu_bar_new();
-#endif
if (style & wxMB_DOCKABLE)
{
m_widget = gtk_handle_box_new();
- gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_menubar) );
- gtk_widget_show( GTK_WIDGET(m_menubar) );
+ gtk_container_add(GTK_CONTAINER(m_widget), m_menubar);
+ gtk_widget_show(m_menubar);
}
else
{
- m_widget = GTK_WIDGET(m_menubar);
+ m_widget = m_menubar;
}
PostCreation();
- Show( TRUE );
+ ApplyWidgetStyle();
+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+
+ for (size_t i = 0; i < n; ++i )
+ Append(menus[i], titles[i]);
}
-wxMenuBar::wxMenuBar()
+wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style)
{
- /* the parent window is known after wxFrame::SetMenu() */
- m_needParent = FALSE;
-
- PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
-
- m_menus.DeleteContents( TRUE );
-
- /* 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)
- m_accel = gtk_accel_group_new();
- m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
- m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
-#else
- m_menubar = gtk_menu_bar_new();
-#endif
-
- m_widget = GTK_WIDGET(m_menubar);
+ Init(n, menus, titles, style);
+}
- PostCreation();
+wxMenuBar::wxMenuBar(long style)
+{
+ Init(0, NULL, NULL, style);
+}
- Show( TRUE );
+wxMenuBar::wxMenuBar()
+{
+ Init(0, NULL, NULL, 0);
}
wxMenuBar::~wxMenuBar()
{
- // how to destroy a GtkItemFactory ?
}
-void wxMenuBar::Append( wxMenu *menu, const wxString &title )
+static void
+wxMenubarUnsetInvokingWindow(wxMenu* menu, wxWindow* win, GtkWindow* tlw = NULL)
{
- m_menus.Append( menu );
-
- /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
- wxString str;
- for ( const wxChar *pc = title; *pc != _T('\0'); pc++ )
+ menu->SetInvokingWindow( (wxWindow*) NULL );
+
+ // support for native hot keys
+ if (menu->m_accel)
{
- if (*pc == _T('&'))
- {
- pc++; /* skip it */
-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
- str << _T('_');
-#endif
- }
- str << *pc;
+ if (tlw == NULL)
+ tlw = GTK_WINDOW(wxGetTopLevelParent(win)->m_widget);
+ if (g_slist_find(menu->m_accel->acceleratables, tlw))
+ gtk_window_remove_accel_group(tlw, menu->m_accel);
}
- /* 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() );
-
- GtkItemFactoryEntry entry;
- entry.path = buf;
- entry.accelerator = (gchar*) NULL;
- entry.callback = (GtkItemFactoryCallback) NULL;
- entry.callback_action = 0;
- entry.item_type = "<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 */
- wxString tmp = _T("<main>/");
- for ( const wxChar *pc = str; *pc != _T('\0'); pc++ )
- {
- if (*pc == _T('_')) pc++; /* skip it */
- 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 );
-
-#else
-
- menu->m_owner = gtk_menu_item_new_with_label( str.mb_str() );
- gtk_widget_show( menu->m_owner );
- 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
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
+ while (node)
+ {
+ wxMenuItem *menuitem = node->GetData();
+ if (menuitem->IsSubMenu())
+ wxMenubarUnsetInvokingWindow(menuitem->GetSubMenu(), win, tlw);
+ node = node->GetNext();
+ }
}
-static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
+static void
+wxMenubarSetInvokingWindow(wxMenu* menu, wxWindow* win, GtkWindow* tlw = NULL)
{
- if (menu->GetTitle() == menuString)
+ menu->SetInvokingWindow( win );
+
+ // support for native hot keys
+ if (menu->m_accel)
{
- int res = menu->FindItem( itemString );
- if (res != wxNOT_FOUND)
- return res;
+ if (tlw == NULL)
+ tlw = GTK_WINDOW(wxGetTopLevelParent(win)->m_widget);
+ if (!g_slist_find(menu->m_accel->acceleratables, tlw))
+ gtk_window_add_accel_group(tlw, menu->m_accel);
}
- wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
while (node)
{
- wxMenuItem *item = (wxMenuItem*)node->Data();
- if (item->IsSubMenu())
- return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
-
- node = node->Next();
+ wxMenuItem *menuitem = node->GetData();
+ if (menuitem->IsSubMenu())
+ wxMenubarSetInvokingWindow(menuitem->GetSubMenu(), win, tlw);
+ node = node->GetNext();
}
+}
- return wxNOT_FOUND;
+void wxMenuBar::SetInvokingWindow( wxWindow *win )
+{
+ m_invokingWindow = win;
+
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
+ while (node)
+ {
+ wxMenu *menu = node->GetData();
+ wxMenubarSetInvokingWindow( menu, win );
+ node = node->GetNext();
+ }
}
-wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem = NULL) const
+void wxMenuBar::SetLayoutDirection(wxLayoutDirection dir)
{
- if ( menuForItem )
+ if ( dir == wxLayout_Default )
{
- // TODO return the pointer to the menu
+ const wxWindow *const frame = GetFrame();
+ if ( frame )
+ {
+ // inherit layout from frame.
+ dir = frame->GetLayoutDirection();
+ }
+ else // use global layout
+ {
+ dir = wxTheApp->GetLayoutDirection();
+ }
+ }
+
+ if ( dir == wxLayout_Default )
+ return;
+
+ GTKSetLayout(m_menubar, dir);
- *menuForItem = NULL;
+ // also set the layout of all menus we already have (new ones will inherit
+ // the current layout)
+ for ( wxMenuList::compatibility_iterator node = m_menus.GetFirst();
+ node;
+ node = node->GetNext() )
+ {
+ wxMenu *const menu = node->GetData();
+ menu->SetLayoutDirection(dir);
}
+}
- return FindItem(itemId);
+wxLayoutDirection wxMenuBar::GetLayoutDirection() const
+{
+ return GTKGetLayout(m_menubar);
}
-int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
+void wxMenuBar::Attach(wxFrame *frame)
{
- wxNode *node = m_menus.First();
- while (node)
- {
- wxMenu *menu = (wxMenu*)node->Data();
- int res = FindMenuItemRecursive( menu, menuString, itemString);
- if (res != -1) return res;
- node = node->Next();
- }
- return -1;
+ wxMenuBarBase::Attach(frame);
+
+ SetLayoutDirection(wxLayout_Default);
}
-// Find a wxMenuItem using its id. Recurses down into sub-menus
-static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
+void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
{
- wxMenuItem* result = menu->FindItem(id);
+ m_invokingWindow = (wxWindow*) NULL;
- wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast
- while ( node && result == NULL )
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
+ while (node)
{
- wxMenuItem *item = (wxMenuItem*)node->Data();
- if (item->IsSubMenu())
- {
- result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
- }
- node = node->Next();
+ wxMenu *menu = node->GetData();
+ wxMenubarUnsetInvokingWindow( menu, win );
+ node = node->GetNext();
}
+}
- return result;
+bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
+{
+ if ( !wxMenuBarBase::Append( menu, title ) )
+ return false;
+
+ return GtkAppend(menu, title);
}
-wxMenuItem* wxMenuBar::FindItem( int id ) const
+bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
{
- wxMenuItem* result = 0;
- wxNode *node = m_menus.First();
- while (node && result == 0)
+ menu->SetLayoutDirection(GetLayoutDirection());
+
+#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 )
{
- wxMenu *menu = (wxMenu*)node->Data();
- result = FindMenuItemByIdRecursive( menu, id );
- node = node->Next();
+ wxMenuItem * const item = menu->FindItemByPosition(0);
+
+ // remove both mnemonics and accelerator: neither is useful under Maemo
+ const wxString str(wxStripMenuCodes(item->GetItemLabel()));
+
+ 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));
- return result;
+ // 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 );
+ else
+ gtk_menu_shell_insert( GTK_MENU_SHELL(m_menubar), menu->m_owner, pos );
+
+ // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
+ // addings menu later on.
+ if (m_invokingWindow)
+ wxMenubarSetInvokingWindow( menu, m_invokingWindow );
+
+ return true;
}
-void wxMenuBar::Check( int id, bool check )
+bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
{
- wxMenuItem* item = FindMenuItemById( id );
+ if ( !wxMenuBarBase::Insert(pos, menu, title) )
+ return false;
+
+ // TODO
- wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") );
+ if ( !GtkAppend(menu, title, (int)pos) )
+ return false;
- item->Check(check);
+ return true;
}
-bool wxMenuBar::IsChecked( int id ) const
+wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
{
- wxMenuItem* item = FindMenuItemById( id );
-
- wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked: no such item") );
+ // remove the old item and insert a new one
+ wxMenu *menuOld = Remove(pos);
+ if ( menuOld && !Insert(pos, menu, title) )
+ {
+ return (wxMenu*) NULL;
+ }
- return item->IsChecked();
+ // either Insert() succeeded or Remove() failed and menuOld is NULL
+ return menuOld;
}
-void wxMenuBar::Enable( int id, bool enable )
+wxMenu *wxMenuBar::Remove(size_t pos)
{
- wxMenuItem* item = FindMenuItemById( id );
+ wxMenu *menu = wxMenuBarBase::Remove(pos);
+ if ( !menu )
+ return (wxMenu*) NULL;
- wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") );
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu->m_owner), NULL);
+ gtk_container_remove(GTK_CONTAINER(m_menubar), menu->m_owner);
- item->Enable(enable);
+ gtk_widget_destroy( menu->m_owner );
+ menu->m_owner = NULL;
+
+ if (m_invokingWindow)
+ wxMenubarUnsetInvokingWindow( menu, m_invokingWindow );
+
+ return menu;
}
-bool wxMenuBar::IsEnabled( int id ) const
+static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
{
- wxMenuItem* item = FindMenuItemById( id );
+ if (wxMenuItem::GetLabelText(wxConvertMnemonicsFromGTK(menu->GetTitle())) == wxMenuItem::GetLabelText(menuString))
+ {
+ int res = menu->FindItem( itemString );
+ if (res != wxNOT_FOUND)
+ return res;
+ }
- wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled: no such item") );
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
+ while (node)
+ {
+ wxMenuItem *item = node->GetData();
+ if (item->IsSubMenu())
+ return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
- return item->IsEnabled();
+ node = node->GetNext();
+ }
+
+ return wxNOT_FOUND;
}
-wxString wxMenuBar::GetLabel( int id ) const
+int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
{
- wxMenuItem* item = FindMenuItemById( id );
-
- wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel: no such item") );
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
+ while (node)
+ {
+ wxMenu *menu = node->GetData();
+ int res = FindMenuItemRecursive( menu, menuString, itemString);
+ if (res != -1)
+ return res;
+ node = node->GetNext();
+ }
- return item->GetText();
+ return wxNOT_FOUND;
}
-void wxMenuBar::SetLabel( int id, const wxString &label )
+// Find a wxMenuItem using its id. Recurses down into sub-menus
+static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
{
- wxMenuItem* item = FindMenuItemById( id );
+ wxMenuItem* result = menu->FindChildItem(id);
- wxCHECK_RET( item, _T("wxMenuBar::SetLabel: no such item") );
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
+ while ( node && result == NULL )
+ {
+ wxMenuItem *item = node->GetData();
+ if (item->IsSubMenu())
+ {
+ result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
+ }
+ node = node->GetNext();
+ }
- item->SetText( label );
+ return result;
}
-void wxMenuBar::EnableTop( int pos, bool flag )
+wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const
{
- wxNode *node = m_menus.Nth( pos );
-
- wxCHECK_RET( node, _T("menu not found") );
+ wxMenuItem* result = 0;
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
+ while (node && result == 0)
+ {
+ wxMenu *menu = node->GetData();
+ result = FindMenuItemByIdRecursive( menu, id );
+ node = node->GetNext();
+ }
- wxMenu* menu = (wxMenu*)node->Data();
+ if ( menuForItem )
+ {
+ *menuForItem = result ? result->GetMenu() : (wxMenu *)NULL;
+ }
- if (menu->m_owner)
- gtk_widget_set_sensitive( menu->m_owner, flag );
+ return result;
}
-wxString wxMenuBar::GetLabelTop( int pos ) const
+void wxMenuBar::EnableTop( size_t pos, bool flag )
{
- wxNode *node = m_menus.Nth( pos );
+ wxMenuList::compatibility_iterator node = m_menus.Item( pos );
- wxCHECK_MSG( node, _T("invalid"), _T("menu not found") );
+ wxCHECK_RET( node, wxT("menu not found") );
- wxMenu* menu = (wxMenu*)node->Data();
+ wxMenu* menu = node->GetData();
- return menu->GetTitle();
+ if (menu->m_owner)
+ gtk_widget_set_sensitive( menu->m_owner, flag );
}
-void wxMenuBar::SetLabelTop( int pos, const wxString& label )
+wxString wxMenuBar::GetMenuLabel( size_t pos ) const
{
- wxNode *node = m_menus.Nth( pos );
+ wxMenuList::compatibility_iterator node = m_menus.Item( pos );
- wxCHECK_RET( node, _T("menu not found") );
+ wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") );
- wxMenu* menu = (wxMenu*)node->Data();
+ wxMenu* menu = node->GetData();
- menu->SetTitle( label );
+ return wxConvertMnemonicsFromGTK(menu->GetTitle());
}
-void wxMenuBar::SetHelpString( int id, const wxString& helpString )
+void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label )
{
- wxMenuItem* item = FindMenuItemById( id );
+ wxMenuList::compatibility_iterator node = m_menus.Item( pos );
- wxCHECK_RET( item, _T("wxMenuBar::SetHelpString: no such item") );
+ wxCHECK_RET( node, wxT("menu not found") );
- item->SetHelp( helpString );
-}
+ wxMenu* menu = node->GetData();
-wxString wxMenuBar::GetHelpString( int id ) const
-{
- wxMenuItem* item = FindMenuItemById( id );
+ const wxString str(wxConvertMnemonicsToGTK(label));
- wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString: no such item") );
+ menu->SetTitle( str );
- return item->GetHelp();
+ if (menu->m_owner)
+ gtk_label_set_text_with_mnemonic( GTK_LABEL( GTK_BIN(menu->m_owner)->child), wxGTK_CONV(str) );
}
//-----------------------------------------------------------------------------
// "activate"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
int id = menu->FindMenuIdByMenuItem(widget);
/* should find it for normal (not popup) menu */
- wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) );
+ wxASSERT_MSG( (id != -1) || (menu->GetInvokingWindow() != NULL),
+ _T("menu item not found in gtk_menu_clicked_callback") );
if (!menu->IsEnabled(id))
return;
- wxMenuItem* item = menu->FindItem( id );
- wxCHECK_RET( item, _T("error in menu item callback") );
+ wxMenuItem* item = menu->FindChildItem( id );
+ wxCHECK_RET( item, wxT("error in menu item callback") );
+
+ if ( item->GetId() == wxGTK_TITLE_ID )
+ {
+ // ignore events from the menu title
+ return;
+ }
if (item->IsCheckable())
{
- if (item->GetCheckedFlag() == item->IsChecked())
+ bool isReallyChecked = item->IsChecked(),
+ isInternallyChecked = item->wxMenuItemBase::IsChecked();
+
+ // ensure that the internal state is always consistent with what is
+ // shown on the screen
+ item->wxMenuItemBase::Check(isReallyChecked);
+
+ // we must not report the events for the radio button going up nor the
+ // events resulting from the calls to wxMenuItem::Check()
+ if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) ||
+ (isInternallyChecked == 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 */
- }
}
- wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id );
- event.SetEventObject( menu );
- event.SetInt(id );
- if (menu->GetCallback())
+ // Is this menu on a menubar? (possibly nested)
+ wxFrame* frame = NULL;
+ if(menu->IsAttached())
+ frame = menu->GetMenuBar()->GetFrame();
+
+ // FIXME: why do we have to call wxFrame::GetEventHandler() directly here?
+ // normally wxMenu::SendEvent() should be enough, if it doesn't work
+ // in wxGTK then we have a bug in wxMenu::GetInvokingWindow() which
+ // should be fixed instead of working around it here...
+ if (frame)
{
- (void) (*(menu->GetCallback())) (*menu, event);
- return;
+ // If it is attached then let the frame send the event.
+ // Don't call frame->ProcessCommand(id) because it toggles
+ // checkable items and we've already done that above.
+ wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
+ commandEvent.SetEventObject(frame);
+ if (item->IsCheckable())
+ commandEvent.SetInt(item->IsChecked());
+
+ frame->HandleWindowEvent(commandEvent);
+ }
+ else
+ {
+ // otherwise let the menu have it
+ menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
}
-
- if (menu->GetEventHandler()->ProcessEvent(event))
- return;
-
- wxWindow *win = menu->GetInvokingWindow();
- if (win)
- win->GetEventHandler()->ProcessEvent( event );
+}
}
//-----------------------------------------------------------------------------
// "select"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
int id = menu->FindMenuIdByMenuItem(widget);
wxASSERT( id != -1 ); // should find it!
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))
+ wxEvtHandler* handler = menu->GetEventHandler();
+ if (handler && handler->SafelyProcessEvent(event))
return;
wxWindow *win = menu->GetInvokingWindow();
- if (win) win->GetEventHandler()->ProcessEvent( event );
+ if (win) win->HandleWindowEvent( event );
+}
}
//-----------------------------------------------------------------------------
// "deselect"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
int id = menu->FindMenuIdByMenuItem(widget);
wxASSERT( id != -1 ); // should find it!
wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
event.SetEventObject( menu );
- if (menu->GetEventHandler()->ProcessEvent(event))
+ wxEvtHandler* handler = menu->GetEventHandler();
+ if (handler && handler->SafelyProcessEvent(event))
return;
wxWindow *win = menu->GetInvokingWindow();
if (win)
- win->GetEventHandler()->ProcessEvent( event );
+ win->HandleWindowEvent( event );
+}
}
//-----------------------------------------------------------------------------
// wxMenuItem
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-wxMenuItem::wxMenuItem()
+wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
+ int id,
+ const wxString& name,
+ const wxString& help,
+ wxItemKind kind,
+ wxMenu *subMenu)
+{
+ return new wxMenuItem(parentMenu, id, name, help, kind, subMenu);
+}
+
+wxMenuItem::wxMenuItem(wxMenu *parentMenu,
+ int id,
+ const wxString& text,
+ const wxString& help,
+ wxItemKind kind,
+ wxMenu *subMenu)
+ : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
+{
+ Init(text);
+}
+
+#if WXWIN_COMPATIBILITY_2_8
+wxMenuItem::wxMenuItem(wxMenu *parentMenu,
+ int id,
+ const wxString& text,
+ const wxString& help,
+ bool isCheckable,
+ wxMenu *subMenu)
+ : wxMenuItemBase(parentMenu, id, text, help,
+ isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
+{
+ Init(text);
+}
+#endif
+
+void wxMenuItem::Init(const wxString& text)
{
- m_id = ID_SEPARATOR;
- m_isCheckMenu = FALSE;
- m_isChecked = FALSE;
- m_isEnabled = TRUE;
- m_subMenu = (wxMenu *) NULL;
m_menuItem = (GtkWidget *) NULL;
+
+ DoSetText(text);
}
-// it's valid for this function to be called even if m_menuItem == NULL
-void wxMenuItem::SetName( const wxString& str )
+wxMenuItem::~wxMenuItem()
+{
+ // don't delete menu items, the menus take care of that
+}
+
+// return the menu item text without any menu accels
+/* static */
+
+wxString wxMenuItemBase::GetLabelText(const wxString& text)
{
- m_text = _T("");
- for ( const wxChar *pc = str; *pc != _T('\0'); pc++ )
+ // The argument to this function will now always be in wxWidgets standard label
+ // format, not GTK+ format, so we do what the other ports do.
+
+ return wxStripMenuCodes(text);
+
+#if 0
+ wxString label;
+
+ for ( const wxChar *pc = text.c_str(); *pc; pc++ )
{
- if (*pc == _T('&'))
- {
- pc++; /* skip it */
-#if (GTK_MINOR_VERSION > 0)
- m_text << _T('_');
-#endif
+ if ( *pc == wxT('\t'))
+ break;
+
+ if ( *pc == wxT('_') )
+ {
+ // GTK 1.2 escapes "xxx_xxx" to "xxx__xxx"
+ pc++;
+ label += *pc;
+ continue;
+ }
+
+ if ( *pc == wxT('\\') )
+ {
+ // GTK 2.0 escapes "xxx/xxx" to "xxx\/xxx"
+ pc++;
+ label += *pc;
+ continue;
}
- m_text << *pc;
+
+ if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) )
+ {
+ // wxMSW escapes "&"
+ // "&" is doubled to indicate "&" instead of accelerator
+ continue;
+ }
+
+ label += *pc;
}
+ // wxPrintf( wxT("GetLabelText(): text %s label %s\n"), text.c_str(), label.c_str() );
+
+ return label;
+#endif
+}
+
+wxString wxMenuItem::GetItemLabel() const
+{
+ wxString label = wxConvertMnemonicsFromGTK(m_text);
+ if (!m_hotKey.IsEmpty())
+ label << "\t" << m_hotKey;
+ return label;
+}
+
+void wxMenuItem::SetItemLabel( const wxString& str )
+{
+ // cache some data which must be used later
+ bool isstock = wxIsStockID(GetId());
+ const char *stockid = NULL;
+ if (isstock)
+ stockid = wxGetStockGtkID(GetId());
+
+ // Some optimization to avoid flicker
+ wxString oldLabel = m_text;
+ oldLabel = wxStripMenuCodes(oldLabel);
+ oldLabel.Replace(wxT("_"), wxT(""));
+ wxString label1 = wxStripMenuCodes(str);
+#if wxUSE_ACCEL
+ wxString oldhotkey = m_hotKey; // 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 == m_hotKey) // Make sure we can change a hotkey even if the label is unaltered
+ return;
+
if (m_menuItem)
{
- GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
- gtk_label_set( label, m_text.mb_str());
+ // stock menu items can have empty labels:
+ wxString text = m_text;
+ if (text.IsEmpty() && !IsSeparator())
+ {
+ wxASSERT_MSG(isstock, wxT("A non-stock menu item with an empty label?"));
+ text = wxGetStockLabel(GetId());
+
+ // need & => _ conversion
+ text = GTKProcessMenuItemLabel(text, NULL);
+ }
+
+ GtkLabel* label = GTK_LABEL(GTK_BIN(m_menuItem)->child);
+ gtk_label_set_text_with_mnemonic(label, wxGTK_CONV_SYS(text));
+ }
+
+ // remove old accelerator from our parent's accelerator group, if present
+ guint accel_key;
+ GdkModifierType accel_mods;
+ if (oldbuf[(size_t)0] != '\0')
+ {
+ gtk_accelerator_parse( (const char*) oldbuf, &accel_key, &accel_mods);
+ if (accel_key != 0)
+ {
+ gtk_widget_remove_accelerator(m_menuItem,
+ m_parentMenu->m_accel,
+ accel_key,
+ accel_mods );
+ }
+ }
+ else if (isstock)
+ {
+ // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
+ if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
+ gtk_widget_remove_accelerator( m_menuItem,
+ m_parentMenu->m_accel,
+ accel_key,
+ accel_mods );
}
+
+ // add new accelerator to our parent's accelerator group
+ wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*this) );
+ if (buf[(size_t)0] != '\0')
+ {
+ gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
+ if (accel_key != 0)
+ {
+ gtk_widget_add_accelerator( m_menuItem,
+ "activate",
+ m_parentMenu->m_accel,
+ accel_key,
+ accel_mods,
+ GTK_ACCEL_VISIBLE);
+ }
+ }
+ else if (isstock)
+ {
+ // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
+ if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
+ gtk_widget_remove_accelerator( m_menuItem,
+ m_parentMenu->m_accel,
+ accel_key,
+ accel_mods );
+ }
+#endif // wxUSE_ACCEL
+}
+
+// NOTE: this function is different from the similar functions GTKProcessMnemonics()
+// implemented in control.cpp and from wxMenuItemBase::GetLabelText...
+// so there's no real code duplication
+wxString wxMenuItem::GTKProcessMenuItemLabel(const wxString& str, wxString *hotKey)
+{
+ wxString text;
+
+ // '\t' is the deliminator indicating a hot key
+ wxString::const_iterator pc = str.begin();
+ while ( pc != str.end() && *pc != wxT('\t') )
+ {
+ if (*pc == wxT('&'))
+ {
+ wxString::const_iterator next = pc + 1;
+ if (next != str.end() && *next == wxT('&'))
+ {
+ // "&" is doubled to indicate "&" instead of accelerator
+ ++pc;
+ text << wxT('&');
+ }
+ else
+ {
+ text << wxT('_');
+ }
+ }
+ else if ( *pc == wxT('_') ) // escape underscores
+ {
+ text << wxT("__");
+ }
+ else
+ {
+ text << *pc;
+ }
+ ++pc;
+ }
+
+ if (hotKey)
+ {
+ hotKey->Empty();
+ if(*pc == wxT('\t'))
+ {
+ ++pc;
+ hotKey->assign(pc, str.end());
+ }
+ }
+
+ return text;
+}
+
+// it's valid for this function to be called even if m_menuItem == NULL
+void wxMenuItem::DoSetText( const wxString& str )
+{
+ m_text.Empty();
+ m_text = GTKProcessMenuItemLabel(str, &m_hotKey);
}
+#if wxUSE_ACCEL
+
+wxAcceleratorEntry *wxMenuItem::GetAccel() const
+{
+ if (m_hotKey.empty())
+ {
+ // nothing
+ return NULL;
+ }
+
+ // accelerator parsing code looks for them after a TAB, so insert a dummy
+ // one here
+ wxString label;
+ label << wxT('\t') << m_hotKey;
+
+ return wxAcceleratorEntry::Create(label);
+}
+
+#endif // wxUSE_ACCEL
+
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!") )
+ if (check == m_isChecked)
+ return;
- if (check == m_isChecked) return;
+ wxMenuItemBase::Check( check );
- m_isChecked = check;
- gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
+ switch ( GetKind() )
+ {
+ case wxITEM_CHECK:
+ case wxITEM_RADIO:
+ gtk_check_menu_item_set_active( (GtkCheckMenuItem*)m_menuItem, (gint)check );
+ break;
+
+ default:
+ wxFAIL_MSG( _T("can't check this item") );
+ }
}
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_MSG( m_menuItem, false, wxT("invalid menu item") );
- wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
+ wxCHECK_MSG( IsCheckable(), false,
+ wxT("can't get state of uncheckable item!") );
- bool bIsChecked = ((GtkCheckMenuItem*)m_menuItem)->active != 0;
-
- return bIsChecked;
+ return ((GtkCheckMenuItem*)m_menuItem)->active != 0;
}
//-----------------------------------------------------------------------------
// wxMenu
//-----------------------------------------------------------------------------
+extern "C" {
+// "map" from m_menu
+static void menu_map(GtkWidget*, wxMenu* menu)
+{
+ wxMenuEvent event(wxEVT_MENU_OPEN, menu->m_popupShown ? -1 : 0, menu);
+ DoCommonMenuCallbackCode(menu, event);
+}
+
+// "hide" from m_menu
+static void menu_hide(GtkWidget*, wxMenu* menu)
+{
+ wxMenuEvent event(wxEVT_MENU_CLOSE, menu->m_popupShown ? -1 : 0, menu);
+ menu->m_popupShown = false;
+ DoCommonMenuCallbackCode(menu, event);
+}
+}
+
IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
-wxMenu::wxMenu( const wxString& title, const wxFunction func )
+void wxMenu::Init()
{
- m_title = title;
- m_items.DeleteContents( TRUE );
- m_invokingWindow = (wxWindow *) NULL;
-
-#if (GTK_MINOR_VERSION > 0)
+ m_popupShown = false;
+
m_accel = gtk_accel_group_new();
- m_factory = gtk_item_factory_new( GTK_TYPE_MENU, "<main>", m_accel );
- m_menu = gtk_item_factory_get_widget( m_factory, "<main>" );
-#else
- m_menu = gtk_menu_new(); // Do not show!
-#endif
+ m_menu = gtk_menu_new();
+ // NB: keep reference to the menu so that it is not destroyed behind
+ // our back by GTK+ e.g. when it is removed from menubar:
+ g_object_ref(m_menu);
+ gtk_object_sink(GTK_OBJECT(m_menu));
+
+ 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.
+ if ( m_style & wxMENU_TEAROFF )
+ {
+ GtkWidget *tearoff = gtk_tearoff_menu_item_new();
+
+ gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), tearoff);
+ }
- m_callback = func;
- m_eventHandler = this;
- m_clientData = (void*) NULL;
+ m_prevRadio = NULL;
- if (m_title.IsNull()) m_title = _T("");
- if (m_title != _T(""))
+ // append the title as the very first entry if we have it
+ if ( !m_title.empty() )
{
- Append(-2, m_title);
+ Append(wxGTK_TITLE_ID, m_title);
AppendSeparator();
}
- m_owner = (GtkWidget*) NULL;
+ // "show" occurs for sub-menus which are not showing, so use "map" instead
+ g_signal_connect(m_menu, "map", G_CALLBACK(menu_map), this);
+ g_signal_connect(m_menu, "hide", G_CALLBACK(menu_hide), this);
}
wxMenu::~wxMenu()
{
- /* how do we delete an item-factory ? */
-}
+ // see wxMenu::Init
+ g_object_unref(m_menu);
-void wxMenu::SetTitle( const wxString& title )
-{
- // TODO Waiting for something better
- m_title = title;
+ // if the menu is inserted in another menu at this time, there was
+ // one more reference to it:
+ if (m_owner)
+ gtk_widget_destroy(m_menu);
+
+ g_object_unref(m_accel);
}
-const wxString wxMenu::GetTitle() const
+void wxMenu::SetLayoutDirection(const wxLayoutDirection dir)
{
- return m_title;
+ if ( m_owner )
+ wxWindow::GTKSetLayout(m_owner, dir);
+ //else: will be called later by wxMenuBar again
}
-void wxMenu::AppendSeparator()
+wxLayoutDirection wxMenu::GetLayoutDirection() const
{
- wxMenuItem *mitem = new wxMenuItem();
- mitem->SetId(ID_SEPARATOR);
-
- GtkWidget *menuItem = gtk_menu_item_new();
- gtk_menu_append( GTK_MENU(m_menu), menuItem );
- gtk_widget_show( menuItem );
-
- mitem->SetMenuItem(menuItem);
- m_items.Append( mitem );
-}
-
-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);
-
-#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.accelerator = (gchar*) NULL;
- entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
- entry.callback_action = 0;
- if (checkable)
- entry.item_type = "<CheckItem>";
- else
- entry.item_type = "<Item>";
-
- 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("<main>/");
- for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
- {
- if (*pc == _T('_')) 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( item.mb_str() )
- : gtk_menu_item_new_with_label( item.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",
- GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
- (gpointer)this );
-
- gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
- GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
- (gpointer)this );
-
- mitem->SetMenuItem(menuItem);
-
- m_items.Append( mitem );
+ return wxWindow::GTKGetLayout(m_owner);
}
-void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxString &helpStr )
+bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
{
- wxMenuItem *mitem = new wxMenuItem();
- mitem->SetId(id);
- mitem->SetText(text);
- mitem->SetHelp(helpStr);
-
- GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str());
- mitem->SetMenuItem(menuItem);
- mitem->SetSubMenu(subMenu);
+ GtkWidget *menuItem;
+
+ // cache some data used later
+ wxString text = mitem->wxMenuItemBase::GetItemLabel();
+ int id = mitem->GetId();
+ bool isstock = wxIsStockID(id);
+ const char *stockid = NULL;
+ if (isstock)
+ stockid = wxGetStockGtkID(mitem->GetId());
+
+ // stock menu items can have an empty label
+ if (text.IsEmpty() && !mitem->IsSeparator())
+ {
+ wxASSERT_MSG(isstock, wxT("A non-stock menu item with an empty label?"));
+ text = wxGetStockLabel(id);
- gtk_signal_connect( GTK_OBJECT(menuItem), "select",
- GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
- (gpointer*)this );
+ // need & => _ conversion
+ text = wxMenuItem::GTKProcessMenuItemLabel(text, NULL);
+ }
- gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
- GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
- (gpointer*)this );
+ if ( mitem->IsSeparator() )
+ {
+ menuItem = gtk_separator_menu_item_new();
+ m_prevRadio = NULL;
+ }
+ else if ( mitem->GetBitmap().Ok() ||
+ (mitem->GetKind() == wxITEM_NORMAL && isstock) )
+ {
+ wxBitmap bitmap(mitem->GetBitmap());
- gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
- gtk_menu_append( GTK_MENU(m_menu), menuItem );
- gtk_widget_show( menuItem );
- m_items.Append( mitem );
-}
+ menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );
-void wxMenu::Append( wxMenuItem *item )
-{
- m_items.Append( item );
+ GtkWidget *image;
+ if ( !bitmap.Ok() )
+ {
+ // use stock bitmap for this item if available on the assumption
+ // that it never hurts to follow GTK+ conventions more closely
+ image = stockid ? gtk_image_new_from_stock(stockid, GTK_ICON_SIZE_MENU)
+ : NULL;
+ }
+ else // we have a custom bitmap
+ {
+ wxASSERT_MSG( mitem->GetKind() == wxITEM_NORMAL,
+ _T("only normal menu items can have bitmaps") );
+
+ if ( bitmap.HasPixbuf() )
+ {
+ image = gtk_image_new_from_pixbuf(bitmap.GetPixbuf());
+ }
+ else
+ {
+ GdkPixmap *gdk_pixmap = bitmap.GetPixmap();
+ GdkBitmap *gdk_bitmap = bitmap.GetMask() ?
+ bitmap.GetMask()->GetBitmap() :
+ (GdkBitmap*) NULL;
+ image = gtk_image_new_from_pixmap( gdk_pixmap, gdk_bitmap );
+ }
+ }
- GtkWidget *menuItem = (GtkWidget*) NULL;
+ if ( image )
+ {
+ gtk_widget_show(image);
- if (item->IsSeparator())
- menuItem = gtk_menu_item_new();
- else if (item->IsSubMenu())
- menuItem = gtk_menu_item_new_with_label(item->GetText().mbc_str());
- else
- menuItem = item->IsCheckable() ? gtk_check_menu_item_new_with_label(item->GetText().mbc_str())
- : gtk_menu_item_new_with_label(item->GetText().mbc_str());
+ gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(menuItem), image );
+ }
- if (!item->IsSeparator())
+ m_prevRadio = NULL;
+ }
+ else // a normal item
{
- gtk_signal_connect( GTK_OBJECT(menuItem), "select",
- GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
- (gpointer*)this );
-
- gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
- GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
- (gpointer*)this );
+ // NB: 'text' variable has "_" instead of "&" after mitem->SetItemLabel()
+ // so don't use it
- if (!item->IsSubMenu())
+ switch ( mitem->GetKind() )
{
- gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
- GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
- (gpointer*)this );
+ case wxITEM_CHECK:
+ {
+ menuItem = gtk_check_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );
+ m_prevRadio = NULL;
+ break;
+ }
+
+ case wxITEM_RADIO:
+ {
+ GSList *group = NULL;
+ if ( m_prevRadio == NULL )
+ {
+ // start of a new radio group
+ m_prevRadio = menuItem =
+ gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV_SYS( text ) );
+ }
+ else // continue the radio group
+ {
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (m_prevRadio));
+ m_prevRadio = menuItem =
+ gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV_SYS( text ) );
+ }
+ break;
+ }
+
+ default:
+ wxFAIL_MSG( _T("unexpected menu item kind") );
+ // fall through
+
+ case wxITEM_NORMAL:
+ {
+ menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );
+ m_prevRadio = NULL;
+ break;
+ }
}
+
}
- gtk_menu_append( GTK_MENU(m_menu), menuItem );
- gtk_widget_show( menuItem );
- item->SetMenuItem(menuItem);
-}
+#if wxUSE_ACCEL
+ guint accel_key;
+ GdkModifierType accel_mods;
+ wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*mitem) );
-int wxMenu::FindItem( const wxString itemString ) const
-{
- wxString s = _T("");
- for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ )
+ if (buf[(size_t)0] != '\0')
{
- if (*pc == _T('&'))
- {
- pc++; /* skip it */
-#if (GTK_MINOR_VERSION > 0)
- s << _T('_');
-#endif
+ gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
+ if (accel_key != 0)
+ {
+ gtk_widget_add_accelerator (menuItem,
+ "activate",
+ m_accel,
+ accel_key,
+ accel_mods,
+ GTK_ACCEL_VISIBLE);
}
- s << *pc;
}
-
- wxNode *node = m_items.First();
- while (node)
+ else if (isstock)
{
- wxMenuItem *item = (wxMenuItem*)node->Data();
- if (item->GetText() == s)
- {
- return item->GetId();
- }
- node = node->Next();
+ // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
+ if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
+ gtk_widget_add_accelerator( menuItem,
+ "activate",
+ m_accel,
+ accel_key,
+ accel_mods,
+ GTK_ACCEL_VISIBLE);
}
+#endif // wxUSE_ACCEL
- return wxNOT_FOUND;
-}
-
-void wxMenu::Enable( int id, bool enable )
-{
- wxMenuItem *item = FindItem(id);
-
- wxCHECK_RET( item, _T("wxMenu::Enable: no such item") );
+ if (pos == -1)
+ gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem);
+ else
+ gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos);
- item->Enable(enable);
-}
+ gtk_widget_show( menuItem );
-bool wxMenu::IsEnabled( int id ) const
-{
- wxMenuItem *item = FindItem(id);
+ if ( !mitem->IsSeparator() )
+ {
+ wxASSERT_MSG( menuItem, wxT("invalid menuitem") );
- wxCHECK_MSG( item, FALSE, _T("wxMenu::IsEnabled: no such item") );
+ g_signal_connect (menuItem, "select",
+ G_CALLBACK (gtk_menu_hilight_callback), this);
+ g_signal_connect (menuItem, "deselect",
+ G_CALLBACK (gtk_menu_nolight_callback), this);
- return item->IsEnabled();
-}
-
-void wxMenu::Check( int id, bool enable )
-{
- wxMenuItem *item = FindItem(id);
+ if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK )
+ {
+ gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
- wxCHECK_RET( item, _T("wxMenu::Check: no such item") );
+ gtk_widget_show( mitem->GetSubMenu()->m_menu );
- item->Check(enable);
-}
+ // 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
+ {
+ g_signal_connect (menuItem, "activate",
+ G_CALLBACK (gtk_menu_clicked_callback),
+ this);
+ }
+ }
-bool wxMenu::IsChecked( int id ) const
-{
- wxMenuItem *item = FindItem(id);
+ mitem->SetMenuItem(menuItem);
- wxCHECK_MSG( item, FALSE, _T("wxMenu::IsChecked: no such item") );
+ if (ms_locked)
+ {
+ // This doesn't even exist!
+ // gtk_widget_lock_accelerators(mitem->GetMenuItem());
+ }
- return item->IsChecked();
+ return true;
}
-void wxMenu::SetLabel( int id, const wxString &label )
+wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem)
{
- wxMenuItem *item = FindItem(id);
-
- wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") );
+ if (!GtkAppend(mitem))
+ return NULL;
- item->SetText(label);
+ return wxMenuBase::DoAppend(mitem);
}
-wxString wxMenu::GetLabel( int id ) const
+wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
{
- wxMenuItem *item = FindItem(id);
+ if ( !wxMenuBase::DoInsert(pos, item) )
+ return NULL;
- wxCHECK_MSG( item, _T(""), _T("wxMenu::GetLabel: no such item") );
+ // TODO
+ if ( !GtkAppend(item, (int)pos) )
+ return NULL;
- return item->GetText();
+ return item;
}
-void wxMenu::SetHelpString( int id, const wxString& helpString )
+wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
{
- wxMenuItem *item = FindItem(id);
+ if ( !wxMenuBase::DoRemove(item) )
+ return NULL;
- wxCHECK_RET( item, _T("wxMenu::SetHelpString: no such item") );
-
- item->SetHelp( helpString );
-}
-
-wxString wxMenu::GetHelpString( int id ) const
-{
- wxMenuItem *item = FindItem(id);
+ 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;
+ }
- wxCHECK_MSG( item, _T(""), _T("wxMenu::GetHelpString: no such item") );
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL);
+ gtk_widget_destroy(mitem);
+ item->SetMenuItem(NULL);
- return item->GetHelp();
+ return item;
}
int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
{
- wxNode *node = m_items.First();
+ wxMenuItemList::compatibility_iterator 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();
+ return item->GetId();
+ node = node->GetNext();
}
return wxNOT_FOUND;
}
-wxMenuItem *wxMenu::FindItem(int id) const
+void wxMenu::Attach(wxMenuBarBase *menubar)
{
- wxNode *node = m_items.First();
- while (node)
+ wxMenuBase::Attach(menubar);
+
+ // inherit layout direction from menubar.
+ SetLayoutDirection(menubar->GetLayoutDirection());
+}
+
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
+
+#if wxUSE_ACCEL
+
+static wxString GetGtkHotKey( const wxMenuItem& item )
+{
+ wxString hotkey;
+
+ wxAcceleratorEntry *accel = item.GetAccel();
+ if ( accel )
{
- wxMenuItem *item = (wxMenuItem*)node->Data();
- if (item->GetId() == id)
+ int flags = accel->GetFlags();
+ if ( flags & wxACCEL_ALT )
+ hotkey += wxT("<alt>");
+ if ( flags & wxACCEL_CTRL )
+ hotkey += wxT("<control>");
+ if ( flags & wxACCEL_SHIFT )
+ hotkey += wxT("<shift>");
+
+ int code = accel->GetKeyCode();
+ switch ( code )
{
- return item;
+ 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:
+ case WXK_F13:
+ case WXK_F14:
+ case WXK_F15:
+ case WXK_F16:
+ case WXK_F17:
+ case WXK_F18:
+ case WXK_F19:
+ case WXK_F20:
+ case WXK_F21:
+ case WXK_F22:
+ case WXK_F23:
+ case WXK_F24:
+ hotkey += wxString::Format(wxT("F%d"), code - WXK_F1 + 1);
+ break;
+
+ // TODO: we should use gdk_keyval_name() (a.k.a.
+ // XKeysymToString) here as well as hardcoding the keysym
+ // names this might be not portable
+ case WXK_INSERT:
+ hotkey << wxT("Insert" );
+ break;
+ case WXK_DELETE:
+ hotkey << wxT("Delete" );
+ break;
+ case WXK_UP:
+ hotkey << wxT("Up" );
+ break;
+ case WXK_DOWN:
+ hotkey << wxT("Down" );
+ break;
+ case WXK_PAGEUP:
+ hotkey << wxT("Page_Up" );
+ break;
+ case WXK_PAGEDOWN:
+ hotkey << wxT("Page_Down" );
+ break;
+ case WXK_LEFT:
+ hotkey << wxT("Left" );
+ break;
+ case WXK_RIGHT:
+ hotkey << wxT("Right" );
+ break;
+ case WXK_HOME:
+ hotkey << wxT("Home" );
+ break;
+ case WXK_END:
+ hotkey << wxT("End" );
+ break;
+ case WXK_RETURN:
+ hotkey << wxT("Return" );
+ break;
+ case WXK_BACK:
+ hotkey << wxT("BackSpace" );
+ break;
+ case WXK_TAB:
+ hotkey << wxT("Tab" );
+ break;
+ case WXK_ESCAPE:
+ hotkey << wxT("Esc" );
+ break;
+ case WXK_SPACE:
+ hotkey << wxT("space" );
+ break;
+ case WXK_MULTIPLY:
+ hotkey << wxT("Multiply" );
+ break;
+ case WXK_ADD:
+ hotkey << wxT("Add" );
+ break;
+ case WXK_SEPARATOR:
+ hotkey << wxT("Separator" );
+ break;
+ case WXK_SUBTRACT:
+ hotkey << wxT("Subtract" );
+ break;
+ case WXK_DECIMAL:
+ hotkey << wxT("Decimal" );
+ break;
+ case WXK_DIVIDE:
+ hotkey << wxT("Divide" );
+ break;
+ case WXK_CANCEL:
+ hotkey << wxT("Cancel" );
+ break;
+ case WXK_CLEAR:
+ hotkey << wxT("Clear" );
+ break;
+ case WXK_MENU:
+ hotkey << wxT("Menu" );
+ break;
+ case WXK_PAUSE:
+ hotkey << wxT("Pause" );
+ break;
+ case WXK_CAPITAL:
+ hotkey << wxT("Capital" );
+ break;
+ case WXK_SELECT:
+ hotkey << wxT("Select" );
+ break;
+ case WXK_PRINT:
+ hotkey << wxT("Print" );
+ break;
+ case WXK_EXECUTE:
+ hotkey << wxT("Execute" );
+ break;
+ case WXK_SNAPSHOT:
+ hotkey << wxT("Snapshot" );
+ break;
+ case WXK_HELP:
+ hotkey << wxT("Help" );
+ break;
+ case WXK_NUMLOCK:
+ hotkey << wxT("Num_Lock" );
+ break;
+ case WXK_SCROLL:
+ hotkey << wxT("Scroll_Lock" );
+ break;
+ case WXK_NUMPAD_INSERT:
+ hotkey << wxT("KP_Insert" );
+ break;
+ case WXK_NUMPAD_DELETE:
+ hotkey << wxT("KP_Delete" );
+ break;
+ case WXK_NUMPAD_SPACE:
+ hotkey << wxT("KP_Space" );
+ break;
+ case WXK_NUMPAD_TAB:
+ hotkey << wxT("KP_Tab" );
+ break;
+ case WXK_NUMPAD_ENTER:
+ hotkey << wxT("KP_Enter" );
+ break;
+ case WXK_NUMPAD_F1: case WXK_NUMPAD_F2: case WXK_NUMPAD_F3:
+ case WXK_NUMPAD_F4:
+ hotkey += wxString::Format(wxT("KP_F%d"), code - WXK_NUMPAD_F1 + 1);
+ break;
+ case WXK_NUMPAD_HOME:
+ hotkey << wxT("KP_Home" );
+ break;
+ case WXK_NUMPAD_LEFT:
+ hotkey << wxT("KP_Left" );
+ break;
+ case WXK_NUMPAD_UP:
+ hotkey << wxT("KP_Up" );
+ break;
+ case WXK_NUMPAD_RIGHT:
+ hotkey << wxT("KP_Right" );
+ break;
+ case WXK_NUMPAD_DOWN:
+ hotkey << wxT("KP_Down" );
+ break;
+ case WXK_NUMPAD_PAGEUP:
+ hotkey << wxT("KP_Page_Up" );
+ break;
+ case WXK_NUMPAD_PAGEDOWN:
+ hotkey << wxT("KP_Page_Down" );
+ break;
+ case WXK_NUMPAD_END:
+ hotkey << wxT("KP_End" );
+ break;
+ case WXK_NUMPAD_BEGIN:
+ hotkey << wxT("KP_Begin" );
+ break;
+ case WXK_NUMPAD_EQUAL:
+ hotkey << wxT("KP_Equal" );
+ break;
+ case WXK_NUMPAD_MULTIPLY:
+ hotkey << wxT("KP_Multiply" );
+ break;
+ case WXK_NUMPAD_ADD:
+ hotkey << wxT("KP_Add" );
+ break;
+ case WXK_NUMPAD_SEPARATOR:
+ hotkey << wxT("KP_Separator" );
+ break;
+ case WXK_NUMPAD_SUBTRACT:
+ hotkey << wxT("KP_Subtract" );
+ break;
+ case WXK_NUMPAD_DECIMAL:
+ hotkey << wxT("KP_Decimal" );
+ break;
+ case WXK_NUMPAD_DIVIDE:
+ hotkey << wxT("KP_Divide" );
+ break;
+ case WXK_NUMPAD0: case WXK_NUMPAD1: case WXK_NUMPAD2:
+ case WXK_NUMPAD3: case WXK_NUMPAD4: case WXK_NUMPAD5:
+ case WXK_NUMPAD6: case WXK_NUMPAD7: case WXK_NUMPAD8: case WXK_NUMPAD9:
+ hotkey += wxString::Format(wxT("KP_%d"), code - WXK_NUMPAD0);
+ break;
+ case WXK_WINDOWS_LEFT:
+ hotkey << wxT("Super_L" );
+ break;
+ case WXK_WINDOWS_RIGHT:
+ hotkey << wxT("Super_R" );
+ break;
+ case WXK_WINDOWS_MENU:
+ hotkey << wxT("Menu" );
+ break;
+ case WXK_COMMAND:
+ hotkey << wxT("Command" );
+ break;
+ /* These probably wouldn't work as there is no SpecialX in gdk/keynames.txt
+ case WXK_SPECIAL1: case WXK_SPECIAL2: case WXK_SPECIAL3: case WXK_SPECIAL4:
+ case WXK_SPECIAL5: case WXK_SPECIAL6: case WXK_SPECIAL7: case WXK_SPECIAL8:
+ case WXK_SPECIAL9: case WXK_SPECIAL10: case WXK_SPECIAL11: case WXK_SPECIAL12:
+ case WXK_SPECIAL13: case WXK_SPECIAL14: case WXK_SPECIAL15: case WXK_SPECIAL16:
+ case WXK_SPECIAL17: case WXK_SPECIAL18: case WXK_SPECIAL19: case WXK_SPECIAL20:
+ hotkey += wxString::Format(wxT("Special%d"), code - WXK_SPECIAL1 + 1);
+ break;
+ */
+ // if there are any other keys wxAcceleratorEntry::Create() may
+ // return, we should process them here
+
+ default:
+ if ( code < 127 )
+ {
+ const wxString
+ name = wxGTK_CONV_BACK_SYS(gdk_keyval_name((guint)code));
+ if ( !name.empty() )
+ {
+ hotkey << name;
+ break;
+ }
+ }
+
+ wxFAIL_MSG( wxT("unknown keyboard accel") );
}
- node = node->Next();
- }
- /* Not finding anything here can be correct
- * when search the entire menu system for
- * an entry -> no error message. */
+ delete accel;
+ }
- return (wxMenuItem *) NULL;
+ return hotkey;
}
-void wxMenu::SetInvokingWindow( wxWindow *win )
-{
- m_invokingWindow = win;
-}
+#endif // wxUSE_ACCEL
-wxWindow *wxMenu::GetInvokingWindow()
+const char *wxGetStockGtkID(wxWindowID id)
{
- return m_invokingWindow;
+ #define STOCKITEM(wx,gtk) \
+ case wx: \
+ return gtk;
+
+ #define STOCKITEM_MISSING(wx) \
+ case wx: \
+ return NULL;
+
+ #if GTK_CHECK_VERSION(2,4,0)
+ #define STOCKITEM_24(wx,gtk) STOCKITEM(wx,gtk)
+ #else
+ #define STOCKITEM_24(wx,gtk) STOCKITEM_MISSING(wx)
+ #endif
+
+ #if GTK_CHECK_VERSION(2,6,0)
+ #define STOCKITEM_26(wx,gtk) STOCKITEM(wx,gtk)
+ #else
+ #define STOCKITEM_26(wx,gtk) STOCKITEM_MISSING(wx)
+ #endif
+
+ #if GTK_CHECK_VERSION(2,10,0)
+ #define STOCKITEM_210(wx,gtk) STOCKITEM(wx,gtk)
+ #else
+ #define STOCKITEM_210(wx,gtk) STOCKITEM_MISSING(wx)
+ #endif
+
+
+ switch (id)
+ {
+ STOCKITEM_26(wxID_ABOUT, GTK_STOCK_ABOUT)
+ STOCKITEM(wxID_ADD, GTK_STOCK_ADD)
+ STOCKITEM(wxID_APPLY, GTK_STOCK_APPLY)
+ STOCKITEM(wxID_BOLD, GTK_STOCK_BOLD)
+ STOCKITEM(wxID_CANCEL, GTK_STOCK_CANCEL)
+ STOCKITEM(wxID_CLEAR, GTK_STOCK_CLEAR)
+ STOCKITEM(wxID_CLOSE, GTK_STOCK_CLOSE)
+ STOCKITEM(wxID_COPY, GTK_STOCK_COPY)
+ STOCKITEM(wxID_CUT, GTK_STOCK_CUT)
+ STOCKITEM(wxID_DELETE, GTK_STOCK_DELETE)
+ STOCKITEM_26(wxID_EDIT, GTK_STOCK_EDIT)
+ STOCKITEM(wxID_FIND, GTK_STOCK_FIND)
+ STOCKITEM_26(wxID_FILE, GTK_STOCK_FILE)
+ STOCKITEM(wxID_REPLACE, GTK_STOCK_FIND_AND_REPLACE)
+ STOCKITEM(wxID_BACKWARD, GTK_STOCK_GO_BACK)
+ STOCKITEM(wxID_DOWN, GTK_STOCK_GO_DOWN)
+ STOCKITEM(wxID_FORWARD, GTK_STOCK_GO_FORWARD)
+ STOCKITEM(wxID_UP, GTK_STOCK_GO_UP)
+ STOCKITEM(wxID_HELP, GTK_STOCK_HELP)
+ STOCKITEM(wxID_HOME, GTK_STOCK_HOME)
+ STOCKITEM_24(wxID_INDENT, GTK_STOCK_INDENT)
+ STOCKITEM(wxID_INDEX, GTK_STOCK_INDEX)
+ STOCKITEM(wxID_ITALIC, GTK_STOCK_ITALIC)
+ STOCKITEM(wxID_JUSTIFY_CENTER, GTK_STOCK_JUSTIFY_CENTER)
+ STOCKITEM(wxID_JUSTIFY_FILL, GTK_STOCK_JUSTIFY_FILL)
+ STOCKITEM(wxID_JUSTIFY_LEFT, GTK_STOCK_JUSTIFY_LEFT)
+ STOCKITEM(wxID_JUSTIFY_RIGHT, GTK_STOCK_JUSTIFY_RIGHT)
+ STOCKITEM(wxID_NEW, GTK_STOCK_NEW)
+ STOCKITEM(wxID_NO, GTK_STOCK_NO)
+ STOCKITEM(wxID_OK, GTK_STOCK_OK)
+ STOCKITEM(wxID_OPEN, GTK_STOCK_OPEN)
+ STOCKITEM(wxID_PASTE, GTK_STOCK_PASTE)
+ STOCKITEM(wxID_PREFERENCES, GTK_STOCK_PREFERENCES)
+ STOCKITEM(wxID_PRINT, GTK_STOCK_PRINT)
+ STOCKITEM(wxID_PREVIEW, GTK_STOCK_PRINT_PREVIEW)
+ STOCKITEM(wxID_PROPERTIES, GTK_STOCK_PROPERTIES)
+ STOCKITEM(wxID_EXIT, GTK_STOCK_QUIT)
+ STOCKITEM(wxID_REDO, GTK_STOCK_REDO)
+ STOCKITEM(wxID_REFRESH, GTK_STOCK_REFRESH)
+ STOCKITEM(wxID_REMOVE, GTK_STOCK_REMOVE)
+ STOCKITEM(wxID_REVERT_TO_SAVED, GTK_STOCK_REVERT_TO_SAVED)
+ STOCKITEM(wxID_SAVE, GTK_STOCK_SAVE)
+ STOCKITEM(wxID_SAVEAS, GTK_STOCK_SAVE_AS)
+ STOCKITEM_210(wxID_SELECTALL, GTK_STOCK_SELECT_ALL)
+ STOCKITEM(wxID_STOP, GTK_STOCK_STOP)
+ STOCKITEM(wxID_UNDELETE, GTK_STOCK_UNDELETE)
+ STOCKITEM(wxID_UNDERLINE, GTK_STOCK_UNDERLINE)
+ STOCKITEM(wxID_UNDO, GTK_STOCK_UNDO)
+ STOCKITEM_24(wxID_UNINDENT, GTK_STOCK_UNINDENT)
+ STOCKITEM(wxID_YES, GTK_STOCK_YES)
+ STOCKITEM(wxID_ZOOM_100, GTK_STOCK_ZOOM_100)
+ STOCKITEM(wxID_ZOOM_FIT, GTK_STOCK_ZOOM_FIT)
+ STOCKITEM(wxID_ZOOM_IN, GTK_STOCK_ZOOM_IN)
+ STOCKITEM(wxID_ZOOM_OUT, GTK_STOCK_ZOOM_OUT)
+
+ default:
+ wxFAIL_MSG( _T("invalid stock item ID") );
+ break;
+ };
+
+ #undef STOCKITEM
+
+ return NULL;
}
-// Update a menu and all submenus recursively. source is the object that has
-// the update event handlers defined for it. If NULL, the menu or associated
-// window will be used.
-void wxMenu::UpdateUI(wxEvtHandler* source)
+#if wxUSE_ACCEL
+static
+bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key)
{
- if (!source && GetInvokingWindow())
- source = GetInvokingWindow()->GetEventHandler();
- if (!source)
- source = GetEventHandler();
- if (!source)
- source = this;
+ if (!id)
+ return false;
- wxNode* node = GetItems().First();
- while (node)
- {
- wxMenuItem* item = (wxMenuItem*) node->Data();
- if ( !item->IsSeparator() )
+ GtkStockItem stock_item;
+ if (gtk_stock_lookup (id, &stock_item))
{
- wxWindowID id = item->GetId();
- wxUpdateUIEvent event(id);
- event.SetEventObject( source );
-
- if (source->ProcessEvent(event))
- {
- if (event.GetSetText())
- SetLabel(id, event.GetText());
- if (event.GetSetChecked())
- Check(id, event.GetChecked());
- if (event.GetSetEnabled())
- Enable(id, event.GetEnabled());
- }
+ if (key) *key = stock_item.keyval;
+ if (mod) *mod = stock_item.modifier;
- if (item->GetSubMenu())
- item->GetSubMenu()->UpdateUI(source);
+ // some GTK stock items have zero values for the keyval;
+ // it means that they do not have an accelerator...
+ if (stock_item.keyval)
+ return true;
}
- node = node->Next();
- }
+
+ return false;
}
+#endif // wxUSE_ACCEL
+#endif // wxUSE_MENUS
projects / wxWidgets.git / blobdiff