/////////////////////////////////////////////////////////////////////////////
-// 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
+
+#include "wx/accel.h"
+#include "wx/stockitem.h"
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/mnemonics.h"
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+// 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 menuitem_activate(GtkWidget*, wxMenuItem* item);
+}
+
+#if wxUSE_ACCEL
+static void wxGetGtkAccel(const wxMenuItem*, guint*, GdkModifierType*);
+#endif
+
+static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
+{
+ event.SetEventObject( menu );
+
+ wxEvtHandler* handler = menu->GetEventHandler();
+ if (handler && handler->SafelyProcessEvent(event))
+ return;
+
+ wxWindow *win = menu->GetWindow();
+ wxCHECK_RET( win, "event for a menu without associated window?" );
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+ 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;
- m_style = style;
- m_invokingWindow = (wxWindow*) NULL;
-
- if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
- !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, _T("menubar") ))
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+ // 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 && !wxUSE_LIBHILDON2
+ if (!PreCreation( NULL, wxDefaultPosition, wxDefaultSize ) ||
+ !CreateBase( NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") ))
{
- wxFAIL_MSG( _T("wxMenuBar creation failed") );
+ 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. */
-#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();
-}
-wxMenuBar::wxMenuBar()
-{
- /* the parent window is known after wxFrame::SetMenu() */
- m_needParent = FALSE;
- m_style = 0;
- m_invokingWindow = (wxWindow*) NULL;
+ GTKApplyWidgetStyle();
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
- if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
- !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("menubar") ))
- {
- wxFAIL_MSG( _T("wxMenuBar creation failed") );
- return;
- }
-
- m_menus.DeleteContents( TRUE );
+ g_object_ref(m_widget);
- /* 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
+ for (size_t i = 0; i < n; ++i )
+ Append(menus[i], titles[i]);
+}
- m_widget = GTK_WIDGET(m_menubar);
+wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style)
+{
+ Init(n, menus, titles, style);
+}
- PostCreation();
+wxMenuBar::wxMenuBar(long style)
+{
+ Init(0, NULL, NULL, style);
}
-wxMenuBar::~wxMenuBar()
+wxMenuBar::wxMenuBar()
{
- // how to destroy a GtkItemFactory ?
+ Init(0, NULL, NULL, 0);
}
-static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
+// recursive helpers for wxMenuBar::Attach() and Detach(): they are called to
+// associate the menus with the frame they belong to or dissociate them from it
+namespace
{
- menu->SetInvokingWindow( (wxWindow*) NULL );
-#if (GTK_MINOR_VERSION > 0)
- wxWindow *top_frame = win;
- while (top_frame->GetParent()) top_frame = top_frame->GetParent();
+void
+DetachFromFrame(wxMenu* menu, wxFrame* frame)
+{
+ // support for native hot keys
+ if (menu->m_accel)
+ {
+ // Note that wxGetTopLevelParent() is really needed because this frame
+ // can be an MDI child frame which is a fake frame and not a TLW at all
+ GtkWindow * const tlw = GTK_WINDOW(wxGetTopLevelParent(frame)->m_widget);
+ if (g_slist_find(menu->m_accel->acceleratables, tlw))
+ gtk_window_remove_accel_group(tlw, menu->m_accel);
+ }
- /* support for native hot keys */
- gtk_accel_group_detach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
-#endif
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
+ while (node)
+ {
+ wxMenuItem *menuitem = node->GetData();
+ if (menuitem->IsSubMenu())
+ DetachFromFrame(menuitem->GetSubMenu(), frame);
+ node = node->GetNext();
+ }
+}
+
+void
+AttachToFrame(wxMenu* menu, wxFrame* frame)
+{
+ // support for native hot keys
+ if (menu->m_accel)
+ {
+ GtkWindow * const tlw = GTK_WINDOW(wxGetTopLevelParent(frame)->m_widget);
+ if (!g_slist_find(menu->m_accel->acceleratables, tlw))
+ gtk_window_add_accel_group(tlw, menu->m_accel);
+ }
- wxNode *node = menu->GetItems().First();
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
while (node)
{
- wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+ wxMenuItem *menuitem = node->GetData();
if (menuitem->IsSubMenu())
- wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win );
- node = node->Next();
+ AttachToFrame(menuitem->GetSubMenu(), frame);
+ node = node->GetNext();
}
}
-static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
+} // anonymous namespace
+
+void wxMenuBar::SetLayoutDirection(wxLayoutDirection dir)
{
- menu->SetInvokingWindow( win );
+ if ( dir == wxLayout_Default )
+ {
+ const wxWindow *const frame = GetFrame();
+ if ( frame )
+ {
+ // inherit layout from frame.
+ dir = frame->GetLayoutDirection();
+ }
+ else // use global layout
+ {
+ dir = wxTheApp->GetLayoutDirection();
+ }
+ }
-#if (GTK_MINOR_VERSION > 0)
- wxWindow *top_frame = win;
- while (top_frame->GetParent())
- top_frame = top_frame->GetParent();
+ if ( dir == wxLayout_Default )
+ return;
- /* support for native hot keys */
- gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
-#endif
+ GTKSetLayout(m_menubar, dir);
- wxNode *node = menu->GetItems().First();
- while (node)
+ // 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() )
{
- wxMenuItem *menuitem = (wxMenuItem*)node->Data();
- if (menuitem->IsSubMenu())
- wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win );
- node = node->Next();
+ wxMenu *const menu = node->GetData();
+ menu->SetLayoutDirection(dir);
}
}
-void wxMenuBar::SetInvokingWindow( wxWindow *win )
+wxLayoutDirection wxMenuBar::GetLayoutDirection() const
{
- 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
+ return GTKGetLayout(m_menubar);
+}
+
+void wxMenuBar::Attach(wxFrame *frame)
+{
+ wxMenuBarBase::Attach(frame);
- wxNode *node = m_menus.First();
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node)
{
- wxMenu *menu = (wxMenu*)node->Data();
- wxMenubarSetInvokingWindow( menu, win );
- node = node->Next();
+ wxMenu *menu = node->GetData();
+ AttachToFrame( menu, frame );
+ node = node->GetNext();
}
+
+ SetLayoutDirection(wxLayout_Default);
}
-void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
+void wxMenuBar::Detach()
{
- 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();
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node)
{
- wxMenu *menu = (wxMenu*)node->Data();
- wxMenubarUnsetInvokingWindow( menu, win );
- node = node->Next();
+ wxMenu *menu = node->GetData();
+ DetachFromFrame( menu, m_menuBarFrame );
+ node = node->GetNext();
}
+
+ wxMenuBarBase::Detach();
}
-void wxMenuBar::Append( wxMenu *menu, const wxString &title )
+bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
{
- m_menus.Append( menu );
+ if (wxMenuBarBase::Append(menu, title))
+ {
+ GtkAppend(menu, title);
+ return true;
+ }
+ return false;
+}
- const wxChar *pc;
+void wxMenuBar::GtkAppend(wxMenu* menu, const wxString& title, int pos)
+{
+ menu->SetLayoutDirection(GetLayoutDirection());
- /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
- wxString str;
- for ( pc = title; *pc != _T('\0'); pc++ )
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+ // 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 )
{
- if (*pc == _T('&'))
- {
-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
- str << _T('_');
- }
- else if (*pc == _T('/'))
+ 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() )
{
- str << _T('\\');
-#endif
+ GtkAppend(item->GetSubMenu(), str, pos);
+ return;
}
- else
- {
- if ( *pc == _T('_') )
- {
- // underscores must be doubled to prevent them from being
- // interpreted as accelerator character prefix by GTK
- str << *pc;
- }
- str << *pc;
- }
+ menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
+
+ g_signal_connect(menu->m_owner, "activate",
+ G_CALLBACK(menuitem_activate), item);
+ item->SetMenuItem(menu->m_owner);
}
+ else
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+ {
+ const wxString str(wxConvertMnemonicsToGTK(title));
- /* this doesn't have much effect right now */
- menu->SetTitle( str );
+ // 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 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)
+ gtk_widget_show( menu->m_owner );
- /* local buffer in multibyte form */
- wxString buf;
- buf << _T('/') << str.c_str();
+ 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 );
- char *cbuf = new char[buf.Length()+1];
- strcpy(cbuf, buf.mbc_str());
+ if ( m_menuBarFrame )
+ AttachToFrame( menu, m_menuBarFrame );
+}
- GtkItemFactoryEntry entry;
- entry.path = (gchar *)cbuf; // const_cast
- entry.accelerator = (gchar*) NULL;
- entry.callback = (GtkItemFactoryCallback) NULL;
- entry.callback_action = 0;
- entry.item_type = "<Branch>";
+bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
+{
+ if (wxMenuBarBase::Insert(pos, menu, title))
+ {
+ GtkAppend(menu, title, int(pos));
+ return true;
+ }
+ return false;
+}
- 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 ( pc = str; *pc != _T('\0'); pc++ )
+wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
+{
+ // remove the old item and insert a new one
+ wxMenu *menuOld = Remove(pos);
+ if ( menuOld && !Insert(pos, menu, title) )
{
- // 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 == _T('_'))
- pc++;
- tmp << *pc;
+ return NULL;
}
- 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() );
- gtk_widget_show( menu->m_owner );
- gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
+ // either Insert() succeeded or Remove() failed and menuOld is NULL
+ return menuOld;
+}
+
+wxMenu *wxMenuBar::Remove(size_t pos)
+{
+ wxMenu *menu = wxMenuBarBase::Remove(pos);
+ if ( !menu )
+ return NULL;
- gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner );
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu->m_owner), NULL);
+ gtk_container_remove(GTK_CONTAINER(m_menubar), menu->m_owner);
-#endif
+ gtk_widget_destroy( menu->m_owner );
+ menu->m_owner = NULL;
+
+ DetachFromFrame( menu, m_menuBarFrame );
- // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
- // adding menu later on.
- if (m_invokingWindow)
- wxMenubarSetInvokingWindow( menu, m_invokingWindow );
+ return menu;
}
static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
{
- if (menu->GetTitle() == menuString)
+ if (wxMenuItem::GetLabelText(menu->GetTitle()) == wxMenuItem::GetLabelText(menuString))
{
int res = menu->FindItem( itemString );
if (res != wxNOT_FOUND)
return res;
}
- wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
while (node)
{
- wxMenuItem *item = (wxMenuItem*)node->Data();
+ wxMenuItem *item = node->GetData();
if (item->IsSubMenu())
return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
- node = node->Next();
+ node = node->GetNext();
}
return wxNOT_FOUND;
}
-wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem ) const
-{
- if ( menuForItem )
- {
- // TODO return the pointer to the menu
-
- *menuForItem = NULL;
- }
-
- return FindItem(itemId);
-}
-
int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
{
- wxNode *node = m_menus.First();
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node)
{
- wxMenu *menu = (wxMenu*)node->Data();
+ wxMenu *menu = node->GetData();
int res = FindMenuItemRecursive( menu, menuString, itemString);
- if (res != -1) return res;
- node = node->Next();
+ if (res != -1)
+ return res;
+ node = node->GetNext();
}
- return -1;
+
+ return wxNOT_FOUND;
}
// Find a wxMenuItem using its id. Recurses down into sub-menus
static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
{
- wxMenuItem* result = menu->FindItem(id);
+ wxMenuItem* result = menu->FindChildItem(id);
- wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
while ( node && result == NULL )
{
- wxMenuItem *item = (wxMenuItem*)node->Data();
+ wxMenuItem *item = node->GetData();
if (item->IsSubMenu())
{
result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
}
- node = node->Next();
+ node = node->GetNext();
}
return result;
}
-wxMenuItem* wxMenuBar::FindItem( int id ) const
+wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const
{
wxMenuItem* result = 0;
- wxNode *node = m_menus.First();
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node && result == 0)
{
- wxMenu *menu = (wxMenu*)node->Data();
+ wxMenu *menu = node->GetData();
result = FindMenuItemByIdRecursive( menu, id );
- node = node->Next();
+ node = node->GetNext();
}
- return result;
-}
-
-void wxMenuBar::Check( int id, bool check )
-{
- wxMenuItem* item = FindMenuItemById( id );
-
- wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") );
-
- item->Check(check);
-}
-
-bool wxMenuBar::IsChecked( int id ) const
-{
- wxMenuItem* item = FindMenuItemById( id );
-
- wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked: no such item") );
-
- return item->IsChecked();
-}
-
-void wxMenuBar::Enable( int id, bool enable )
-{
- wxMenuItem* item = FindMenuItemById( id );
-
- wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") );
-
- item->Enable(enable);
-}
-
-bool wxMenuBar::IsEnabled( int id ) const
-{
- wxMenuItem* item = FindMenuItemById( id );
-
- wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled: no such item") );
-
- return item->IsEnabled();
-}
-
-wxString wxMenuBar::GetLabel( int id ) const
-{
- wxMenuItem* item = FindMenuItemById( id );
-
- wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel: no such item") );
-
- return item->GetText();
-}
-
-void wxMenuBar::SetLabel( int id, const wxString &label )
-{
- wxMenuItem* item = FindMenuItemById( id );
-
- wxCHECK_RET( item, _T("wxMenuBar::SetLabel: no such item") );
+ if ( menuForItem )
+ {
+ *menuForItem = result ? result->GetMenu() : NULL;
+ }
- item->SetText( label );
+ return result;
}
-void wxMenuBar::EnableTop( int pos, bool flag )
+void wxMenuBar::EnableTop( size_t pos, bool flag )
{
- wxNode *node = m_menus.Nth( pos );
+ wxMenuList::compatibility_iterator node = m_menus.Item( pos );
- wxCHECK_RET( node, _T("menu not found") );
+ wxCHECK_RET( node, wxT("menu not found") );
- wxMenu* menu = (wxMenu*)node->Data();
+ wxMenu* menu = node->GetData();
if (menu->m_owner)
gtk_widget_set_sensitive( menu->m_owner, flag );
}
-wxString wxMenuBar::GetLabelTop( int pos ) const
+wxString wxMenuBar::GetMenuLabel( size_t pos ) const
{
- wxNode *node = m_menus.Nth( pos );
+ wxMenuList::compatibility_iterator node = m_menus.Item( pos );
- wxCHECK_MSG( node, _T("invalid"), _T("menu not found") );
+ wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") );
- wxMenu* menu = (wxMenu*)node->Data();
+ wxMenu* menu = node->GetData();
return menu->GetTitle();
}
-void wxMenuBar::SetLabelTop( int pos, const wxString& label )
+void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label )
{
- wxNode *node = m_menus.Nth( pos );
-
- wxCHECK_RET( node, _T("menu not found") );
-
- wxMenu* menu = (wxMenu*)node->Data();
+ wxMenuList::compatibility_iterator node = m_menus.Item( pos );
- menu->SetTitle( label );
-}
+ wxCHECK_RET( node, wxT("menu not found") );
-void wxMenuBar::SetHelpString( int id, const wxString& helpString )
-{
- wxMenuItem* item = FindMenuItemById( id );
+ wxMenu* menu = node->GetData();
- wxCHECK_RET( item, _T("wxMenuBar::SetHelpString: no such item") );
+ const wxString str(wxConvertMnemonicsToGTK(label));
- item->SetHelp( helpString );
-}
-
-wxString wxMenuBar::GetHelpString( int id ) const
-{
- wxMenuItem* item = FindMenuItemById( id );
-
- 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_get_child(GTK_BIN(menu->m_owner))), wxGTK_CONV(str));
}
//-----------------------------------------------------------------------------
// "activate"
//-----------------------------------------------------------------------------
-static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
+extern "C" {
+static void menuitem_activate(GtkWidget*, wxMenuItem* item)
{
- 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) );
-
- if (!menu->IsEnabled(id))
+ if (!item->IsEnabled())
return;
- wxMenuItem* item = menu->FindItem( id );
- wxCHECK_RET( item, _T("error in menu item callback") );
+ int id = item->GetId();
+ if (id == 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())
- {
- (void) (*(menu->GetCallback())) (*menu, event);
- return;
- }
-
- if (menu->GetEventHandler()->ProcessEvent(event))
- return;
-
- wxWindow *win = menu->GetInvokingWindow();
- if (win)
- win->GetEventHandler()->ProcessEvent( event );
+ wxMenu* menu = item->GetMenu();
+ menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
+}
}
//-----------------------------------------------------------------------------
// "select"
//-----------------------------------------------------------------------------
-static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
+extern "C" {
+static void menuitem_select(GtkWidget*, wxMenuItem* item)
{
- if (g_isIdle) wxapp_install_idle_handler();
-
- int id = menu->FindMenuIdByMenuItem(widget);
-
- wxASSERT( id != -1 ); // should find it!
-
- if (!menu->IsEnabled(id))
+ if (!item->IsEnabled())
return;
- wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
- event.SetEventObject( menu );
-
- if (menu->GetEventHandler()->ProcessEvent(event))
- return;
-
- wxWindow *win = menu->GetInvokingWindow();
- if (win) win->GetEventHandler()->ProcessEvent( event );
+ wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item->GetId());
+ DoCommonMenuCallbackCode(item->GetMenu(), event);
+}
}
//-----------------------------------------------------------------------------
// "deselect"
//-----------------------------------------------------------------------------
-static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
+extern "C" {
+static void menuitem_deselect(GtkWidget*, wxMenuItem* item)
{
- if (g_isIdle) wxapp_install_idle_handler();
-
- int id = menu->FindMenuIdByMenuItem(widget);
-
- wxASSERT( id != -1 ); // should find it!
-
- if (!menu->IsEnabled(id))
+ if (!item->IsEnabled())
return;
wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
- event.SetEventObject( menu );
-
- if (menu->GetEventHandler()->ProcessEvent(event))
- return;
-
- wxWindow *win = menu->GetInvokingWindow();
- if (win)
- win->GetEventHandler()->ProcessEvent( event );
+ DoCommonMenuCallbackCode(item->GetMenu(), event);
+}
}
//-----------------------------------------------------------------------------
// wxMenuItem
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)
+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)
+{
+ m_menuItem = NULL;
+}
+
+#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)
+{
+ m_menuItem = NULL;
+}
+#endif
-wxMenuItem::wxMenuItem()
+wxMenuItem::~wxMenuItem()
{
- m_id = ID_SEPARATOR;
- m_isCheckMenu = FALSE;
- m_isChecked = FALSE;
- m_isEnabled = TRUE;
- m_subMenu = (wxMenu *) NULL;
- m_menuItem = (GtkWidget *) NULL;
+ // 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 )
+void wxMenuItem::SetItemLabel( const wxString& str )
{
- /* '\t' is the deliminator indicating a hot key */
- m_text = _T("");
- const wxChar *pc = str;
- for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ )
+#if wxUSE_ACCEL
+ if (m_menuItem)
{
- if (*pc == _T('&'))
- {
-#if (GTK_MINOR_VERSION > 0)
- m_text << _T('_');
- } else
- if (*pc == _T('/')) /* we have to filter out slashes ... */
+ // remove old accelerator
+ guint accel_key;
+ GdkModifierType accel_mods;
+ wxGetGtkAccel(this, &accel_key, &accel_mods);
+ if (accel_key)
{
- m_text << _T('\\'); /* ... and replace them with back slashes */
-#endif
+ gtk_widget_remove_accelerator(
+ m_menuItem, m_parentMenu->m_accel, accel_key, accel_mods);
}
- else
- m_text << *pc;
}
+#endif // wxUSE_ACCEL
+ wxMenuItemBase::SetItemLabel(str);
+ if (m_menuItem)
+ SetGtkLabel();
+}
- /* only GTK 1.2 knows about hot keys */
- m_hotKey = _T("");
-#if (GTK_MINOR_VERSION > 0)
- if(*pc == _T('\t'))
+void wxMenuItem::SetGtkLabel()
+{
+ const wxString text = wxConvertMnemonicsToGTK(m_text.BeforeFirst('\t'));
+ GtkLabel* label = GTK_LABEL(gtk_bin_get_child(GTK_BIN(m_menuItem)));
+ gtk_label_set_text_with_mnemonic(label, wxGTK_CONV_SYS(text));
+#if wxUSE_ACCEL
+ guint accel_key;
+ GdkModifierType accel_mods;
+ wxGetGtkAccel(this, &accel_key, &accel_mods);
+ if (accel_key)
{
- pc++;
- m_hotKey = pc;
+ gtk_widget_add_accelerator(
+ m_menuItem, "activate", m_parentMenu->m_accel,
+ accel_key, accel_mods, GTK_ACCEL_VISIBLE);
}
-#endif
+#endif // wxUSE_ACCEL
+}
- if (m_menuItem)
+void wxMenuItem::SetBitmap(const wxBitmap& bitmap)
+{
+ if (m_kind == wxITEM_NORMAL)
+ m_bitmap = bitmap;
+ else
{
- GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
- gtk_label_set( label, m_text.mb_str());
+ wxFAIL_MSG("only normal menu items can have bitmaps");
}
}
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( wxT("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 gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(m_menuItem)) != 0;
}
//-----------------------------------------------------------------------------
// wxMenu
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
-
-void
-wxMenu::Init( const wxString& title,
- long style,
- const wxFunction func
- )
+extern "C" {
+// "map" from m_menu
+static void menu_map(GtkWidget*, wxMenu* menu)
{
- 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, "<main>", m_accel );
- m_menu = gtk_item_factory_get_widget( m_factory, "<main>" );
-#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(""))
- {
- 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 = "<Tearoff>";
- 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, "<main>/tearoff" );
- }
-#endif
+ wxMenuEvent event(wxEVT_MENU_OPEN, menu->m_popupShown ? -1 : 0, menu);
+ DoCommonMenuCallbackCode(menu, event);
}
-wxMenu::~wxMenu()
+// "hide" from m_menu
+static void menu_hide(GtkWidget*, wxMenu* menu)
{
- /* how do we delete an item-factory ? */
- gtk_widget_destroy( m_menu );
-
+ wxMenuEvent event(wxEVT_MENU_CLOSE, menu->m_popupShown ? -1 : 0, menu);
+ menu->m_popupShown = false;
+ DoCommonMenuCallbackCode(menu, event);
}
-
-void wxMenu::SetTitle( const wxString& title )
-{
- // TODO Waiting for something better
- m_title = title;
}
-const wxString wxMenu::GetTitle() const
+// "can_activate_accel" from menu item
+extern "C" {
+static gboolean can_activate_accel(GtkWidget*, guint, wxMenu* menu)
{
- return m_title;
+ menu->UpdateUI();
+ // always allow our "activate" handler to be called
+ return true;
}
-
-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 = "<Separator>";
- 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, "<main>/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 )
+void wxMenu::Init()
{
- if (hotkey.IsEmpty()) return (char*) NULL;
+ m_popupShown = false;
- switch (hotkey[0])
- {
- case _T('a'): /* Alt */
- case _T('A'):
- case _T('m'): /* Meta */
- case _T('M'):
- {
- strcpy( hotbuf, "<alt>" );
- wxString last = hotkey.Right(1);
- strcat( hotbuf, last.mb_str() );
- return hotbuf;
- }
- case _T('c'): /* Ctrl */
- case _T('C'):
- case _T('s'): /* Strg, yeah man, I'm German */
- case _T('S'):
- {
- strcpy( hotbuf, "<control>" );
- wxString last = hotkey.Right(1);
- strcat( hotbuf, last.mb_str() );
- return hotbuf;
- }
- case _T('F'): /* function keys */
- {
- strcpy( hotbuf, hotkey.mb_str() );
- return hotbuf;
- }
- default:
- {
- }
- }
- return (char*) NULL;
-}
-#endif
+ m_accel = gtk_accel_group_new();
+ 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_sink(m_menu);
-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.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
- entry.callback_action = 0;
- if (checkable)
- entry.item_type = "<CheckItem>";
- else
- entry.item_type = "<Item>";
+ m_owner = NULL;
- char hotbuf[50];
- entry.accelerator = GetHotKey( mitem->GetHotKey(), hotbuf );
+ // 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_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
+ gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), tearoff);
+ }
- /* 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++ )
+ // append the title as the very first entry if we have it
+ if ( !m_title.empty() )
{
- if (*pc == _T('_')) pc++; /* skip it */
- s << *pc;
+ Append(wxGTK_TITLE_ID, m_title);
+ AppendSeparator();
}
- 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() );
+ // "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);
+}
- gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
- GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
- (gpointer)this );
+wxMenu::~wxMenu()
+{
+ // Destroying a menu generates a "hide" signal even if it's not shown
+ // currently, so disconnect it to avoid dummy wxEVT_MENU_CLOSE events
+ // generation.
+ g_signal_handlers_disconnect_by_func(m_menu, (gpointer)menu_hide, this);
- gtk_menu_append( GTK_MENU(m_menu), menuItem );
- gtk_widget_show( menuItem );
+ // see wxMenu::Init
+ g_object_unref(m_menu);
-#endif
+ // 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);
- gtk_signal_connect( GTK_OBJECT(menuItem), "select",
- GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
- (gpointer)this );
+ g_object_unref(m_accel);
+}
- gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
- GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
- (gpointer)this );
+void wxMenu::SetLayoutDirection(const wxLayoutDirection dir)
+{
+ if ( m_owner )
+ wxWindow::GTKSetLayout(m_owner, dir);
+ //else: will be called later by wxMenuBar again
+}
- mitem->SetMenuItem(menuItem);
+wxLayoutDirection wxMenu::GetLayoutDirection() const
+{
+ return wxWindow::GTKGetLayout(m_owner);
+}
- m_items.Append( mitem );
+wxString wxMenu::GetTitle() const
+{
+ return wxConvertMnemonicsFromGTK(wxMenuBase::GetTitle());
}
-void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr )
+void wxMenu::GtkAppend(wxMenuItem* mitem, int pos)
{
- wxMenuItem *mitem = new wxMenuItem();
- mitem->SetId(id);
- 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 = "<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 s = _T("<main>/");
- for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
+ GtkWidget *menuItem;
+ switch (mitem->GetKind())
{
- if (*pc == _T('_')) pc++; /* skip it */
- s << *pc;
+ case wxITEM_SEPARATOR:
+ menuItem = gtk_separator_menu_item_new();
+ break;
+ case wxITEM_CHECK:
+ menuItem = gtk_check_menu_item_new_with_label("");
+ break;
+ case wxITEM_RADIO:
+ {
+ // See if we need to create a new radio group for this item or
+ // add it to an existing one.
+ wxMenuItem* radioGroupItem = NULL;
+
+ const size_t numItems = GetMenuItemCount();
+ const size_t n = pos == -1 ? numItems - 1 : size_t(pos);
+
+ if (n != 0)
+ {
+ wxMenuItem* const itemPrev = FindItemByPosition(n - 1);
+ if ( itemPrev->GetKind() == wxITEM_RADIO )
+ {
+ // Appending an item after an existing radio item puts
+ // it into the same radio group.
+ radioGroupItem = itemPrev;
+ }
+ }
+
+ if (radioGroupItem == NULL && n != numItems - 1)
+ {
+ wxMenuItem* const itemNext = FindItemByPosition(n + 1);
+ if ( itemNext->GetKind() == wxITEM_RADIO )
+ {
+ // Inserting an item before an existing radio item
+ // also puts it into the existing radio group.
+ radioGroupItem = itemNext;
+ }
+ }
+
+ GSList* group = NULL;
+ if ( radioGroupItem )
+ {
+ group = gtk_radio_menu_item_get_group(
+ GTK_RADIO_MENU_ITEM(radioGroupItem->GetMenuItem())
+ );
+ }
+
+ menuItem = gtk_radio_menu_item_new_with_label(group, "");
+ }
+ break;
+ default:
+ wxFAIL_MSG("unexpected menu item kind");
+ // fall through
+ case wxITEM_NORMAL:
+ const wxBitmap& bitmap = mitem->GetBitmap();
+ const char* stockid;
+ if (bitmap.IsOk())
+ {
+ // always use pixbuf, because pixmap mask does not
+ // work with disabled images in some themes
+ GtkWidget* image = gtk_image_new_from_pixbuf(bitmap.GetPixbuf());
+ menuItem = gtk_image_menu_item_new_with_label("");
+ gtk_widget_show(image);
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuItem), image);
+ }
+ else if ((stockid = wxGetStockGtkID(mitem->GetId())) != NULL)
+ // use stock bitmap for this item if available on the assumption
+ // that it never hurts to follow GTK+ conventions more closely
+ menuItem = gtk_image_menu_item_new_from_stock(stockid, NULL);
+ else
+ menuItem = gtk_menu_item_new_with_label("");
+ break;
}
-
- 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());
-
- 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 );
-
- gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
-
mitem->SetMenuItem(menuItem);
- mitem->SetSubMenu(subMenu);
-
- m_items.Append( mitem );
-}
-
-void wxMenu::Append( wxMenuItem *item )
-{
- m_items.Append( item );
- GtkWidget *menuItem = (GtkWidget*) NULL;
+ gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos);
- 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_widget_show( menuItem );
- if (!item->IsSeparator())
+ if ( !mitem->IsSeparator() )
{
- 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->SetGtkLabel();
+ g_signal_connect (menuItem, "select",
+ G_CALLBACK(menuitem_select), mitem);
+ g_signal_connect (menuItem, "deselect",
+ G_CALLBACK(menuitem_deselect), mitem);
- if (!item->IsSubMenu())
+ if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK )
{
- 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 );
- item->SetMenuItem(menuItem);
-}
+ gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
-int wxMenu::FindItem( const wxString itemString ) const
-{
- wxString s = _T("");
- for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ )
- {
- if (*pc == _T('&'))
- {
- pc++; /* skip it */
-#if (GTK_MINOR_VERSION > 0)
- s << _T('_');
-#endif
+ gtk_widget_show( mitem->GetSubMenu()->m_menu );
}
- s << *pc;
- }
-
- wxNode *node = m_items.First();
- while (node)
- {
- wxMenuItem *item = (wxMenuItem*)node->Data();
- if (item->GetText() == s)
+ else
{
- return item->GetId();
+ g_signal_connect(menuItem, "can_activate_accel",
+ G_CALLBACK(can_activate_accel), this);
+ g_signal_connect (menuItem, "activate",
+ G_CALLBACK(menuitem_activate),
+ mitem);
}
- node = node->Next();
}
-
- return wxNOT_FOUND;
-}
-
-void wxMenu::Enable( int id, bool enable )
-{
- wxMenuItem *item = FindItem(id);
-
- wxCHECK_RET( item, _T("wxMenu::Enable: no such item") );
-
- item->Enable(enable);
}
-bool wxMenu::IsEnabled( int id ) const
+wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem)
{
- wxMenuItem *item = FindItem(id);
-
- wxCHECK_MSG( item, FALSE, _T("wxMenu::IsEnabled: no such item") );
-
- return item->IsEnabled();
+ if (wxMenuBase::DoAppend(mitem))
+ {
+ GtkAppend(mitem);
+ return mitem;
+ }
+ return NULL;
}
-void wxMenu::Check( int id, bool enable )
+wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
{
- wxMenuItem *item = FindItem(id);
-
- wxCHECK_RET( item, _T("wxMenu::Check: no such item") );
-
- item->Check(enable);
+ if (wxMenuBase::DoInsert(pos, item))
+ {
+ GtkAppend(item, int(pos));
+ return item;
+ }
+ return NULL;
}
-bool wxMenu::IsChecked( int id ) const
+wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
{
- wxMenuItem *item = FindItem(id);
+ if ( !wxMenuBase::DoRemove(item) )
+ return NULL;
- wxCHECK_MSG( item, FALSE, _T("wxMenu::IsChecked: no such item") );
-
- return item->IsChecked();
-}
-
-void wxMenu::SetLabel( int id, const wxString &label )
-{
- wxMenuItem *item = FindItem(id);
+ GtkWidget * const mitem = item->GetMenuItem();
+ if (!gtk_check_version(2,12,0))
+ {
+ // gtk_menu_item_remove_submenu() is deprecated since 2.12, but
+ // gtk_menu_item_set_submenu() can now be used with NULL submenu now so
+ // just do use it.
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL);
+ }
+ else // GTK+ < 2.12
+ {
+ // In 2.10 calling gtk_menu_item_set_submenu() with NULL submenu
+ // results in critical GTK+ error messages so use the old function
+ // instead.
+ gtk_menu_item_remove_submenu(GTK_MENU_ITEM(mitem));
+ }
- wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") );
+ gtk_widget_destroy(mitem);
+ item->SetMenuItem(NULL);
- item->SetText(label);
+ return item;
}
-wxString wxMenu::GetLabel( int id ) const
+void wxMenu::Attach(wxMenuBarBase *menubar)
{
- wxMenuItem *item = FindItem(id);
-
- wxCHECK_MSG( item, _T(""), _T("wxMenu::GetLabel: no such item") );
+ wxMenuBase::Attach(menubar);
- return item->GetText();
+ // inherit layout direction from menubar.
+ SetLayoutDirection(menubar->GetLayoutDirection());
}
-void wxMenu::SetHelpString( int id, const wxString& helpString )
-{
- wxMenuItem *item = FindItem(id);
-
- wxCHECK_RET( item, _T("wxMenu::SetHelpString: no such item") );
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
- item->SetHelp( helpString );
-}
+#if wxUSE_ACCEL
-wxString wxMenu::GetHelpString( int id ) const
+static wxString GetGtkHotKey( const wxMenuItem& item )
{
- wxMenuItem *item = FindItem(id);
-
- wxCHECK_MSG( item, _T(""), _T("wxMenu::GetHelpString: no such item") );
-
- return item->GetHelp();
-}
+ wxString hotkey;
-int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
-{
- wxNode *node = m_items.First();
- while (node)
+ wxAcceleratorEntry *accel = item.GetAccel();
+ if ( accel )
{
- wxMenuItem *item = (wxMenuItem*)node->Data();
- if (item->GetMenuItem() == menuItem)
- return item->GetId();
- node = node->Next();
+ 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 )
+ {
+ 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") );
+ }
+
+ delete accel;
}
- return wxNOT_FOUND;
+ return hotkey;
}
-wxMenuItem *wxMenu::FindItem(int id) const
+static void
+wxGetGtkAccel(const wxMenuItem* item, guint* accel_key, GdkModifierType* accel_mods)
{
- wxNode *node = m_items.First();
- while (node)
+ *accel_key = 0;
+ const wxString string = GetGtkHotKey(*item);
+ if (!string.empty())
+ gtk_accelerator_parse(wxGTK_CONV_SYS(string), accel_key, accel_mods);
+ else
{
- wxMenuItem *item = (wxMenuItem*)node->Data();
- if (item->GetId() == id)
+ GtkStockItem stock_item;
+ const char* stockid = wxGetStockGtkID(item->GetId());
+ if (stockid && gtk_stock_lookup(stockid, &stock_item))
{
- return item;
+ *accel_key = stock_item.keyval;
+ *accel_mods = stock_item.modifier;
}
- node = node->Next();
}
-
- /* Not finding anything here can be correct
- * when search the entire menu system for
- * an entry -> no error message. */
-
- return (wxMenuItem *) NULL;
}
+#endif // wxUSE_ACCEL
-void wxMenu::SetInvokingWindow( wxWindow *win )
+const char *wxGetStockGtkID(wxWindowID id)
{
- m_invokingWindow = win;
-}
+ #define STOCKITEM(wx,gtk) \
+ case wx: \
+ return gtk;
+
+ #if GTK_CHECK_VERSION(2,6,0)
+ #define STOCKITEM_26(wx,gtk) STOCKITEM(wx,gtk)
+ #else
+ #define STOCKITEM_26(wx,gtk)
+ #endif
+
+ #if GTK_CHECK_VERSION(2,8,0)
+ #define STOCKITEM_28(wx,gtk) STOCKITEM(wx,gtk)
+ #else
+ #define STOCKITEM_28(wx,gtk)
+ #endif
+
+ #if GTK_CHECK_VERSION(2,10,0)
+ #define STOCKITEM_210(wx,gtk) STOCKITEM(wx,gtk)
+ #else
+ #define STOCKITEM_210(wx,gtk)
+ #endif
+
+
+ switch (id)
+ {
+ STOCKITEM_26(wxID_ABOUT, GTK_STOCK_ABOUT)
+ STOCKITEM(wxID_ADD, GTK_STOCK_ADD)
+ STOCKITEM(wxID_APPLY, GTK_STOCK_APPLY)
+ STOCKITEM(wxID_BACKWARD, GTK_STOCK_GO_BACK)
+ STOCKITEM(wxID_BOLD, GTK_STOCK_BOLD)
+ STOCKITEM(wxID_BOTTOM, GTK_STOCK_GOTO_BOTTOM)
+ STOCKITEM(wxID_CANCEL, GTK_STOCK_CANCEL)
+ STOCKITEM(wxID_CDROM, GTK_STOCK_CDROM)
+ STOCKITEM(wxID_CLEAR, GTK_STOCK_CLEAR)
+ STOCKITEM(wxID_CLOSE, GTK_STOCK_CLOSE)
+ STOCKITEM(wxID_CONVERT, GTK_STOCK_CONVERT)
+ STOCKITEM(wxID_COPY, GTK_STOCK_COPY)
+ STOCKITEM(wxID_CUT, GTK_STOCK_CUT)
+ STOCKITEM(wxID_DELETE, GTK_STOCK_DELETE)
+ STOCKITEM(wxID_DOWN, GTK_STOCK_GO_DOWN)
+ STOCKITEM_26(wxID_EDIT, GTK_STOCK_EDIT)
+ STOCKITEM(wxID_EXECUTE, GTK_STOCK_EXECUTE)
+ STOCKITEM(wxID_EXIT, GTK_STOCK_QUIT)
+ STOCKITEM_26(wxID_FILE, GTK_STOCK_FILE)
+ STOCKITEM(wxID_FIND, GTK_STOCK_FIND)
+ STOCKITEM(wxID_FIRST, GTK_STOCK_GOTO_FIRST)
+ STOCKITEM(wxID_FLOPPY, GTK_STOCK_FLOPPY)
+ STOCKITEM(wxID_FORWARD, GTK_STOCK_GO_FORWARD)
+ STOCKITEM(wxID_HARDDISK, GTK_STOCK_HARDDISK)
+ STOCKITEM(wxID_HELP, GTK_STOCK_HELP)
+ STOCKITEM(wxID_HOME, GTK_STOCK_HOME)
+ STOCKITEM(wxID_INDENT, GTK_STOCK_INDENT)
+ STOCKITEM(wxID_INDEX, GTK_STOCK_INDEX)
+ STOCKITEM_28(wxID_INFO, GTK_STOCK_INFO)
+ STOCKITEM(wxID_ITALIC, GTK_STOCK_ITALIC)
+ STOCKITEM(wxID_JUMP_TO, GTK_STOCK_JUMP_TO)
+ 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_LAST, GTK_STOCK_GOTO_LAST)
+ STOCKITEM(wxID_NETWORK, GTK_STOCK_NETWORK)
+ 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_PREVIEW, GTK_STOCK_PRINT_PREVIEW)
+ STOCKITEM(wxID_PRINT, GTK_STOCK_PRINT)
+ STOCKITEM(wxID_PROPERTIES, GTK_STOCK_PROPERTIES)
+ STOCKITEM(wxID_REDO, GTK_STOCK_REDO)
+ STOCKITEM(wxID_REFRESH, GTK_STOCK_REFRESH)
+ STOCKITEM(wxID_REMOVE, GTK_STOCK_REMOVE)
+ STOCKITEM(wxID_REPLACE, GTK_STOCK_FIND_AND_REPLACE)
+ 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_SELECT_COLOR, GTK_STOCK_SELECT_COLOR)
+ STOCKITEM(wxID_SELECT_FONT, GTK_STOCK_SELECT_FONT)
+ STOCKITEM(wxID_SORT_ASCENDING, GTK_STOCK_SORT_ASCENDING)
+ STOCKITEM(wxID_SORT_DESCENDING, GTK_STOCK_SORT_DESCENDING)
+ STOCKITEM(wxID_SPELL_CHECK, GTK_STOCK_SPELL_CHECK)
+ STOCKITEM(wxID_STOP, GTK_STOCK_STOP)
+ STOCKITEM(wxID_STRIKETHROUGH, GTK_STOCK_STRIKETHROUGH)
+ STOCKITEM(wxID_TOP, GTK_STOCK_GOTO_TOP)
+ STOCKITEM(wxID_UNDELETE, GTK_STOCK_UNDELETE)
+ STOCKITEM(wxID_UNDERLINE, GTK_STOCK_UNDERLINE)
+ STOCKITEM(wxID_UNDO, GTK_STOCK_UNDO)
+ STOCKITEM(wxID_UNINDENT, GTK_STOCK_UNINDENT)
+ STOCKITEM(wxID_UP, GTK_STOCK_GO_UP)
+ 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)
-wxWindow *wxMenu::GetInvokingWindow()
-{
- return m_invokingWindow;
-}
+ default:
+ break;
+ };
-// 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 (!source && GetInvokingWindow())
- source = GetInvokingWindow()->GetEventHandler();
- if (!source)
- source = GetEventHandler();
- if (!source)
- source = this;
-
- wxNode* node = GetItems().First();
- while (node)
- {
- wxMenuItem* item = (wxMenuItem*) node->Data();
- if ( !item->IsSeparator() )
- {
- 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 (item->GetSubMenu())
- item->GetSubMenu()->UpdateUI(source);
- }
- node = node->Next();
- }
+ #undef STOCKITEM
+
+ return NULL;
}
+#endif // wxUSE_MENUS
projects / wxWidgets.git / blobdiff