/////////////////////////////////////////////////////////////////////////////
-// Name: menu.cpp
+// Name: src/gtk1/menu.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// 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"
-#include "wx/log.h"
-#include "wx/intl.h"
-#include "wx/app.h"
-#include "wx/bitmap.h"
#include "wx/menu.h"
+#include "wx/stockitem.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/app.h"
+ #include "wx/bitmap.h"
+#endif
#if wxUSE_ACCEL
#include "wx/accel.h"
#endif // wxUSE_ACCEL
-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"
#include <gdk/gdkkeysyms.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_accel_group_attach((g), (o))
- #define gtk_accel_group_detach(g, o) _gtk_accel_group_detach((g), (o))
- #define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
-
- #define ACCEL_OBJECT GObject
- #define ACCEL_OBJECTS(a) (a)->acceleratables
- #define ACCEL_OBJ_CAST(obj) G_OBJECT(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 ACCEL_OBJECT GtkObject
+#define ACCEL_OBJECTS(a) (a)->attach_objects
+#define ACCEL_OBJ_CAST(obj) GTK_OBJECT(obj)
+
+// we use normal item but with a special id for the menu title
+static const int wxGTK_TITLE_ID = -3;
+
+// defined in window.cpp
+extern guint32 wxGtkTimeLastClick;
//-----------------------------------------------------------------------------
// idle system
extern void wxapp_install_idle_handler();
extern bool g_isIdle;
-#if GTK_CHECK_VERSION(1, 2, 0) && wxUSE_ACCEL
- static wxString GetHotKey( const wxMenuItem& item );
+#if wxUSE_ACCEL
+static wxString GetGtkHotKey( const wxMenuItem& item );
#endif
-//-----------------------------------------------------------------------------
-// substitute for missing GtkPixmapMenuItem
-//-----------------------------------------------------------------------------
-
-// FIXME: I can't make this compile with GTK+ 2.0, disabling for now (VZ)
-#ifndef __WXGTK20__
- #define USE_MENU_BITMAPS
-#endif
-
-#ifdef USE_MENU_BITMAPS
-
-#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
-{
- GtkMenuItem menu_item;
-
- GtkWidget *pixmap;
-};
-
-struct _GtkPixmapMenuItemClass
-{
- GtkMenuItemClass parent_class;
-
- guint orig_toggle_size;
- guint have_pixmap_count;
-};
-
-
-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 // USE_MENU_BITMAPS
-
//-----------------------------------------------------------------------------
// idle system
//-----------------------------------------------------------------------------
{
const wxChar *pc;
- /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
+ // GTK 1.2 wants to have "_" instead of "&" for accelerators
wxString str;
pc = title;
while (*pc != wxT('\0'))
}
else if (*pc == wxT('&'))
{
-#if GTK_CHECK_VERSION(1, 2, 0)
str << wxT('_');
-#endif
- }
-#if GTK_CHECK_VERSION(2, 0, 0)
- else if (*pc == wxT('/'))
- {
- str << wxT("\\/");
- }
- else if (*pc == wxT('\\'))
- {
- str << wxT("\\\\");
}
-#elif GTK_CHECK_VERSION(1, 2, 0)
- else if (*pc == wxT('/'))
- {
- str << wxT('\\');
- }
-#endif
else
{
-#ifdef __WXGTK12__
if ( *pc == wxT('_') )
{
// underscores must be doubled to prevent them from being
// interpreted as accelerator character prefix by GTK
str << *pc;
}
-#endif // GTK+ 1.2
str << *pc;
}
++pc;
}
+
+ // wxPrintf( wxT("before %s after %s\n"), title.c_str(), str.c_str() );
+
return str;
}
// activate message from GTK
//-----------------------------------------------------------------------------
-static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu )
+static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
{
- if (g_isIdle) wxapp_install_idle_handler();
+ if (g_isIdle)
+ wxapp_install_idle_handler();
- wxMenuEvent event( wxEVT_MENU_OPEN, -1 );
event.SetEventObject( menu );
wxEvtHandler* handler = menu->GetEventHandler();
return;
wxWindow *win = menu->GetInvokingWindow();
- if (win) win->GetEventHandler()->ProcessEvent( event );
+ if (win)
+ win->GetEventHandler()->ProcessEvent( event );
+}
+
+extern "C" {
+
+static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu )
+{
+ wxMenuEvent event(wxEVT_MENU_OPEN, -1, menu);
+
+ DoCommonMenuCallbackCode(menu, event);
+}
+
+static void gtk_menu_close_callback( GtkWidget *widget, wxMenuBar *menubar )
+{
+ if ( !menubar->GetMenuCount() )
+ {
+ // if menubar is empty we can't call GetMenu(0) below
+ return;
+ }
+
+ wxMenuEvent event( wxEVT_MENU_CLOSE, -1, NULL );
+
+ DoCommonMenuCallbackCode(menubar->GetMenu(0), event);
+}
+
}
//-----------------------------------------------------------------------------
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;
+ // the parent window is known after wxFrame::SetMenu()
+ m_needParent = false;
m_style = style;
m_invokingWindow = (wxWindow*) NULL;
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_CHECK_VERSION(1, 2, 1)
- m_accel = gtk_accel_group_new();
- m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
- m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
-#else
m_menubar = gtk_menu_bar_new();
-#endif
+ m_accel = gtk_accel_group_new();
if (style & wxMB_DOCKABLE)
{
PostCreation();
ApplyWidgetStyle();
-}
-
-wxMenuBar::wxMenuBar()
-{
- /* the parent window is known after wxFrame::SetMenu() */
- m_needParent = FALSE;
- m_style = 0;
- m_invokingWindow = (wxWindow*) NULL;
- if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
- !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("menubar") ))
- {
- wxFAIL_MSG( wxT("wxMenuBar creation failed") );
- return;
- }
+ for (size_t i = 0; i < n; ++i )
+ Append(menus[i], titles[i]);
- m_menus.DeleteContents( TRUE );
+ // 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
+ gtk_signal_connect( GTK_OBJECT(GTK_MENU_SHELL(m_menubar)),
+ "deactivate",
+ GTK_SIGNAL_FUNC(gtk_menu_close_callback),
+ (gpointer)this );
- /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
-#if GTK_CHECK_VERSION(1, 2, 1)
- m_accel = gtk_accel_group_new();
- m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
- m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
-#else
- m_menubar = gtk_menu_bar_new();
-#endif
+}
- m_widget = GTK_WIDGET(m_menubar);
+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);
+}
- ApplyWidgetStyle();
+wxMenuBar::wxMenuBar()
+{
+ Init(0, NULL, NULL, 0);
}
wxMenuBar::~wxMenuBar()
{
-// gtk_object_unref( GTK_OBJECT(m_factory) ); why not ?
}
static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
- /* support for native hot keys */
+ // support for native hot keys
gtk_accel_group_detach( menu->m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) );
- wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
while (node)
{
wxMenuItem *menuitem = node->GetData();
{
menu->SetInvokingWindow( win );
-#if GTK_CHECK_VERSION(1, 2, 1)
wxWindow *top_frame = win;
while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
- /* support for native hot keys */
+ // support for native hot keys
ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget);
if ( !g_slist_find( ACCEL_OBJECTS(menu->m_accel), obj ) )
gtk_accel_group_attach( menu->m_accel, obj );
-#endif // GTK+ 1.2.1+
- wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
while (node)
{
wxMenuItem *menuitem = node->GetData();
void wxMenuBar::SetInvokingWindow( wxWindow *win )
{
m_invokingWindow = win;
-#if GTK_CHECK_VERSION(1, 2, 1)
wxWindow *top_frame = win;
while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
- /* support for native key accelerators indicated by underscroes */
+ // 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 // GTK+ 1.2.1+
- wxMenuList::Node *node = m_menus.GetFirst();
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node)
{
wxMenu *menu = node->GetData();
void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
{
m_invokingWindow = (wxWindow*) NULL;
-#if GTK_CHECK_VERSION(1, 2, 1)
wxWindow *top_frame = win;
while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
// support for native key accelerators indicated by underscroes
gtk_accel_group_detach( m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) );
-#endif // GTK+ 1.2.1+
- wxMenuList::Node *node = m_menus.GetFirst();
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node)
{
wxMenu *menu = node->GetData();
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)
+bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
{
wxString str( wxReplaceUnderscore( title ) );
// This doesn't have much effect right now.
menu->SetTitle( str );
- // GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has.
-#if GTK_CHECK_VERSION(1, 2, 1)
-
- wxString buf;
- buf << wxT('/') << str.c_str();
-
- // local buffer in multibyte form
- char cbuf[400];
- strcpy(cbuf, wxGTK_CONV(buf) );
-
- GtkItemFactoryEntry entry;
- entry.path = (gchar *)cbuf; // const_cast
- entry.accelerator = (gchar*) NULL;
- entry.callback = (GtkItemFactoryCallback) NULL;
- entry.callback_action = 0;
- entry.item_type = (char *)"<Branch>";
-
- gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); // what is 2 ?
- // in order to get the pointer to the item we need the item text _without_ underscores
- wxString tmp = wxT("<main>/");
- const wxChar *pc;
- for ( pc = str; *pc != wxT('\0'); pc++ )
+ // The "m_owner" is the "menu item"
+ 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)
{
- // 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 == wxT('_'))
- pc++;
- tmp << *pc;
+ 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);
}
- menu->m_owner = gtk_item_factory_get_item( m_factory, wxGTK_CONV( tmp ) );
- gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
-#else
- menu->m_owner = gtk_menu_item_new_with_label( wxGTK_CONV( str ) );
gtk_widget_show( menu->m_owner );
- gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
- gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner );
+ gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
-#endif
+ 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),
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;
-
- // GTK+ doesn't have a function to insert a menu using GtkItemFactory (as
- // of version 1.2.6), so we first append the item and then change its
- // index
- if ( !GtkAppend(menu, title) )
- return FALSE;
+ return false;
- if (pos+1 >= m_menus.GetCount())
- return TRUE;
+ // TODO
- GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget);
- gpointer data = g_list_last(menu_shell->children)->data;
- menu_shell->children = g_list_remove(menu_shell->children, data);
- menu_shell->children = g_list_insert(menu_shell->children, data, pos);
+ if ( !GtkAppend(menu, title, (int)pos) )
+ return false;
- return TRUE;
+ return true;
}
wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
return menuOld;
}
-static wxMenu *CopyMenu (wxMenu *menu)
-{
- wxMenu *menucopy = new wxMenu ();
- wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
- while (node)
- {
- wxMenuItem *item = node->GetData();
- int itemid = item->GetId();
- wxString text = item->GetText();
- text.Replace(wxT("_"), wxT("&"));
- wxMenu *submenu = item->GetSubMenu();
- if (!submenu)
- {
- wxMenuItem* itemcopy = new wxMenuItem(menucopy,
- itemid, text,
- menu->GetHelpString(itemid));
- itemcopy->SetBitmap(item->GetBitmap());
- itemcopy->SetCheckable(item->IsCheckable());
- menucopy->Append(itemcopy);
- }
- else
- menucopy->Append (itemid, text, CopyMenu(submenu),
- menu->GetHelpString(itemid));
-
- node = node->GetNext();
- }
-
- return menucopy;
-}
-
wxMenu *wxMenuBar::Remove(size_t pos)
{
wxMenu *menu = wxMenuBarBase::Remove(pos);
if ( !menu )
return (wxMenu*) NULL;
-/*
- GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget);
-
- printf( "factory entries before %d\n", (int)g_slist_length(m_factory->items) );
- printf( "menu shell entries before %d\n", (int)g_list_length( menu_shell->children ) );
-*/
-
- wxMenu *menucopy = CopyMenu( menu );
-
- // unparent calls unref() and that would delete the widget so we raise
- // the ref count to 2 artificially before invoking unparent.
- gtk_widget_ref( menu->m_menu );
- gtk_widget_unparent( menu->m_menu );
+ gtk_menu_item_remove_submenu( GTK_MENU_ITEM(menu->m_owner) );
+ gtk_container_remove(GTK_CONTAINER(m_menubar), menu->m_owner);
gtk_widget_destroy( menu->m_owner );
- delete menu;
-
- menu = menucopy;
-/*
- printf( "factory entries after %d\n", (int)g_slist_length(m_factory->items) );
- printf( "menu shell entries after %d\n", (int)g_list_length( menu_shell->children ) );
-*/
+ menu->m_owner = NULL;
if (m_invokingWindow)
{
- // OPTIMISE ME: see comment in GtkAppend
-
- wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
+ // OPTIMISE ME: see comment in GtkAppend
+ wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
- if( frame )
+ if( frame )
frame->UpdateMenuBarSize();
}
return res;
}
- wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
while (node)
{
wxMenuItem *item = node->GetData();
int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
{
- wxMenuList::Node *node = m_menus.GetFirst();
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node)
{
wxMenu *menu = node->GetData();
{
wxMenuItem* result = menu->FindChildItem(id);
- wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
+ wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
while ( node && result == NULL )
{
wxMenuItem *item = node->GetData();
wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const
{
wxMenuItem* result = 0;
- wxMenuList::Node *node = m_menus.GetFirst();
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node && result == 0)
{
wxMenu *menu = node->GetData();
void wxMenuBar::EnableTop( size_t pos, bool flag )
{
- wxMenuList::Node *node = m_menus.Item( pos );
+ wxMenuList::compatibility_iterator node = m_menus.Item( pos );
wxCHECK_RET( node, wxT("menu not found") );
wxString wxMenuBar::GetLabelTop( size_t pos ) const
{
- wxMenuList::Node *node = m_menus.Item( pos );
+ wxMenuList::compatibility_iterator node = m_menus.Item( pos );
wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") );
void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
{
- wxMenuList::Node *node = m_menus.Item( pos );
+ wxMenuList::compatibility_iterator node = m_menus.Item( pos );
wxCHECK_RET( node, wxT("menu not found") );
wxMenu* menu = node->GetData();
- wxString str( wxReplaceUnderscore( label ) );
+ const wxString str( wxReplaceUnderscore( label ) );
menu->SetTitle( str );
if (menu->m_owner)
{
- GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
+ GtkLabel *glabel = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
/* set new text */
- gtk_label_set( label, wxGTK_CONV( str ) );
+ gtk_label_set( glabel, 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) );
+ (void)gtk_label_parse_uline (GTK_LABEL(glabel), wxGTK_CONV( str ) );
+ gtk_accel_label_refetch( GTK_ACCEL_LABEL(glabel) );
}
}
// "activate"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
{
if (g_isIdle)
wxMenuItem* item = menu->FindChildItem( id );
wxCHECK_RET( item, wxT("error in menu item callback") );
+ if ( item->GetId() == wxGTK_TITLE_ID )
+ {
+ // ignore events from the menu title
+ return;
+ }
+
if (item->IsCheckable())
{
bool isReallyChecked = item->IsChecked(),
// Is this menu on a menubar? (possibly nested)
wxFrame* frame = NULL;
- wxMenu* pm = menu;
- while ( pm && !frame )
- {
- if ( pm->IsAttached() )
- frame = pm->GetMenuBar()->GetFrame();
- pm = pm->GetParent();
- }
+ if(menu->IsAttached())
+ frame = menu->GetMenuBar()->GetFrame();
+ // FIXME: why do we have to call wxFrame::GetEventHandler() directly here?
+ // normally wxMenu::SendEvent() should be enough, if it doesn't work
+ // in wxGTK then we have a bug in wxMenu::GetInvokingWindow() which
+ // should be fixed instead of working around it here...
if (frame)
{
// If it is attached then let the frame send the event.
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();
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();
if (win)
win->GetEventHandler()->ProcessEvent( event );
}
+}
//-----------------------------------------------------------------------------
// wxMenuItem
for ( const wxChar *pc = text.c_str(); *pc; pc++ )
{
+ if ( *pc == wxT('\t'))
+ break;
+
if ( *pc == wxT('_') )
{
// GTK 1.2 escapes "xxx_xxx" to "xxx__xxx"
continue;
}
-#if GTK_CHECK_VERSION(2, 0, 0)
- if ( *pc == wxT('\\') )
- {
- // GTK 2.0 escapes "xxx/xxx" to "xxx\/xxx"
- pc++;
- label += *pc;
- continue;
- }
-#endif
-
if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) )
{
// wxMSW escapes "&"
label += *pc;
}
- // wxPrintf( L"text %s label %s\n", text.c_str(), label.c_str() );
+ // wxPrintf( wxT("GetLabelFromText(): text %s label %s\n"), text.c_str(), label.c_str() );
return label;
}
-void wxMenuItem::SetText( const wxString& str )
+void wxMenuItem::SetText( const wxString& string )
{
+ wxString str = string;
+ if ( str.empty() && !IsSeparator() )
+ {
+ wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
+ str = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR |
+ wxSTOCK_WITH_MNEMONIC);
+ }
+
// Some optimization to avoid flicker
wxString oldLabel = m_text;
- oldLabel = wxStripMenuCodes(oldLabel.BeforeFirst('\t'));
- oldLabel.Replace(wxT("_"), wxT(""));
- wxString label1 = wxStripMenuCodes(str.BeforeFirst('\t'));
- if (oldLabel == label1)
- return;
+ oldLabel = wxStripMenuCodes(oldLabel);
+ oldLabel.Replace(wxT("_"), wxEmptyString);
+ wxString label1 = wxStripMenuCodes(str);
+ wxString oldhotkey = GetHotKey(); // Store the old hotkey in Ctrl-foo format
+ wxCharBuffer oldbuf = wxGTK_CONV( GetGtkHotKey(*this) ); // and as <control>foo
DoSetText(str);
+ 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 );
-#if GTK_CHECK_VERSION(2, 0, 0)
- // We have to imitate item_factory_unescape_label here
- wxString tmp;
- for (size_t n = 0; n < m_text.Len(); n++)
- {
- if (m_text[n] != wxT('\\'))
- tmp += m_text[n];
- }
-
- gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV(tmp) );
-#else
// set new text
gtk_label_set( label, wxGTK_CONV( m_text ) );
// reparse key accel
(void)gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV(m_text) );
gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );
-#endif
+ }
+
+ guint accel_key;
+ GdkModifierType accel_mods;
+ gtk_accelerator_parse( (const char*) oldbuf, &accel_key, &accel_mods);
+ if (accel_key != 0)
+ {
+ gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem),
+ m_parentMenu->m_accel,
+ accel_key,
+ accel_mods );
+ }
+
+ wxCharBuffer buf = wxGTK_CONV( GetGtkHotKey(*this) );
+ gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
+ if (accel_key != 0)
+ {
+ gtk_widget_add_accelerator( GTK_WIDGET(m_menuItem),
+ "activate",
+ m_parentMenu->m_accel,
+ accel_key,
+ accel_mods,
+ GTK_ACCEL_VISIBLE);
}
}
{
m_text << wxT('_');
}
-#if GTK_CHECK_VERSION(2, 0, 0)
- else if ( *pc == wxT('_') ) // escape underscores
- {
- // m_text << wxT("__"); doesn't work
- m_text << wxT("__");
- }
- else if (*pc == wxT('/')) // we have to escape slashes
- {
- m_text << wxT("\\/");
- }
- else if (*pc == wxT('\\')) // we have to double backslashes
- {
- m_text << wxT("\\\\");
- }
-#else
else if ( *pc == wxT('_') ) // escape underscores
{
m_text << wxT("__");
}
- else if (*pc == wxT('/')) /* we have to filter out slashes ... */
+ else
{
- m_text << wxT('\\'); /* ... and replace them with back slashes */
- }
-#endif
- else {
m_text << *pc;
}
++pc;
}
- // wxPrintf( L"str %s m_text %s\n", str.c_str(), m_text.c_str() );
-
- m_hotKey = wxT("");
+ m_hotKey = wxEmptyString;
if(*pc == wxT('\t'))
{
return (wxAcceleratorEntry *)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
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;
}
-wxString wxMenuItem::GetFactoryPath() const
-{
- // In order to get the pointer to the item we need the item
- // text _without_ underscores in GTK 1.2
- wxString path( wxT("<main>/") );
-
- for ( const wxChar *pc = m_text.c_str(); *pc; pc++ )
- {
- if ( *pc == wxT('_') )
- {
-#ifdef __WXGTK20__
- pc++;
-#else
- // remove '_' unconditionally
- continue;
-#endif
- }
-
- // don't remove ampersands '&' since if we have them in the menu item title
- // it means that they were doubled to indicate "&" instead of accelerator
-
- path += *pc;
- }
-
- return path;
-}
-
//-----------------------------------------------------------------------------
// wxMenu
//-----------------------------------------------------------------------------
void wxMenu::Init()
{
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>" );
+ 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:
+ gtk_widget_ref(m_menu);
m_owner = (GtkWidget*) NULL;
// Tearoffs are entries, just like separators. So if we want this
// menu to be a tear-off one, we just append a tearoff entry
// immediately.
- if(m_style & wxMENU_TEAROFF)
+ if ( m_style & wxMENU_TEAROFF )
{
- GtkItemFactoryEntry entry;
- entry.path = (char *)"/tearoff";
- entry.callback = (GtkItemFactoryCallback) NULL;
- entry.callback_action = 0;
- entry.item_type = (char *)"<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" );
+ GtkWidget *tearoff = gtk_tearoff_menu_item_new();
+
+ gtk_menu_append(GTK_MENU(m_menu), tearoff);
}
+ m_prevRadio = NULL;
+
// append the title as the very first entry if we have it
- if ( !!m_title )
+ if ( !m_title.empty() )
{
- Append(-2, m_title);
+ Append(wxGTK_TITLE_ID, m_title);
AppendSeparator();
}
}
wxMenu::~wxMenu()
{
- m_items.Clear();
+ WX_CLEAR_LIST(wxMenuItemList, m_items);
if ( GTK_IS_WIDGET( m_menu ))
- gtk_widget_destroy( m_menu );
-
- gtk_object_unref( GTK_OBJECT(m_factory) );
+ {
+ // see wxMenu::Init
+ gtk_widget_unref( m_menu );
+ // 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 );
+ }
}
-bool wxMenu::GtkAppend(wxMenuItem *mitem)
+bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
{
GtkWidget *menuItem;
-#if defined(USE_MENU_BITMAPS) || !GTK_CHECK_VERSION(1, 2, 0)
- bool appended = FALSE;
-#endif
-
- // does this item terminate the current radio group?
- bool endOfRadioGroup = TRUE;
+ wxString text;
+ GtkLabel* label = NULL;
if ( mitem->IsSeparator() )
{
- GtkItemFactoryEntry entry;
- entry.path = (char *)"/sep";
- entry.callback = (GtkItemFactoryCallback) NULL;
- entry.callback_action = 0;
- entry.item_type = (char *)"<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?
- menuItem = gtk_item_factory_get_widget( m_factory, "<main>/sep" );
-
- // we might have a separator inside a radio group
- endOfRadioGroup = FALSE;
+ // TODO
+ menuItem = gtk_menu_item_new();
}
- else if ( mitem->IsSubMenu() )
+ else if (mitem->GetBitmap().Ok())
{
- // text has "_" instead of "&" after mitem->SetText()
- wxString text( mitem->GetText() );
-
- // local buffer in multibyte form
- char buf[200];
- strcpy( buf, "/" );
- strcat( buf, wxGTK_CONV( text ) );
-
- GtkItemFactoryEntry entry;
- entry.path = buf;
- entry.callback = (GtkItemFactoryCallback) 0;
- entry.callback_action = 0;
- entry.item_type = (char *)"<Branch>";
- entry.accelerator = (gchar*) NULL;
-
- gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); // what is 2 ?
-
- wxString path( mitem->GetFactoryPath() );
- menuItem = gtk_item_factory_get_item( m_factory, wxGTK_CONV( path ) );
-
- gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
-
- // if adding a submenu to a menu already existing in the menu bar, we
- // must set invoking window to allow processing events from this
- // submenu
- if ( m_invokingWindow )
- wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
- }
-#ifdef USE_MENU_BITMAPS
- else if (mitem->GetBitmap().Ok()) // An item with bitmap
- {
- wxString text( mitem->GetText() );
+ text = mitem->GetText();
const wxBitmap *bitmap = &mitem->GetBitmap();
- 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);
- guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
- gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuItem);
- if (accel_key != GDK_VoidSymbol)
- {
- gtk_widget_add_accelerator (menuItem,
- "activate_item",
- gtk_menu_ensure_uline_accel_group (GTK_MENU (m_menu)),
- accel_key, 0,
- GTK_ACCEL_LOCKED);
- }
- gtk_widget_show (label);
-
- mitem->SetLabelWidget(label);
+ // TODO
+ wxUnusedVar(bitmap);
+ menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) );
+ label = GTK_LABEL( GTK_BIN(menuItem)->child );
- GtkWidget* pixmap = gtk_pixmap_new( bitmap->GetPixmap(), bitmap->GetMask() ? bitmap->GetMask()->GetBitmap() : (GdkBitmap* )NULL);
- 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 );
-
- gtk_menu_append( GTK_MENU(m_menu), menuItem );
- gtk_widget_show( menuItem );
-
- appended = TRUE; // We've done this, don't do it again
+ m_prevRadio = NULL;
}
-#endif // USE_MENU_BITMAPS
else // a normal item
{
// text has "_" instead of "&" after mitem->SetText() so don't use it
- wxString text( mitem->GetText() );
-
- // buffers containing the menu item path and type in multibyte form
- char bufPath[256],
- bufType[256];
-
- strcpy( bufPath, "/" );
- strncat( bufPath, wxGTK_CONV(text), WXSIZEOF(bufPath) - 2 );
- bufPath[WXSIZEOF(bufPath) - 1] = '\0';
+ text = mitem->GetText() ;
- GtkItemFactoryEntry entry;
- entry.path = bufPath;
- entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
- entry.callback_action = 0;
-
- wxString pathRadio;
- const char *item_type;
switch ( mitem->GetKind() )
{
case wxITEM_CHECK:
- item_type = "<CheckItem>";
+ {
+ menuItem = gtk_check_menu_item_new_with_label( wxGTK_CONV( text ) );
+ label = GTK_LABEL( GTK_BIN(menuItem)->child );
+ // set new text
+ gtk_label_set_text( label, wxGTK_CONV( text ) );
+ m_prevRadio = NULL;
break;
+ }
case wxITEM_RADIO:
- if ( m_pathLastRadio.empty() )
+ {
+ GSList *group = NULL;
+ if ( m_prevRadio == NULL )
{
// start of a new radio group
- item_type = "<RadioItem>";
- wxString tmp( wxGTK_CONV_BACK( bufPath ) );
- tmp.Remove(0,1);
- m_pathLastRadio = tmp;
+ m_prevRadio = menuItem = gtk_radio_menu_item_new_with_label( group, wxGTK_CONV( text ) );
+ label = GTK_LABEL( GTK_BIN(menuItem)->child );
+ // set new text
+ gtk_label_set_text( label, wxGTK_CONV( text ) );
}
else // continue the radio group
{
- pathRadio = m_pathLastRadio;
- pathRadio.Replace(wxT("_"), wxT(""));
- pathRadio.Prepend(wxT("<main>/"));
-
- strncpy(bufType, wxGTK_CONV(pathRadio), WXSIZEOF(bufType));
- bufType[WXSIZEOF(bufType) - 1] = '\0';
- item_type = bufType;
+ 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 ) );
+ label = GTK_LABEL( GTK_BIN(menuItem)->child );
}
-
- // continue the existing radio group, if any
- endOfRadioGroup = FALSE;
break;
+ }
default:
wxFAIL_MSG( _T("unexpected menu item kind") );
// fall through
case wxITEM_NORMAL:
- item_type = "<Item>";
+ {
+ menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) );
+ label = GTK_LABEL( GTK_BIN(menuItem)->child );
+ m_prevRadio = NULL;
break;
+ }
}
- entry.item_type = (char *)item_type; // cast needed for GTK+
- entry.accelerator = (gchar*) NULL;
+ }
-#if wxUSE_ACCEL
- // due to an apparent bug in GTK+, we have to use a static buffer here -
- // otherwise GTK+ 1.2.2 manages to override the memory we pass to it
- // somehow! (VZ)
- char s_accel[50]; // should be big enough, we check for overruns
- wxString tmp( GetHotKey(*mitem) );
- strncpy(s_accel, wxGTK_CONV( tmp ), WXSIZEOF(s_accel));
- s_accel[WXSIZEOF(s_accel) - 1] = '\0';
- entry.accelerator = s_accel;
-#else // !wxUSE_ACCEL
- entry.accelerator = (char*) NULL;
-#endif // wxUSE_ACCEL/!wxUSE_ACCEL
-
- gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
-
- wxString path( mitem->GetFactoryPath() );
- menuItem = gtk_item_factory_get_widget( m_factory, wxGTK_CONV( path ) );
-
- if (!menuItem)
- wxLogError( wxT("Wrong menu path: %s\n"), path.c_str() );
+ guint accel_key;
+ GdkModifierType accel_mods;
+ wxCharBuffer buf = wxGTK_CONV( GetGtkHotKey(*mitem) );
+
+ // wxPrintf( wxT("item: %s hotkey %s\n"), mitem->GetText().c_str(), GetGtkHotKey(*mitem).c_str() );
+ gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
+ if (accel_key != 0)
+ {
+ gtk_widget_add_accelerator (GTK_WIDGET(menuItem),
+ "activate",
+ m_accel,
+ accel_key,
+ accel_mods,
+ GTK_ACCEL_VISIBLE);
}
+ 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 );
+
if ( !mitem->IsSeparator() )
{
wxASSERT_MSG( menuItem, wxT("invalid menuitem") );
gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
(gpointer)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_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
+ {
+ gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
+ GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
+ (gpointer)this );
+ }
+
+ 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);
+ }
}
mitem->SetMenuItem(menuItem);
- if ( endOfRadioGroup )
+ if (ms_locked)
{
- m_pathLastRadio.clear();
+ // This doesn't even exist!
+ // gtk_widget_lock_accelerators(mitem->GetMenuItem());
}
- return TRUE;
+ return true;
}
-bool wxMenu::DoAppend(wxMenuItem *mitem)
+wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem)
{
- return GtkAppend(mitem) && wxMenuBase::DoAppend(mitem);
+ if (!GtkAppend(mitem))
+ return NULL;
+
+ return wxMenuBase::DoAppend(mitem);
}
-bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
+wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
{
if ( !wxMenuBase::DoInsert(pos, item) )
- return FALSE;
-
- // GTK+ doesn't have a function to insert a menu using GtkItemFactory (as
- // of version 1.2.6), so we first append the item and then change its
- // index
- if ( !GtkAppend(item) )
- return FALSE;
-
- if ( m_style & wxMENU_TEAROFF )
- {
- // change the position as the first item is the tear-off marker
- pos++;
- }
+ return NULL;
- GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget);
- gpointer data = g_list_last(menu_shell->children)->data;
- menu_shell->children = g_list_remove(menu_shell->children, data);
- menu_shell->children = g_list_insert(menu_shell->children, data, pos);
+ // TODO
+ if ( !GtkAppend(item, (int)pos) )
+ return NULL;
- return TRUE;
+ return item;
}
wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
{
- wxMenuItemList::Node *node = m_items.GetFirst();
+ wxMenuItemList::compatibility_iterator node = m_items.GetFirst();
while (node)
{
wxMenuItem *item = node->GetData();
if (item->GetMenuItem() == menuItem)
- return item->GetId();
+ return item->GetId();
node = node->GetNext();
}
// helpers
// ----------------------------------------------------------------------------
-#if GTK_CHECK_VERSION(1, 2, 0) && wxUSE_ACCEL
+#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:
- hotkey << wxT('F') << code - WXK_F1 + 1;
+ 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:
- hotkey << wxT("Prior" );
+ hotkey << wxT("PgUp" );
break;
case WXK_PAGEDOWN:
- hotkey << wxT("Next" );
+ hotkey << wxT("PgDn" );
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_PgUp" );
+ break;
+ case WXK_NUMPAD_PAGEDOWN:
+ hotkey << wxT("KP_PgDn" );
+ 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:
#endif // wxUSE_ACCEL
+// ----------------------------------------------------------------------------
+// Pop-up menu stuff
+// ----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-// substitute for missing GtkPixmapMenuItem
-//-----------------------------------------------------------------------------
+#if wxUSE_MENUS_NATIVE
-#ifdef USE_MENU_BITMAPS
-
-/*
- * 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>
-
-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);
+ wxMenuItem *menuitem = node->GetData();
+ if (menuitem->IsSubMenu())
+ {
+ SetInvokingWindow( menuitem->GetSubMenu(), win );
+ }
- if (GTK_WIDGET_DRAWABLE (widget) &&
- GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
- gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
- }
+ node = node->GetNext();
+ }
}
-static gint
-gtk_pixmap_menu_item_expose (GtkWidget *widget,
- GdkEventExpose *event)
+extern "C" WXDLLIMPEXP_CORE
+void wxPopupMenuPositionCallback( GtkMenu *menu,
+ gint *x, gint *y,
+ gpointer user_data )
{
- 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);
+ // ensure that the menu appears entirely on screen
+ GtkRequisition req;
+ gtk_widget_get_child_requisition(GTK_WIDGET(menu), &req);
- if (GTK_WIDGET_DRAWABLE (widget) &&
- GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
- gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
- }
+ wxSize sizeScreen = wxGetDisplaySize();
+ wxPoint *pos = (wxPoint*)user_data;
- return FALSE;
-}
+ gint xmax = sizeScreen.x - req.width,
+ ymax = sizeScreen.y - req.height;
-/**
- * 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)
-{
- 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);
-
- if (GTK_WIDGET_VISIBLE (pixmap->parent)) {
- if (GTK_WIDGET_MAPPED (pixmap->parent) &&
- GTK_WIDGET_VISIBLE(pixmap) &&
- !GTK_WIDGET_MAPPED (pixmap))
- gtk_widget_map (pixmap);
- }
-
- changed_have_pixmap_status(menu_item);
-
- 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 = gtk_signal_connect( GTK_OBJECT(menu->m_menu),
+ "hide",
+ GTK_SIGNAL_FUNC(gtk_pop_hide_callback),
+ (gpointer)&is_waiting );
- if (pmenu_item->pixmap && GTK_WIDGET_VISIBLE(pmenu_item))
+ wxPoint pos;
+ gpointer userdata;
+ GtkMenuPositionFunc posfunc;
+ if ( x == -1 && y == -1 )
{
- 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);
+ // use GTK's default positioning algorithm
+ userdata = NULL;
+ posfunc = NULL;
+ }
+ else
+ {
+ 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);
-}
-
-static void
-gtk_pixmap_menu_item_forall (GtkContainer *container,
- gboolean include_internals,
- GtkCallback callback,
- gpointer callback_data)
-{
- GtkPixmapMenuItem *menu_item;
-
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container));
- g_return_if_fail (callback != NULL);
-
- menu_item = GTK_PIXMAP_MENU_ITEM (container);
-
- if (menu_item->pixmap)
- (* callback) (menu_item->pixmap, callback_data);
-
- GTK_CONTAINER_CLASS(parent_class)->forall(container,include_internals,
- callback,callback_data);
-}
-
-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);
-
- if (menu_item->pixmap)
- gtk_widget_size_request(menu_item->pixmap, &req);
-
- 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);
-}
+ wxMenuEvent eventOpen(wxEVT_MENU_OPEN, -1, menu);
+ DoCommonMenuCallbackCode(menu, eventOpen);
-static void
-gtk_pixmap_menu_item_remove (GtkContainer *container,
- GtkWidget *child)
-{
- 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)));
-
- widget_was_visible = GTK_WIDGET_VISIBLE (child);
-
- 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));
- }
-
- if (widget_was_visible)
- gtk_widget_queue_resize (GTK_WIDGET (container));
-}
+ 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
+ wxGtkTimeLastClick // the time of activation
+ );
+ while (is_waiting)
+ {
+ gtk_main_iteration();
+ }
-/* important to only call this if there was actually a _change_ in pixmap == NULL */
-static void
-changed_have_pixmap_status (GtkPixmapMenuItem *menu_item)
-{
- if (menu_item->pixmap != NULL) {
- GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count += 1;
+ gtk_signal_disconnect(GTK_OBJECT(menu->m_menu), handler);
- 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;
+ wxMenuEvent eventClose(wxEVT_MENU_CLOSE, -1, menu);
+ DoCommonMenuCallbackCode(menu, eventClose);
- 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;
- }
- }
-
- /* 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 true;
}
-#endif // USE_MENU_BITMAPS
-
+#endif // wxUSE_MENUS_NATIVE
projects / wxWidgets.git / blobdiff