/////////////////////////////////////////////////////////////////////////////
-// 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
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #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 "wx/bitmap.h"
-#if wxUSE_ACCEL
- #include "wx/accel.h"
-#endif // wxUSE_ACCEL
+#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 <gdk/gdkkeysyms.h>
+#include "wx/gtk/private/mnemonics.h"
// FIXME: is this right? somehow I don't think so (VZ)
-#ifdef __WXGTK20__
- #include <glib-object.h>
-
- #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
- #define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
- #define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
-
- #define ACCEL_OBJECT GtkWindow
- #define ACCEL_OBJECTS(a) (a)->acceleratables
- #define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
-#else // GTK+ 1.x
- #define ACCEL_OBJECT GtkObject
- #define ACCEL_OBJECTS(a) (a)->attach_objects
- #define ACCEL_OBJ_CAST(obj) GTK_OBJECT(obj)
-#endif
+
+#define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
+#define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
+//#define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
+
+#define ACCEL_OBJECT GtkWindow
+#define ACCEL_OBJECTS(a) (a)->acceleratables
+#define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
// 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);
+}
+
//-----------------------------------------------------------------------------
// idle system
//-----------------------------------------------------------------------------
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
#if wxUSE_ACCEL
-static wxString GetHotKey( const wxMenuItem& item );
+static wxString GetGtkHotKey( const wxMenuItem& item );
#endif
//-----------------------------------------------------------------------------
-// substitute for missing GtkPixmapMenuItem
+// activate message from GTK
//-----------------------------------------------------------------------------
-#ifndef __WXGTK20__
-
-#define GTK_TYPE_PIXMAP_MENU_ITEM (gtk_pixmap_menu_item_get_type ())
-#define GTK_PIXMAP_MENU_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PIXMAP_MENU_ITEM, GtkPixmapMenuItem))
-#define GTK_PIXMAP_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PIXMAP_MENU_ITEM, GtkPixmapMenuItemClass))
-#define GTK_IS_PIXMAP_MENU_ITEM(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_PIXMAP_MENU_ITEM))
-#define GTK_IS_PIXMAP_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PIXMAP_MENU_ITEM))
-//#define GTK_PIXMAP_MENU_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PIXMAP_MENU_ITEM))
-#define GTK_PIXMAP_MENU_ITEM_GET_CLASS(obj) (GTK_PIXMAP_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj)))
-
-#ifndef GTK_MENU_ITEM_GET_CLASS
-#define GTK_MENU_ITEM_GET_CLASS(obj) (GTK_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj)))
-#endif
-
-typedef struct _GtkPixmapMenuItem GtkPixmapMenuItem;
-typedef struct _GtkPixmapMenuItemClass GtkPixmapMenuItemClass;
-
-struct _GtkPixmapMenuItem
+static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
{
- GtkMenuItem menu_item;
-
- GtkWidget *pixmap;
-};
+ event.SetEventObject( menu );
-struct _GtkPixmapMenuItemClass
-{
- GtkMenuItemClass parent_class;
+ wxEvtHandler* handler = menu->GetEventHandler();
+ if (handler && handler->ProcessEvent(event))
+ return;
- guint orig_toggle_size;
- guint have_pixmap_count;
-};
+ wxWindow *win = menu->GetInvokingWindow();
+ if (win)
+ win->GetEventHandler()->ProcessEvent( event );
+}
+extern "C" {
-GtkType gtk_pixmap_menu_item_get_type (void);
-GtkWidget* gtk_pixmap_menu_item_new (void);
-void gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
- GtkWidget *pixmap);
-#endif // GTK 2.0
+static void
+gtk_menu_open_callback(GtkWidget * WXUNUSED(widget), wxMenu *menu)
+{
+ wxMenuEvent event(wxEVT_MENU_OPEN, -1, menu);
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+ DoCommonMenuCallbackCode(menu, event);
+}
-static wxString wxReplaceUnderscore( const wxString& title )
+static void
+gtk_menu_close_callback(GtkWidget * WXUNUSED(widget), wxMenuBar *menubar)
{
- const wxChar *pc;
-
- // GTK 1.2 wants to have "_" instead of "&" for accelerators
- wxString str;
- pc = title;
- while (*pc != wxT('\0'))
+ if ( !menubar->GetMenuCount() )
{
- if ((*pc == wxT('&')) && (*(pc+1) == wxT('&')))
- {
- // "&" is doubled to indicate "&" instead of accelerator
- ++pc;
- str << wxT('&');
- }
- else if (*pc == wxT('&'))
- {
- str << wxT('_');
- }
- else
- {
- if ( *pc == wxT('_') )
- {
- // underscores must be doubled to prevent them from being
- // interpreted as accelerator character prefix by GTK
- str << *pc;
- }
-
- str << *pc;
- }
- ++pc;
+ // if menubar is empty we can't call GetMenu(0) below
+ return;
}
- // wxPrintf( wxT("before %s after %s\n"), title.c_str(), str.c_str() );
+ wxMenuEvent event( wxEVT_MENU_CLOSE, -1, NULL );
- return str;
+ DoCommonMenuCallbackCode(menubar->GetMenu(0), event);
}
-//-----------------------------------------------------------------------------
-// activate message from GTK
-//-----------------------------------------------------------------------------
-
-static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu )
-{
- if (g_isIdle) wxapp_install_idle_handler();
-
- wxMenuEvent event( wxEVT_MENU_OPEN, -1, menu );
- event.SetEventObject( menu );
-
- wxEvtHandler* handler = menu->GetEventHandler();
- if (handler && handler->ProcessEvent(event))
- return;
-
- wxWindow *win = menu->GetInvokingWindow();
- if (win) win->GetEventHandler()->ProcessEvent( event );
}
//-----------------------------------------------------------------------------
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, wxT("menubar") ))
+ 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;
}
m_menubar = gtk_menu_bar_new();
-#ifndef __WXGTK20__
- m_accel = gtk_accel_group_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();
ApplyWidgetStyle();
+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
for (size_t i = 0; i < n; ++i )
Append(menus[i], titles[i]);
+
+ // VZ: for some reason connecting to menus "deactivate" doesn't work (we
+ // don't get it when the menu is dismissed by clicking outside the
+ // toolbar) so we connect to the global one, even if it means that we
+ // can't pass the menu which was closed in wxMenuEvent object
+ g_signal_connect (m_menubar, "deactivate",
+ G_CALLBACK (gtk_menu_close_callback), this);
}
wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style)
while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
-#ifndef __WXGTK20__
// support for native hot keys
- gtk_accel_group_detach( menu->m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) );
-#endif
+ ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget);
+ if ( menu->m_accel && g_slist_find( ACCEL_OBJECTS(menu->m_accel), obj ) )
+ gtk_accel_group_detach( menu->m_accel, obj );
wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
while (node)
while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
-#ifndef __WXGTK20__
- // support for native key accelerators indicated by underscroes
- ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget);
- if ( !g_slist_find( ACCEL_OBJECTS(m_accel), obj ) )
- gtk_accel_group_attach( m_accel, obj );
-#endif
-
wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node)
{
}
}
+void wxMenuBar::SetLayoutDirection(wxLayoutDirection dir)
+{
+ 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 ( dir == wxLayout_Default )
+ return;
+
+ GTKSetLayout(m_menubar, dir);
+
+ // 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);
+ }
+}
+
+wxLayoutDirection wxMenuBar::GetLayoutDirection() const
+{
+ return GTKGetLayout(m_menubar);
+}
+
+void wxMenuBar::Attach(wxFrame *frame)
+{
+ wxMenuBarBase::Attach(frame);
+
+ SetLayoutDirection(wxLayout_Default);
+}
+
void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
{
m_invokingWindow = (wxWindow*) NULL;
while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
-#ifndef __WXGTK20__
- // support for native key accelerators indicated by underscroes
- gtk_accel_group_detach( m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) );
-#endif
-
wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node)
{
bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
{
if ( !wxMenuBarBase::Append( menu, title ) )
- return FALSE;
+ return false;
return GtkAppend(menu, title);
}
bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
{
- wxString str( wxReplaceUnderscore( title ) );
+ menu->SetLayoutDirection(GetLayoutDirection());
- // This doesn't have much effect right now.
- menu->SetTitle( str );
+#if wxUSE_LIBHILDON
+ // if the menu has only one item, append it directly to the top level menu
+ // instead of inserting a useless submenu
+ if ( menu->GetMenuItemCount() == 1 )
+ {
+ wxMenuItem * const item = menu->FindItemByPosition(0);
+
+ // remove both mnemonics and accelerator: neither is useful under Maemo
+ const wxString str(wxStripMenuCodes(item->GetItemLabel()));
- // The "m_owner" is the "menu item"
-#ifdef __WXGTK20__
- menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
-#else
- menu->m_owner = gtk_menu_item_new_with_label( wxGTK_CONV( str ) );
- GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
- // set new text
- gtk_label_set_text( label, wxGTK_CONV( str ) );
- // reparse key accel
- guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( str ) );
- if (accel_key != GDK_VoidSymbol)
+ 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
{
- gtk_widget_add_accelerator (menu->m_owner,
- "activate_item",
- m_accel,//gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menubar)),
- accel_key,
- GDK_MOD1_MASK,
- GTK_ACCEL_LOCKED);
+ const wxString str(wxConvertMnemonicsToGTK(title));
+
+ // 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 );
}
-#endif
gtk_widget_show( menu->m_owner );
- gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
-
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 );
- gtk_signal_connect( GTK_OBJECT(menu->m_owner), "activate",
- GTK_SIGNAL_FUNC(gtk_menu_open_callback),
- (gpointer)menu );
+ g_signal_connect (menu->m_owner, "activate",
+ G_CALLBACK (gtk_menu_open_callback),
+ menu);
// m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
// addings menu later on.
if (m_invokingWindow)
- {
wxMenubarSetInvokingWindow( menu, m_invokingWindow );
- // OPTIMISE ME: we should probably cache this, or pass it
- // directly, but for now this is a minimal
- // change to validate the new dynamic sizing.
- // see (and refactor :) similar code in Remove
- // below.
-
- wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
-
- if( frame )
- frame->UpdateMenuBarSize();
- }
-
- return TRUE;
+ return true;
}
bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
{
if ( !wxMenuBarBase::Insert(pos, menu, title) )
- return FALSE;
+ return false;
// TODO
if ( !GtkAppend(menu, title, (int)pos) )
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
menu->m_owner = NULL;
if (m_invokingWindow)
- {
- // OPTIMISE ME: see comment in GtkAppend
- wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
-
- if( frame )
- frame->UpdateMenuBarSize();
- }
+ wxMenubarUnsetInvokingWindow( menu, m_invokingWindow );
return menu;
}
static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
{
- if (wxMenuItem::GetLabelFromText(menu->GetTitle()) == wxMenuItem::GetLabelFromText(menuString))
+ if (wxMenuItem::GetLabelText(wxConvertMnemonicsFromGTK(menu->GetTitle())) == wxMenuItem::GetLabelText(menuString))
{
int res = menu->FindItem( itemString );
if (res != wxNOT_FOUND)
gtk_widget_set_sensitive( menu->m_owner, flag );
}
-wxString wxMenuBar::GetLabelTop( size_t pos ) const
+wxString wxMenuBar::GetMenuLabel( size_t pos ) const
{
wxMenuList::compatibility_iterator node = m_menus.Item( pos );
wxMenu* menu = node->GetData();
- wxString label;
- wxString text( menu->GetTitle() );
- for ( const wxChar *pc = text.c_str(); *pc; pc++ )
- {
- if ( *pc == wxT('_') )
- {
- // '_' is the escape character for GTK+
- continue;
- }
-
- // don't remove ampersands '&' since if we have them in the menu title
- // it means that they were doubled to indicate "&" instead of accelerator
-
- label += *pc;
- }
-
- return label;
+ return wxConvertMnemonicsFromGTK(menu->GetTitle());
}
-void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
+void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label )
{
wxMenuList::compatibility_iterator node = m_menus.Item( pos );
wxMenu* menu = node->GetData();
- wxString str( wxReplaceUnderscore( label ) );
+ const wxString str(wxConvertMnemonicsToGTK(label));
menu->SetTitle( str );
if (menu->m_owner)
- {
- GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
-
- /* set new text */
- gtk_label_set( label, wxGTK_CONV( str ) );
-
- /* reparse key accel */
- (void)gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( str ) );
- gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );
- }
-
+ 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 */
commandEvent.SetEventObject(frame);
if (item->IsCheckable())
commandEvent.SetInt(item->IsChecked());
- commandEvent.SetEventObject(menu);
frame->GetEventHandler()->ProcessEvent(commandEvent);
}
menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
}
}
+}
//-----------------------------------------------------------------------------
// "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!
wxWindow *win = menu->GetInvokingWindow();
if (win) win->GetEventHandler()->ProcessEvent( 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!
if (win)
win->GetEventHandler()->ProcessEvent( event );
}
+}
//-----------------------------------------------------------------------------
// wxMenuItem
// return the menu item text without any menu accels
/* static */
-wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+
+wxString wxMenuItemBase::GetLabelText(const wxString& text)
{
+ // 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++ )
continue;
}
-#ifdef __WXGTK20__
if ( *pc == wxT('\\') )
{
// GTK 2.0 escapes "xxx/xxx" to "xxx\/xxx"
label += *pc;
continue;
}
-#endif
if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) )
{
label += *pc;
}
- // wxPrintf( wxT("GetLabelFromText(): text %s label %s\n"), text.c_str(), label.c_str() );
+ // wxPrintf( wxT("GetLabelText(): text %s label %s\n"), text.c_str(), label.c_str() );
return label;
+#endif
}
-void wxMenuItem::SetText( const wxString& str )
+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.BeforeFirst('\t'));
+ oldLabel = wxStripMenuCodes(oldLabel);
oldLabel.Replace(wxT("_"), wxT(""));
- wxString label1 = wxStripMenuCodes(str.BeforeFirst('\t'));
- if (oldLabel == label1)
- return;
+ wxString label1 = wxStripMenuCodes(str);
+#if wxUSE_ACCEL
+ wxString oldhotkey = GetHotKey(); // Store the old hotkey in Ctrl-foo format
+ wxCharBuffer oldbuf = wxGTK_CONV_SYS( GetGtkHotKey(*this) ); // and as <control>foo
+#endif // wxUSE_ACCEL
DoSetText(str);
+#if wxUSE_ACCEL
+ if (oldLabel == label1 &&
+ oldhotkey == GetHotKey()) // Make sure we can change a hotkey even if the label is unaltered
+ return;
+
if (m_menuItem)
{
GtkLabel *label;
else
label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
-#ifdef __WXGTK20__
- gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV(m_text) );
-#else
- // set new text
- gtk_label_set( label, wxGTK_CONV( m_text ) );
+ // 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());
- // reparse key accel
- (void)gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV(m_text) );
- gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );
-#endif
+ // need & => _ conversion
+ text = GTKProcessMenuItemLabel(text, NULL);
+ }
+
+ gtk_label_set_text_with_mnemonic( GTK_LABEL(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_FILECTRL
}
-// it's valid for this function to be called even if m_menuItem == NULL
-void wxMenuItem::DoSetText( const wxString& str )
+// 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
- m_text.Empty();
- const wxChar *pc = str;
- while ( (*pc != wxT('\0')) && (*pc != wxT('\t')) )
+ wxString::const_iterator pc = str.begin();
+ while ( pc != str.end() && *pc != wxT('\t') )
{
- if ((*pc == wxT('&')) && (*(pc+1) == wxT('&')))
- {
- // "&" is doubled to indicate "&" instead of accelerator
- ++pc;
- m_text << wxT('&');
- }
- else if (*pc == wxT('&'))
+ if (*pc == wxT('&'))
{
- m_text << 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
{
- m_text << wxT("__");
+ text << wxT("__");
}
else
{
- m_text << *pc;
+ text << *pc;
}
++pc;
}
- // wxPrintf( wxT("DoSetText(): str %s m_text %s\n"), str.c_str(), m_text.c_str() );
-
- m_hotKey = wxT("");
-
- if(*pc == wxT('\t'))
+ if (hotKey)
{
- pc++;
- m_hotKey = pc;
+ 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
if ( !GetHotKey() )
{
// nothing
- return (wxAcceleratorEntry *)NULL;
+ return NULL;
}
- // as wxGetAccelFromString() looks for TAB, insert a dummy one here
+ // accelerator parsing code looks for them after a TAB, so insert a dummy
+ // one here
wxString label;
label << wxT('\t') << GetHotKey();
- return wxGetAccelFromString(label);
+ return wxAcceleratorEntry::Create(label);
}
#endif // wxUSE_ACCEL
{
case wxITEM_CHECK:
case wxITEM_RADIO:
- gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
+ gtk_check_menu_item_set_active( (GtkCheckMenuItem*)m_menuItem, (gint)check );
break;
default:
bool wxMenuItem::IsChecked() const
{
- wxCHECK_MSG( m_menuItem, FALSE, wxT("invalid menu item") );
+ wxCHECK_MSG( m_menuItem, false, wxT("invalid menu item") );
- wxCHECK_MSG( IsCheckable(), FALSE,
+ wxCHECK_MSG( IsCheckable(), false,
wxT("can't get state of uncheckable item!") );
return ((GtkCheckMenuItem*)m_menuItem)->active != 0;
{
GtkWidget *tearoff = gtk_tearoff_menu_item_new();
- gtk_menu_append(GTK_MENU(m_menu), tearoff);
+ gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), tearoff);
}
m_prevRadio = NULL;
wxMenu::~wxMenu()
{
- WX_CLEAR_LIST(wxMenuItemList, m_items);
-
if ( GTK_IS_WIDGET( m_menu ))
{
// see wxMenu::Init
- gtk_widget_unref( m_menu );
+ gtk_widget_unref( m_menu );
+ g_object_unref( m_accel );
+
// 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 );
}
+
+ // This must come after we release GTK resources above. Otherwise, GTK will
+ // give warnings/errors when attempting to free accelerator resources from
+ // child items that just were destroyed (the m_menu widget can contain
+ // references to accelerators in child items. Problem detected when removing
+ // a menu from a wxMenuBar, and the removed menu had submenus with accelerators.)
+ WX_CLEAR_LIST(wxMenuItemList, m_items);
+}
+
+void wxMenu::SetLayoutDirection(const wxLayoutDirection dir)
+{
+ if ( m_owner )
+ wxWindow::GTKSetLayout(m_owner, dir);
+ //else: will be called later by wxMenuBar again
+}
+
+wxLayoutDirection wxMenu::GetLayoutDirection() const
+{
+ return wxWindow::GTKGetLayout(m_owner);
}
bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
{
GtkWidget *menuItem;
- if ( mitem->IsSeparator() )
- {
-#ifdef __WXGTK20__
- menuItem = gtk_separator_menu_item_new();
-#else
- // TODO
- menuItem = gtk_menu_item_new();
-#endif
- 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);
- }
- else if ( mitem->IsSubMenu() )
- {
- // text has "_" instead of "&" after mitem->SetText()
- wxString text( mitem->GetText() );
-
-#ifdef __WXGTK20__
- menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );
-#else
- menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) );
- GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child );
- // set new text
- gtk_label_set_text( label, wxGTK_CONV( text ) );
- // reparse key accel
- guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
- if (accel_key != GDK_VoidSymbol)
- {
- gtk_widget_add_accelerator (menuItem,
- "activate_item",
- gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)),
- accel_key,
- GDK_MOD1_MASK,
- GTK_ACCEL_LOCKED);
- }
-#endif
-
- gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
- 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);
+ // 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());
- gtk_widget_show( mitem->GetSubMenu()->m_menu );
+ // 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);
- // 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);
+ // need & => _ conversion
+ text = wxMenuItem::GTKProcessMenuItemLabel(text, NULL);
+ }
- m_prevRadio = NULL;
+ if ( mitem->IsSeparator() )
+ {
+ menuItem = gtk_separator_menu_item_new();
}
- else if (mitem->GetBitmap().Ok())
+ else if ( mitem->GetBitmap().Ok() ||
+ (mitem->GetKind() == wxITEM_NORMAL && isstock) )
{
- wxString text = mitem->GetText();
- const wxBitmap *bitmap = &mitem->GetBitmap();
+ wxBitmap bitmap(mitem->GetBitmap());
-#ifdef __WXGTK20__
- menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );
+ menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );
GtkWidget *image;
- if (bitmap->HasPixbuf())
+ if ( !bitmap.Ok() )
{
- image = gtk_image_new_from_pixbuf(bitmap->GetPixbuf());
+ // 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
+ else // we have a custom bitmap
{
- 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 );
- }
-
- gtk_widget_show(image);
+ wxASSERT_MSG( mitem->GetKind() == wxITEM_NORMAL,
+ _T("only normal menu items can have bitmaps") );
- gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(menuItem), image );
-
- gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
- GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
- (gpointer)this );
-
- 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);
-#else
- GdkPixmap *gdk_pixmap = bitmap->GetPixmap();
- GdkBitmap *gdk_bitmap = bitmap->GetMask() ? bitmap->GetMask()->GetBitmap() : (GdkBitmap*) NULL;
-
- menuItem = gtk_pixmap_menu_item_new ();
- GtkWidget *label = gtk_accel_label_new ( wxGTK_CONV( text ) );
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_container_add (GTK_CONTAINER (menuItem), label);
-
- gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuItem);
- guint accel_key;
- GdkModifierType accel_mods;
-
- // accelerator for the item, as specified by its label
- // (ex. Ctrl+O for open)
- gtk_accelerator_parse(GetHotKey(*mitem).c_str(), &accel_key,
- &accel_mods);
- if (accel_key != GDK_VoidSymbol)
- {
- gtk_widget_add_accelerator (menuItem,
- "activate_item",
- m_accel,
- accel_key, accel_mods,
- GTK_ACCEL_VISIBLE);
+ 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 );
+ }
}
- // accelerator for the underlined char (ex ALT+F for the File menu)
- accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
- if (accel_key != GDK_VoidSymbol)
+ if ( image )
{
- gtk_widget_add_accelerator (menuItem,
- "activate_item",
- gtk_menu_ensure_uline_accel_group(GTK_MENU (m_menu)),
- accel_key,
- GDK_MOD1_MASK,
- GTK_ACCEL_LOCKED);
- }
+ gtk_widget_show(image);
- gtk_widget_show (label);
-
- mitem->SetLabelWidget(label);
-
- GtkWidget* pixmap = gtk_pixmap_new( gdk_pixmap, gdk_bitmap );
- gtk_widget_show(pixmap);
- gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM( menuItem ), pixmap);
-
- gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
- GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
- (gpointer)this );
-
- if (pos == -1)
- gtk_menu_append( GTK_MENU(m_menu), menuItem );
- else
- gtk_menu_insert( GTK_MENU(m_menu), menuItem, pos );
- gtk_widget_show( menuItem );
-#endif
+ gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(menuItem), image );
+ }
m_prevRadio = NULL;
}
else // a normal item
{
- // text has "_" instead of "&" after mitem->SetText() so don't use it
- wxString text( mitem->GetText() );
+ // NB: 'text' variable has "_" instead of "&" after mitem->SetItemLabel()
+ // so don't use it
switch ( mitem->GetKind() )
{
case wxITEM_CHECK:
{
-#ifdef __WXGTK20__
- menuItem = gtk_check_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );
-#else
- menuItem = gtk_check_menu_item_new_with_label( wxGTK_CONV( text ) );
- GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child );
- // set new text
- gtk_label_set_text( label, wxGTK_CONV( text ) );
- // reparse key accel
- guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
- if (accel_key != GDK_VoidSymbol)
- {
- gtk_widget_add_accelerator (menuItem,
- "activate_item",
- gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)),
- accel_key,
- GDK_MOD1_MASK,
- GTK_ACCEL_LOCKED);
- }
-#endif
+ menuItem = gtk_check_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );
m_prevRadio = NULL;
break;
}
if ( m_prevRadio == NULL )
{
// start of a new radio group
-#ifdef __WXGTK20__
- m_prevRadio = menuItem = gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV( text ) );
-#else
- m_prevRadio = menuItem = gtk_radio_menu_item_new_with_label( group, wxGTK_CONV( text ) );
- GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child );
- // set new text
- gtk_label_set_text( label, wxGTK_CONV( text ) );
- // reparse key accel
- guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
- if (accel_key != GDK_VoidSymbol)
- {
- gtk_widget_add_accelerator (menuItem,
- "activate_item",
- gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)),
- accel_key,
- GDK_MOD1_MASK,
- GTK_ACCEL_LOCKED);
- }
-#endif
+ m_prevRadio = menuItem =
+ gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV_SYS( text ) );
}
else // continue the radio group
{
-#ifdef __WXGTK20__
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( text ) );
-#else
- group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (m_prevRadio));
- m_prevRadio = menuItem = gtk_radio_menu_item_new_with_label( group, wxGTK_CONV( text ) );
- GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child );
- // set new text
- gtk_label_set_text( label, wxGTK_CONV( text ) );
- // reparse key accel
- guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
- if (accel_key != GDK_VoidSymbol)
- {
- gtk_widget_add_accelerator (menuItem,
- "activate_item",
- gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)),
- accel_key,
- GDK_MOD1_MASK,
- GTK_ACCEL_LOCKED);
- }
-#endif
+ m_prevRadio = menuItem =
+ gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV_SYS( text ) );
}
break;
}
case wxITEM_NORMAL:
{
-#ifdef __WXGTK20__
- menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );
-#else
- menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) );
- GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child );
- // set new text
- gtk_label_set_text( label, wxGTK_CONV( text ) );
- // reparse key accel
- guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
- if (accel_key != GDK_VoidSymbol)
- {
- gtk_widget_add_accelerator (menuItem,
- "activate_item",
- gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)),
- accel_key,
- GDK_MOD1_MASK,
- GTK_ACCEL_LOCKED);
- }
-#endif
+ menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );
m_prevRadio = NULL;
break;
}
}
- gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
- GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
- (gpointer)this );
-
- 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);
}
+#if wxUSE_ACCEL
guint accel_key;
GdkModifierType accel_mods;
- wxCharBuffer buf = wxGTK_CONV( GetHotKey(*mitem) );
-
- // wxPrintf( wxT("item: %s hotkey %s\n"), mitem->GetText().c_str(), GetHotKey(*mitem).c_str() );
+ wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*mitem) );
- gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
- if (accel_key != 0)
+ if (buf[(size_t)0] != '\0')
{
- gtk_widget_add_accelerator (GTK_WIDGET(menuItem),
- "activate",
- m_accel,
- accel_key,
- accel_mods,
- GTK_ACCEL_VISIBLE);
+ 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);
+ }
}
+ 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_add_accelerator( menuItem,
+ "activate",
+ m_accel,
+ accel_key,
+ accel_mods,
+ GTK_ACCEL_VISIBLE);
+ }
+#endif // wxUSE_FILECTRL
+
+ 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);
gtk_widget_show( menuItem );
{
wxASSERT_MSG( menuItem, wxT("invalid menuitem") );
- gtk_signal_connect( GTK_OBJECT(menuItem), "select",
- GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
- (gpointer)this );
+ g_signal_connect (menuItem, "select",
+ G_CALLBACK (gtk_menu_hilight_callback), this);
+ g_signal_connect (menuItem, "deselect",
+ G_CALLBACK (gtk_menu_nolight_callback), this);
+
+ if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK )
+ {
+ gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
- gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
- GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
- (gpointer)this );
+ gtk_widget_show( mitem->GetSubMenu()->m_menu );
+
+ // if adding a submenu to a menu already existing in the menu bar, we
+ // must set invoking window to allow processing events from this
+ // submenu
+ if ( m_invokingWindow )
+ wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
+ }
+ else
+ {
+ g_signal_connect (menuItem, "activate",
+ G_CALLBACK (gtk_menu_clicked_callback),
+ this);
+ }
}
mitem->SetMenuItem(menuItem);
// gtk_widget_lock_accelerators(mitem->GetMenuItem());
}
- return TRUE;
+ return true;
}
wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem)
{
wxMenuItem *item = node->GetData();
if (item->GetMenuItem() == menuItem)
- return item->GetId();
+ return item->GetId();
node = node->GetNext();
}
return wxNOT_FOUND;
}
+void wxMenu::Attach(wxMenuBarBase *menubar)
+{
+ wxMenuBase::Attach(menubar);
+
+ // inherit layout direction from menubar.
+ SetLayoutDirection(menubar->GetLayoutDirection());
+}
+
// ----------------------------------------------------------------------------
// helpers
// ----------------------------------------------------------------------------
#if wxUSE_ACCEL
-static wxString GetHotKey( const wxMenuItem& item )
+static wxString GetGtkHotKey( const wxMenuItem& item )
{
wxString hotkey;
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_NUMPAD_INSERT:
- hotkey << wxT("KP_Insert" );
- break;
- case WXK_NUMPAD_DELETE:
- hotkey << wxT("KP_Delete" );
- break;
- case WXK_INSERT:
+ case WXK_INSERT:
hotkey << wxT("Insert" );
break;
case WXK_DELETE:
hotkey << wxT("Down" );
break;
case WXK_PAGEUP:
- case WXK_PRIOR:
- hotkey << wxT("Prior" );
+ hotkey << wxT("Page_Up" );
break;
case WXK_PAGEDOWN:
- case WXK_NEXT:
- hotkey << wxT("Next" );
+ hotkey << wxT("Page_Down" );
break;
case WXK_LEFT:
hotkey << wxT("Left" );
case WXK_RETURN:
hotkey << wxT("Return" );
break;
-
- // if there are any other keys wxGetAccelFromString() may
+ 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 )
{
- wxString name = wxGTK_CONV_BACK( gdk_keyval_name((guint)code) );
- if ( name )
+ const wxString
+ name = wxGTK_CONV_BACK_SYS(gdk_keyval_name((guint)code));
+ if ( !name.empty() )
{
hotkey << name;
break;
#endif // wxUSE_ACCEL
+// ----------------------------------------------------------------------------
+// Pop-up menu stuff
+// ----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-// substitute for missing GtkPixmapMenuItem
-//-----------------------------------------------------------------------------
-
-#ifndef __WXGTK20__
-
-/*
- * Copyright (C) 1998, 1999, 2000 Free Software Foundation
- * All rights reserved.
- *
- * This file is part of the Gnome Library.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- @NOTATION@
- */
-
-/* Author: Dietmar Maurer <dm@vlsivie.tuwien.ac.at> */
-
-#include <gtk/gtkaccellabel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkcontainer.h>
+#if wxUSE_MENUS_NATIVE
-extern "C"
+extern "C" WXDLLIMPEXP_CORE
+void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting )
{
-
-static void gtk_pixmap_menu_item_class_init (GtkPixmapMenuItemClass *klass);
-static void gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item);
-static void gtk_pixmap_menu_item_draw (GtkWidget *widget,
- GdkRectangle *area);
-static gint gtk_pixmap_menu_item_expose (GtkWidget *widget,
- GdkEventExpose *event);
-
-/* we must override the following functions */
-
-static void gtk_pixmap_menu_item_map (GtkWidget *widget);
-static void gtk_pixmap_menu_item_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-static void gtk_pixmap_menu_item_forall (GtkContainer *container,
- gboolean include_internals,
- GtkCallback callback,
- gpointer callback_data);
-static void gtk_pixmap_menu_item_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
-static void gtk_pixmap_menu_item_remove (GtkContainer *container,
- GtkWidget *child);
-
-static void changed_have_pixmap_status (GtkPixmapMenuItem *menu_item);
-
-static GtkMenuItemClass *parent_class = NULL;
-
+ *is_waiting = false;
}
-#define BORDER_SPACING 3
-#define PMAP_WIDTH 20
-
-GtkType
-gtk_pixmap_menu_item_get_type (void)
+WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win )
{
- static GtkType pixmap_menu_item_type = 0;
+ menu->SetInvokingWindow( win );
- if (!pixmap_menu_item_type)
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
+ while (node)
{
- GtkTypeInfo pixmap_menu_item_info =
- {
- (char *)"GtkPixmapMenuItem",
- sizeof (GtkPixmapMenuItem),
- sizeof (GtkPixmapMenuItemClass),
- (GtkClassInitFunc) gtk_pixmap_menu_item_class_init,
- (GtkObjectInitFunc) gtk_pixmap_menu_item_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (),
- &pixmap_menu_item_info);
- }
-
- return pixmap_menu_item_type;
-}
-
-/**
- * gtk_pixmap_menu_item_new
- *
- * Creates a new pixmap menu item. Use gtk_pixmap_menu_item_set_pixmap()
- * to set the pixmap wich is displayed at the left side.
- *
- * Returns:
- * &GtkWidget pointer to new menu item
- **/
-
-GtkWidget*
-gtk_pixmap_menu_item_new (void)
-{
- return GTK_WIDGET (gtk_type_new (gtk_pixmap_menu_item_get_type ()));
-}
-
-static void
-gtk_pixmap_menu_item_class_init (GtkPixmapMenuItemClass *klass)
-{
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkMenuItemClass *menu_item_class;
- GtkContainerClass *container_class;
-
- object_class = (GtkObjectClass*) klass;
- widget_class = (GtkWidgetClass*) klass;
- menu_item_class = (GtkMenuItemClass*) klass;
- container_class = (GtkContainerClass*) klass;
-
- parent_class = (GtkMenuItemClass*) gtk_type_class (gtk_menu_item_get_type ());
-
- widget_class->draw = gtk_pixmap_menu_item_draw;
- widget_class->expose_event = gtk_pixmap_menu_item_expose;
- widget_class->map = gtk_pixmap_menu_item_map;
- widget_class->size_allocate = gtk_pixmap_menu_item_size_allocate;
- widget_class->size_request = gtk_pixmap_menu_item_size_request;
-
- container_class->forall = gtk_pixmap_menu_item_forall;
- container_class->remove = gtk_pixmap_menu_item_remove;
-
- klass->orig_toggle_size = menu_item_class->toggle_size;
- klass->have_pixmap_count = 0;
-}
-
-static void
-gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item)
-{
- GtkMenuItem *mi;
-
- mi = GTK_MENU_ITEM (menu_item);
-
- menu_item->pixmap = NULL;
-}
-
-static void
-gtk_pixmap_menu_item_draw (GtkWidget *widget,
- GdkRectangle *area)
-{
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget));
- g_return_if_fail (area != NULL);
-
- if (GTK_WIDGET_CLASS (parent_class)->draw)
- (* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area);
-
- if (GTK_WIDGET_DRAWABLE (widget) &&
- GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
- gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
- }
-}
-
-static gint
-gtk_pixmap_menu_item_expose (GtkWidget *widget,
- GdkEventExpose *event)
-{
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- if (GTK_WIDGET_CLASS (parent_class)->expose_event)
- (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
-
- if (GTK_WIDGET_DRAWABLE (widget) &&
- GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
- gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
- }
+ wxMenuItem *menuitem = node->GetData();
+ if (menuitem->IsSubMenu())
+ {
+ SetInvokingWindow( menuitem->GetSubMenu(), win );
+ }
- return FALSE;
+ node = node->GetNext();
+ }
}
-/**
- * gtk_pixmap_menu_item_set_pixmap
- * @menu_item: Pointer to the pixmap menu item
- * @pixmap: Pointer to a pixmap widget
- *
- * Set the pixmap of the menu item.
- *
- **/
-
-void
-gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
- GtkWidget *pixmap)
+extern "C" WXDLLIMPEXP_CORE
+void wxPopupMenuPositionCallback( GtkMenu *menu,
+ gint *x, gint *y,
+ gboolean * WXUNUSED(whatever),
+ gpointer user_data )
{
- g_return_if_fail (menu_item != NULL);
- g_return_if_fail (pixmap != NULL);
- g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (menu_item));
- g_return_if_fail (GTK_IS_WIDGET (pixmap));
- g_return_if_fail (menu_item->pixmap == NULL);
-
- gtk_widget_set_parent (pixmap, GTK_WIDGET (menu_item));
- menu_item->pixmap = pixmap;
-
- if (GTK_WIDGET_REALIZED (pixmap->parent) &&
- !GTK_WIDGET_REALIZED (pixmap))
- gtk_widget_realize (pixmap);
+ // ensure that the menu appears entirely on screen
+ GtkRequisition req;
+ gtk_widget_get_child_requisition(GTK_WIDGET(menu), &req);
- if (GTK_WIDGET_VISIBLE (pixmap->parent)) {
- if (GTK_WIDGET_MAPPED (pixmap->parent) &&
- GTK_WIDGET_VISIBLE(pixmap) &&
- !GTK_WIDGET_MAPPED (pixmap))
- gtk_widget_map (pixmap);
- }
+ wxSize sizeScreen = wxGetDisplaySize();
+ wxPoint *pos = (wxPoint*)user_data;
- changed_have_pixmap_status(menu_item);
+ gint xmax = sizeScreen.x - req.width,
+ ymax = sizeScreen.y - req.height;
- if (GTK_WIDGET_VISIBLE (pixmap) && GTK_WIDGET_VISIBLE (menu_item))
- gtk_widget_queue_resize (pixmap);
+ *x = pos->x < xmax ? pos->x : xmax;
+ *y = pos->y < ymax ? pos->y : ymax;
}
-static void
-gtk_pixmap_menu_item_map (GtkWidget *widget)
+bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
{
- GtkPixmapMenuItem *menu_item;
+ wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget));
+ wxCHECK_MSG( menu != NULL, false, wxT("invalid popup-menu") );
- menu_item = GTK_PIXMAP_MENU_ITEM(widget);
+ // NOTE: if you change this code, you need to update
+ // the same code in taskbar.cpp as well. This
+ // is ugly code duplication, I know.
- GTK_WIDGET_CLASS(parent_class)->map(widget);
+ SetInvokingWindow( menu, this );
- if (menu_item->pixmap &&
- GTK_WIDGET_VISIBLE (menu_item->pixmap) &&
- !GTK_WIDGET_MAPPED (menu_item->pixmap))
- gtk_widget_map (menu_item->pixmap);
-}
+ menu->UpdateUI();
-static void
-gtk_pixmap_menu_item_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
-{
- GtkPixmapMenuItem *pmenu_item;
+ bool is_waiting = true;
- pmenu_item = GTK_PIXMAP_MENU_ITEM(widget);
+ gulong handler = g_signal_connect (menu->m_menu, "hide",
+ G_CALLBACK (gtk_pop_hide_callback),
+ &is_waiting);
- if (pmenu_item->pixmap && GTK_WIDGET_VISIBLE(pmenu_item))
+ wxPoint pos;
+ gpointer userdata;
+ GtkMenuPositionFunc posfunc;
+ if ( x == -1 && y == -1 )
+ {
+ // use GTK's default positioning algorithm
+ userdata = NULL;
+ posfunc = NULL;
+ }
+ else
{
- GtkAllocation child_allocation;
- int border_width;
-
- border_width = GTK_CONTAINER (widget)->border_width;
-
- child_allocation.width = pmenu_item->pixmap->requisition.width;
- child_allocation.height = pmenu_item->pixmap->requisition.height;
- child_allocation.x = border_width + BORDER_SPACING;
- child_allocation.y = (border_width + BORDER_SPACING
- + (((allocation->height - child_allocation.height) - child_allocation.x)
- / 2)); /* center pixmaps vertically */
- gtk_widget_size_allocate (pmenu_item->pixmap, &child_allocation);
+ pos = ClientToScreen(wxPoint(x, y));
+ userdata = &pos;
+ posfunc = wxPopupMenuPositionCallback;
}
- if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
- GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation);
-}
+ wxMenuEvent eventOpen(wxEVT_MENU_OPEN, -1, menu);
+ DoCommonMenuCallbackCode(menu, eventOpen);
-static void
-gtk_pixmap_menu_item_forall (GtkContainer *container,
- gboolean include_internals,
- GtkCallback callback,
- gpointer callback_data)
-{
- GtkPixmapMenuItem *menu_item;
+ gtk_menu_popup(
+ GTK_MENU(menu->m_menu),
+ (GtkWidget *) NULL, // parent menu shell
+ (GtkWidget *) NULL, // parent menu item
+ posfunc, // function to position it
+ userdata, // client data
+ 0, // button used to activate it
+ gtk_get_current_event_time()
+ );
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container));
- g_return_if_fail (callback != NULL);
+ while (is_waiting)
+ {
+ gtk_main_iteration();
+ }
- menu_item = GTK_PIXMAP_MENU_ITEM (container);
+ g_signal_handler_disconnect (menu->m_menu, handler);
- if (menu_item->pixmap)
- (* callback) (menu_item->pixmap, callback_data);
+ wxMenuEvent eventClose(wxEVT_MENU_CLOSE, -1, menu);
+ DoCommonMenuCallbackCode(menu, eventClose);
- GTK_CONTAINER_CLASS(parent_class)->forall(container,include_internals,
- callback,callback_data);
+ return true;
}
-static void
-gtk_pixmap_menu_item_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
-{
- GtkPixmapMenuItem *menu_item;
- GtkRequisition req = {0, 0};
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_MENU_ITEM (widget));
- g_return_if_fail (requisition != NULL);
-
- GTK_WIDGET_CLASS(parent_class)->size_request(widget,requisition);
-
- menu_item = GTK_PIXMAP_MENU_ITEM (widget);
+#endif // wxUSE_MENUS_NATIVE
- if (menu_item->pixmap)
- gtk_widget_size_request(menu_item->pixmap, &req);
+#include <gtk/gtk.h>
- requisition->height = MAX(req.height + GTK_CONTAINER(widget)->border_width + BORDER_SPACING, (unsigned int) requisition->height);
- requisition->width += (req.width + GTK_CONTAINER(widget)->border_width + BORDER_SPACING);
-}
-
-static void
-gtk_pixmap_menu_item_remove (GtkContainer *container,
- GtkWidget *child)
+const char *wxGetStockGtkID(wxWindowID id)
{
- GtkBin *bin;
- gboolean widget_was_visible;
-
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container));
- g_return_if_fail (child != NULL);
- g_return_if_fail (GTK_IS_WIDGET (child));
-
- bin = GTK_BIN (container);
- g_return_if_fail ((bin->child == child ||
- (GTK_PIXMAP_MENU_ITEM(container)->pixmap == child)));
+ #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)
- widget_was_visible = GTK_WIDGET_VISIBLE (child);
+ default:
+ wxFAIL_MSG( _T("invalid stock item ID") );
+ break;
+ };
- gtk_widget_unparent (child);
- if (bin->child == child)
- bin->child = NULL;
- else {
- GTK_PIXMAP_MENU_ITEM(container)->pixmap = NULL;
- changed_have_pixmap_status(GTK_PIXMAP_MENU_ITEM(container));
- }
+ #undef STOCKITEM
- if (widget_was_visible)
- gtk_widget_queue_resize (GTK_WIDGET (container));
+ return NULL;
}
-
-/* important to only call this if there was actually a _change_ in pixmap == NULL */
-static void
-changed_have_pixmap_status (GtkPixmapMenuItem *menu_item)
+bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key)
{
- if (menu_item->pixmap != NULL) {
- GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count += 1;
+ if (!id)
+ return false;
- if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 1) {
- /* Install pixmap toggle size */
- GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = MAX(GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size, PMAP_WIDTH);
- }
- } else {
- GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count -= 1;
+ GtkStockItem stock_item;
+ if (gtk_stock_lookup (id, &stock_item))
+ {
+ if (key) *key = stock_item.keyval;
+ if (mod) *mod = stock_item.modifier;
- if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 0) {
- /* Install normal toggle size */
- GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size;
+ // 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;
}
- }
- /* Note that we actually need to do this for _all_ GtkPixmapMenuItem
- whenever the klass->toggle_size changes; but by doing it anytime
- this function is called, we get the same effect, just because of
- how the preferences option to show pixmaps works. Bogus, broken.
- */
- if (GTK_WIDGET_VISIBLE(GTK_WIDGET(menu_item)))
- gtk_widget_queue_resize(GTK_WIDGET(menu_item));
+ return false;
}
-#endif
-
+#endif // wxUSE_MENUS
projects / wxWidgets.git / blobdiff