#pragma implementation "menuitem.h"
#endif
-#include "wx/menu.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/app.h"
+#include "wx/bitmap.h"
+#include "wx/menu.h"
#if wxUSE_ACCEL
#include "wx/accel.h"
#endif // wxUSE_ACCEL
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/gtk/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
//-----------------------------------------------------------------------------
// 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 );
+#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
+//-----------------------------------------------------------------------------
+
+static wxString wxReplaceUnderscore( const wxString& title )
+{
+ const wxChar *pc;
+
+ /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
+ wxString str;
+ for ( pc = title; *pc != wxT('\0'); pc++ )
+ {
+ if (*pc == wxT('&'))
+ {
+#if GTK_CHECK_VERSION(1, 2, 1)
+ str << wxT('_');
+ }
+ else if (*pc == wxT('/'))
+ {
+ str << wxT('\\');
+#endif
+ }
+ else
+ {
+#if __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;
+ }
+ }
+ return str;
+}
+
//-----------------------------------------------------------------------------
// wxMenuBar
//-----------------------------------------------------------------------------
m_menus.DeleteContents( TRUE );
/* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+#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>" );
}
PostCreation();
+
+ ApplyWidgetStyle();
}
wxMenuBar::wxMenuBar()
m_menus.DeleteContents( TRUE );
/* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+#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>" );
m_widget = GTK_WIDGET(m_menubar);
PostCreation();
+
+ ApplyWidgetStyle();
}
wxMenuBar::~wxMenuBar()
{
menu->SetInvokingWindow( (wxWindow*) NULL );
-#if (GTK_MINOR_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 0)
wxWindow *top_frame = win;
- while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame))
+ while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
/* support for native hot keys */
- gtk_accel_group_detach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
+ gtk_accel_group_detach( menu->m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) );
#endif
- wxNode *node = menu->GetItems().First();
+ wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
while (node)
{
- wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+ wxMenuItem *menuitem = node->GetData();
if (menuitem->IsSubMenu())
wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win );
- node = node->Next();
+ node = node->GetNext();
}
}
{
menu->SetInvokingWindow( win );
-#if (GTK_MINOR_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 1)
wxWindow *top_frame = win;
- while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame))
+ while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
/* support for native hot keys */
- gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
-#endif
+ 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+
- wxNode *node = menu->GetItems().First();
+ wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
while (node)
{
- wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+ wxMenuItem *menuitem = node->GetData();
if (menuitem->IsSubMenu())
wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win );
- node = node->Next();
+ node = node->GetNext();
}
}
void wxMenuBar::SetInvokingWindow( wxWindow *win )
{
m_invokingWindow = win;
-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 1)
wxWindow *top_frame = win;
- while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame))
+ while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
/* support for native key accelerators indicated by underscroes */
- gtk_accel_group_attach( m_accel, GTK_OBJECT(top_frame->m_widget) );
-#endif
+ 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+
- wxNode *node = m_menus.First();
+ wxMenuList::Node *node = m_menus.GetFirst();
while (node)
{
- wxMenu *menu = (wxMenu*)node->Data();
+ wxMenu *menu = node->GetData();
wxMenubarSetInvokingWindow( menu, win );
- node = node->Next();
+ node = node->GetNext();
}
}
void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
{
m_invokingWindow = (wxWindow*) NULL;
-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 1)
wxWindow *top_frame = win;
- while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame))
+ 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, GTK_OBJECT(top_frame->m_widget) );
-#endif
+ gtk_accel_group_detach( m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) );
+#endif // GTK+ 1.2.1+
- wxNode *node = m_menus.First();
+ wxMenuList::Node *node = m_menus.GetFirst();
while (node)
{
- wxMenu *menu = (wxMenu*)node->Data();
+ wxMenu *menu = node->GetData();
wxMenubarUnsetInvokingWindow( menu, win );
- node = node->Next();
+ node = node->GetNext();
}
}
-void wxMenuBar::Append( wxMenu *menu, const wxString &title )
+bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
{
- m_menus.Append( menu );
-
- const wxChar *pc;
+ if ( !wxMenuBarBase::Append( menu, title ) )
+ return FALSE;
- /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
- wxString str;
- for ( pc = title; *pc != wxT('\0'); pc++ )
- {
- if (*pc == wxT('&'))
- {
-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
- str << wxT('_');
- }
- else if (*pc == wxT('/'))
- {
- str << wxT('\\');
-#endif
- }
- else
- {
-#if __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
+ return GtkAppend(menu, title);
+}
- str << *pc;
- }
- }
+bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title)
+{
+ 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_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 1)
/* local buffer in multibyte form */
wxString buf;
entry.accelerator = (gchar*) NULL;
entry.callback = (GtkItemFactoryCallback) NULL;
entry.callback_action = 0;
- entry.item_type = "<Branch>";
+ 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++ )
{
// contrary to the common sense, we must throw out _all_ underscores,
// adding menu later on.
if (m_invokingWindow)
wxMenubarSetInvokingWindow( menu, m_invokingWindow );
+
+ return TRUE;
+}
+
+bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
+{
+ if ( !wxMenuBarBase::Insert(pos, menu, title) )
+ return FALSE;
+
+#if __WXGTK12__
+ // 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;
+
+ if (pos+1 >= m_menus.GetCount())
+ return TRUE;
+
+ 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);
+
+ return TRUE;
+#else // GTK < 1.2
+ // this should be easy to do with GTK 1.0 - can use standard functions for
+ // this and don't need any hacks like above, but as I don't have GTK 1.0
+ // any more I can't do it
+ wxFAIL_MSG( wxT("TODO") );
+
+ return FALSE;
+#endif // GTK 1.2/1.0
+}
+
+wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
+{
+ // remove the old item and insert a new one
+ wxMenu *menuOld = Remove(pos);
+ if ( menuOld && !Insert(pos, menu, title) )
+ {
+ return (wxMenu*) NULL;
+ }
+
+ // either Insert() succeeded or Remove() failed and menuOld is NULL
+ return menuOld;
+}
+
+wxMenu *wxMenuBar::Remove(size_t pos)
+{
+ wxMenu *menu = wxMenuBarBase::Remove(pos);
+ if ( !menu )
+ return (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 ) );
+*/
+
+ // 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_widget_destroy( menu->m_owner );
+
+/*
+ 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 ) );
+*/
+
+ return menu;
}
static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
{
- if (menu->GetTitle() == menuString)
+ if (wxMenuItem::GetLabelFromText(menu->GetTitle()) == wxMenuItem::GetLabelFromText(menuString))
{
int res = menu->FindItem( itemString );
if (res != wxNOT_FOUND)
return res;
}
- wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast
+ wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
while (node)
{
- wxMenuItem *item = (wxMenuItem*)node->Data();
+ wxMenuItem *item = node->GetData();
if (item->IsSubMenu())
return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
- node = node->Next();
+ node = node->GetNext();
}
return wxNOT_FOUND;
}
-wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem ) const
-{
- if ( menuForItem )
- {
- // TODO return the pointer to the menu
-
- *menuForItem = NULL;
- }
-
- return FindItem(itemId);
-}
-
int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
{
- wxNode *node = m_menus.First();
+ wxMenuList::Node *node = m_menus.GetFirst();
while (node)
{
- wxMenu *menu = (wxMenu*)node->Data();
+ wxMenu *menu = node->GetData();
int res = FindMenuItemRecursive( menu, menuString, itemString);
- if (res != -1) return res;
- node = node->Next();
+ if (res != -1)
+ return res;
+ node = node->GetNext();
}
- return -1;
+
+ return wxNOT_FOUND;
}
// Find a wxMenuItem using its id. Recurses down into sub-menus
static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
{
- wxMenuItem* result = menu->FindItem(id);
+ wxMenuItem* result = menu->FindChildItem(id);
- wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast
+ wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
while ( node && result == NULL )
{
- wxMenuItem *item = (wxMenuItem*)node->Data();
+ wxMenuItem *item = node->GetData();
if (item->IsSubMenu())
{
result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
}
- node = node->Next();
+ node = node->GetNext();
}
return result;
}
-wxMenuItem* wxMenuBar::FindItem( int id ) const
+wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const
{
wxMenuItem* result = 0;
- wxNode *node = m_menus.First();
+ wxMenuList::Node *node = m_menus.GetFirst();
while (node && result == 0)
{
- wxMenu *menu = (wxMenu*)node->Data();
+ wxMenu *menu = node->GetData();
result = FindMenuItemByIdRecursive( menu, id );
- node = node->Next();
+ node = node->GetNext();
}
- return result;
-}
-
-void wxMenuBar::Check( int id, bool check )
-{
- wxMenuItem* item = FindMenuItemById( id );
-
- wxCHECK_RET( item, wxT("wxMenuBar::Check: no such item") );
-
- item->Check(check);
-}
-
-bool wxMenuBar::IsChecked( int id ) const
-{
- wxMenuItem* item = FindMenuItemById( id );
-
- wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsChecked: no such item") );
-
- return item->IsChecked();
-}
-
-void wxMenuBar::Enable( int id, bool enable )
-{
- wxMenuItem* item = FindMenuItemById( id );
-
- wxCHECK_RET( item, wxT("wxMenuBar::Enable: no such item") );
-
- item->Enable(enable);
-}
-
-bool wxMenuBar::IsEnabled( int id ) const
-{
- wxMenuItem* item = FindMenuItemById( id );
-
- wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsEnabled: no such item") );
-
- return item->IsEnabled();
-}
-
-wxString wxMenuBar::GetLabel( int id ) const
-{
- wxMenuItem* item = FindMenuItemById( id );
-
- wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetLabel: no such item") );
-
- return item->GetText();
-}
-
-void wxMenuBar::SetLabel( int id, const wxString &label )
-{
- wxMenuItem* item = FindMenuItemById( id );
-
- wxCHECK_RET( item, wxT("wxMenuBar::SetLabel: no such item") );
+ if ( menuForItem )
+ {
+ *menuForItem = result ? result->GetMenu() : (wxMenu *)NULL;
+ }
- item->SetText( label );
+ return result;
}
-void wxMenuBar::EnableTop( int pos, bool flag )
+void wxMenuBar::EnableTop( size_t pos, bool flag )
{
- wxNode *node = m_menus.Nth( pos );
+ wxMenuList::Node *node = m_menus.Item( pos );
wxCHECK_RET( node, wxT("menu not found") );
- wxMenu* menu = (wxMenu*)node->Data();
+ wxMenu* menu = node->GetData();
if (menu->m_owner)
gtk_widget_set_sensitive( menu->m_owner, flag );
}
-wxString wxMenuBar::GetLabelTop( int pos ) const
+wxString wxMenuBar::GetLabelTop( size_t pos ) const
{
- wxNode *node = m_menus.Nth( pos );
+ wxMenuList::Node *node = m_menus.Item( pos );
wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") );
- wxMenu* menu = (wxMenu*)node->Data();
+ wxMenu* menu = node->GetData();
- return menu->GetTitle();
+ wxString label;
+ wxString text( menu->GetTitle() );
+#if GTK_CHECK_VERSION(1, 2, 0)
+ for ( const wxChar *pc = text.c_str(); *pc; pc++ )
+ {
+ if ( *pc == wxT('_') || *pc == wxT('&') )
+ {
+ // '_' is the escape character for GTK+ and '&' is the one for
+ // wxWindows - skip both of them
+ continue;
+ }
+
+ label += *pc;
+ }
+#else // GTK+ 1.0
+ label = text;
+#endif // GTK+ 1.2/1.0
+
+ return label;
}
-void wxMenuBar::SetLabelTop( int pos, const wxString& label )
+void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
{
- wxNode *node = m_menus.Nth( pos );
+ wxMenuList::Node *node = m_menus.Item( pos );
wxCHECK_RET( node, wxT("menu not found") );
- wxMenu* menu = (wxMenu*)node->Data();
-
- menu->SetTitle( label );
-}
+ wxMenu* menu = node->GetData();
-void wxMenuBar::SetHelpString( int id, const wxString& helpString )
-{
- wxMenuItem* item = FindMenuItemById( id );
+ wxString str( wxReplaceUnderscore( label ) );
- wxCHECK_RET( item, wxT("wxMenuBar::SetHelpString: no such item") );
+ menu->SetTitle( str );
- item->SetHelp( helpString );
-}
+ if (menu->m_owner)
+ {
+ GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
-wxString wxMenuBar::GetHelpString( int id ) const
-{
- wxMenuItem* item = FindMenuItemById( id );
+ /* set new text */
+ gtk_label_set( label, str.mb_str());
- wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetHelpString: no such item") );
+ /* reparse key accel */
+ (void)gtk_label_parse_uline (GTK_LABEL(label), str.mb_str() );
+ gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );
+ }
- return item->GetHelp();
}
//-----------------------------------------------------------------------------
static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
{
- if (g_isIdle) wxapp_install_idle_handler();
+ if (g_isIdle)
+ wxapp_install_idle_handler();
int id = menu->FindMenuIdByMenuItem(widget);
/* should find it for normal (not popup) menu */
- wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) );
+ wxASSERT_MSG( (id != -1) || (menu->GetInvokingWindow() != NULL),
+ _T("menu item not found in gtk_menu_clicked_callback") );
if (!menu->IsEnabled(id))
return;
- wxMenuItem* item = menu->FindItem( id );
+ wxMenuItem* item = menu->FindChildItem( id );
wxCHECK_RET( item, wxT("error in menu item callback") );
if (item->IsCheckable())
{
- bool isReallyChecked = item->IsChecked();
- if ( item->wxMenuItemBase::IsChecked() == isReallyChecked )
+ bool isReallyChecked = item->IsChecked(),
+ isInternallyChecked = item->wxMenuItemBase::IsChecked();
+
+ // ensure that the internal state is always consistent with what is
+ // shown on the screen
+ item->wxMenuItemBase::Check(isReallyChecked);
+
+ // we must not report the events for the radio button going up nor the
+ // events resulting from the calls to wxMenuItem::Check()
+ if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) ||
+ (isInternallyChecked == isReallyChecked) )
{
- /* the menu item has been checked by calling wxMenuItem->Check() */
return;
}
- else
- {
- /* the user pressed on the menu item -> report and make consistent
- * again */
- item->wxMenuItemBase::Check(isReallyChecked);
- }
- }
-
- wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id );
- event.SetEventObject( menu );
- event.SetInt(id );
- if (menu->GetCallback())
- {
- (void) (*(menu->GetCallback())) (*menu, event);
- return;
+ // the user pressed on the menu item: report the event below
}
- if (menu->GetEventHandler()->ProcessEvent(event))
- return;
-
- wxWindow *win = menu->GetInvokingWindow();
- if (win)
- win->GetEventHandler()->ProcessEvent( event );
+ menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
}
//-----------------------------------------------------------------------------
// wxMenuItem
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
int id,
const wxString& name,
const wxString& help,
- bool isCheckable,
+ wxItemKind kind,
wxMenu *subMenu)
{
- return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
+ return new wxMenuItem(parentMenu, id, name, help, kind, subMenu);
+}
+
+wxMenuItem::wxMenuItem(wxMenu *parentMenu,
+ int id,
+ const wxString& text,
+ const wxString& help,
+ wxItemKind kind,
+ wxMenu *subMenu)
+ : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
+{
+ Init(text);
}
wxMenuItem::wxMenuItem(wxMenu *parentMenu,
const wxString& help,
bool isCheckable,
wxMenu *subMenu)
+ : wxMenuItemBase(parentMenu, id, text, help,
+ isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
{
- m_id = id;
- m_isCheckable = isCheckable;
- m_isChecked = FALSE;
- m_isEnabled = TRUE;
- m_subMenu = subMenu;
- m_parentMenu = parentMenu;
- m_help = help;
+ Init(text);
+}
+void wxMenuItem::Init(const wxString& text)
+{
+ m_labelWidget = (GtkWidget *) NULL;
m_menuItem = (GtkWidget *) NULL;
- // call it after initializing m_menuItem to NULL
DoSetText(text);
}
// don't delete menu items, the menus take care of that
}
+// return the menu item text without any menu accels
+/* static */
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+{
+ wxString label;
+
+ for ( const wxChar *pc = text.c_str(); *pc; pc++ )
+ {
+ if ( *pc == wxT('_') )
+ {
+ // wxGTK escapes "xxx_xxx" to "xxx__xxx"
+ pc++;
+ label += *pc;
+ continue;
+ }
+
+ if ( *pc == wxT('&') )
+ {
+ // wxMSW escapes &
+ continue;
+ }
+
+ label += *pc;
+ }
+
+ return label;
+}
+
+void wxMenuItem::SetText( const wxString& str )
+{
+ DoSetText(str);
+
+ if (m_menuItem)
+ {
+ GtkLabel *label;
+ if (m_labelWidget)
+ label = (GtkLabel*) m_labelWidget;
+ else
+ label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
+
+ /* set new text */
+ gtk_label_set( label, m_text.mb_str());
+
+ /* reparse key accel */
+ (void)gtk_label_parse_uline (GTK_LABEL(label), m_text.mb_str() );
+ gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );
+ }
+}
+
// it's valid for this function to be called even if m_menuItem == NULL
void wxMenuItem::DoSetText( const wxString& str )
{
{
if (*pc == wxT('&'))
{
-#if (GTK_MINOR_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 0)
m_text << wxT('_');
}
else if ( *pc == wxT('_') ) // escape underscores
else if (*pc == wxT('/')) /* we have to filter out slashes ... */
{
m_text << wxT('\\'); /* ... and replace them with back slashes */
-#endif
+#endif // GTK+ 1.2.0+
}
else
- m_text << *pc;
+ m_text << *pc;
}
/* only GTK 1.2 knows about hot keys */
m_hotKey = wxT("");
-#if (GTK_MINOR_VERSION > 0)
+
+#if GTK_CHECK_VERSION(1, 2, 0)
if(*pc == wxT('\t'))
{
pc++;
m_hotKey = pc;
}
-#endif
+#endif // GTK+ 1.2.0+
+}
- if (m_menuItem)
+#if wxUSE_ACCEL
+
+wxAcceleratorEntry *wxMenuItem::GetAccel() const
+{
+ if ( !GetHotKey() )
{
- GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
- gtk_label_set( label, m_text.mb_str());
+ // nothing
+ return (wxAcceleratorEntry *)NULL;
}
-}
-void wxMenuItem::Check( bool check )
-{
- wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
+ // as wxGetAccelFromString() looks for TAB, insert a dummy one here
+ wxString label;
+ label << wxT('\t') << GetHotKey();
+
+ return wxGetAccelFromString(label);
+}
- wxCHECK_RET( IsCheckable(), wxT("Can't check uncheckable item!") )
+#endif // wxUSE_ACCEL
+
+void wxMenuItem::Check( bool check )
+{
+ wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
if (check == m_isChecked)
return;
wxMenuItemBase::Check( check );
- gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
+
+ switch ( GetKind() )
+ {
+ case wxITEM_CHECK:
+ case wxITEM_RADIO:
+ gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
+ break;
+
+ default:
+ wxFAIL_MSG( _T("can't check this item") );
+ }
}
void wxMenuItem::Enable( bool enable )
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 */
+ wxString path( wxT("<main>/") );
+
+ for ( const wxChar *pc = m_text.c_str(); *pc; pc++ )
+ {
+ if ( *pc == wxT('_') || *pc == wxT('&') )
+ {
+ // remove '_' and '&' unconditionally
+ continue;
+ }
+
+ path += *pc;
+ }
+
+ return path;
+}
+
//-----------------------------------------------------------------------------
// wxMenu
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
-void
-wxMenu::Init( const wxString& title,
- long style,
- const wxFunction func
- )
+void wxMenu::Init()
{
- m_title = title;
- m_items.DeleteContents( TRUE );
- m_invokingWindow = (wxWindow *) NULL;
- m_style = style;
-
-#if (GTK_MINOR_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 0)
m_accel = gtk_accel_group_new();
m_factory = gtk_item_factory_new( GTK_TYPE_MENU, "<main>", m_accel );
m_menu = gtk_item_factory_get_widget( m_factory, "<main>" );
m_menu = gtk_menu_new(); // Do not show!
#endif
- m_callback = func;
-
- m_eventHandler = this;
- m_clientData = (void*) NULL;
-
- if (m_title.IsNull()) m_title = wxT("");
- if (m_title != wxT(""))
- {
- Append(-2, m_title);
- AppendSeparator();
- }
-
m_owner = (GtkWidget*) NULL;
-#if (GTK_MINOR_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 0)
/* Tearoffs are entries, just like separators. So if we want this
menu to be a tear-off one, we just append a tearoff entry
immediately. */
if(m_style & wxMENU_TEAROFF)
{
GtkItemFactoryEntry entry;
- entry.path = "/tearoff";
+ entry.path = (char *)"/tearoff";
entry.callback = (GtkItemFactoryCallback) NULL;
entry.callback_action = 0;
- entry.item_type = "<Tearoff>";
+ 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" );
}
-#endif
+#endif // GTK+ 1.2.0+
+
+ // append the title as the very first entry if we have it
+ if ( !!m_title )
+ {
+ Append(-2, m_title);
+ AppendSeparator();
+ }
}
wxMenu::~wxMenu()
{
- wxNode *node = m_items.First();
- while (node)
- {
- wxMenuItem *item = (wxMenuItem*)node->Data();
- wxMenu *submenu = item->GetSubMenu();
- if (submenu)
- delete submenu;
- node = node->Next();
- }
+ m_items.Clear();
gtk_widget_destroy( m_menu );
gtk_object_unref( GTK_OBJECT(m_factory) );
}
-void wxMenu::SetTitle( const wxString& title )
+bool wxMenu::GtkAppend(wxMenuItem *mitem)
{
- // TODO Waiting for something better
- m_title = title;
+ GtkWidget *menuItem;
+
+#if defined(USE_MENU_BITMAPS) || !GTK_CHECK_VERSION(1, 2, 0)
+ bool appended = FALSE;
+#endif
+
+#if GTK_CHECK_VERSION(1, 2, 0)
+ // does this item terminate the current radio group?
+ bool endOfRadioGroup = TRUE;
+#endif // GTK+ >= 1.2
+
+ if ( mitem->IsSeparator() )
+ {
+#if GTK_CHECK_VERSION(1, 2, 0)
+ 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;
+#else // GTK+ 1.0
+ menuItem = gtk_menu_item_new();
+#endif // GTK 1.2/1.0
+ }
+ else if ( mitem->IsSubMenu() )
+ {
+#if GTK_CHECK_VERSION(1, 2, 0)
+ /* text has "_" instead of "&" after mitem->SetText() */
+ wxString text( mitem->GetText() );
+
+ /* local buffer in multibyte form */
+ char buf[200];
+ strcpy( buf, "/" );
+ strcat( buf, text.mb_str() );
+
+ GtkItemFactoryEntry entry;
+ entry.path = buf;
+ entry.callback = (GtkItemFactoryCallback) 0;
+ entry.callback_action = 0;
+ entry.item_type = (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, path.mb_str() );
+#else // GTK+ 1.0
+ menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str());
+#endif // GTK 1.2/1.0
+
+ 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() );
+ const wxBitmap *bitmap = &mitem->GetBitmap();
+
+ menuItem = gtk_pixmap_menu_item_new ();
+ GtkWidget *label = gtk_accel_label_new (text.mb_str());
+ 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), text.mb_str() );
+ 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);
+
+ 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
+ }
+#endif // USE_MENU_BITMAPS
+ else // a normal item
+ {
+#if GTK_CHECK_VERSION(1, 2, 0)
+ /* text has "_" instead of "&" after mitem->SetText() */
+ wxString text( mitem->GetText() );
+
+ /* local buffer in multibyte form */
+ char buf[200];
+ strcpy( buf, "/" );
+ strncat( buf, text.mb_str(), WXSIZEOF(buf) - 2 );
+ buf[WXSIZEOF(buf) - 1] = '\0';
+
+ GtkItemFactoryEntry entry;
+ entry.path = buf;
+ 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>";
+ break;
+
+ case wxITEM_RADIO:
+ if ( m_pathLastRadio.empty() )
+ {
+ // start of a new radio group
+ item_type = "<RadioItem>";
+ m_pathLastRadio = buf + 1;
+ }
+ else // continue the radio group
+ {
+ pathRadio = m_pathLastRadio;
+ pathRadio.Replace("_", "");
+ pathRadio.Prepend("<main>/");
+ item_type = pathRadio;
+ }
+
+ // 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>";
+ 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)
+ static char s_accel[50]; // must be big enougg
+ wxString tmp( GetHotKey(*mitem) );
+ strncpy(s_accel, tmp.mb_str(), WXSIZEOF(s_accel));
+ 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, path.mb_str() );
+#else // GTK+ 1.0
+ menuItem = checkable ? gtk_check_menu_item_new_with_label( mitem->GetText().mb_str() )
+ : gtk_menu_item_new_with_label( mitem->GetText().mb_str() );
+
+ gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
+ GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
+ (gpointer)this );
+#endif // GTK+ 1.2/1.0
+ }
+
+ if ( !mitem->IsSeparator() )
+ {
+ gtk_signal_connect( GTK_OBJECT(menuItem), "select",
+ GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
+ (gpointer)this );
+
+ gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
+ GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
+ (gpointer)this );
+ }
+
+#if !GTK_CHECK_VERSION(1, 2, 0)
+ if (!appended)
+ {
+ gtk_menu_append( GTK_MENU(m_menu), menuItem );
+ gtk_widget_show( menuItem );
+ }
+#endif // GTK+ 1.0
+
+ mitem->SetMenuItem(menuItem);
+
+#if GTK_CHECK_VERSION(1, 2, 0)
+ if ( endOfRadioGroup )
+ {
+ m_pathLastRadio.clear();
+ }
+#endif // GTK+ >= 1.2
+
+ return TRUE;
}
-const wxString wxMenu::GetTitle() const
+bool wxMenu::DoAppend(wxMenuItem *mitem)
{
- return m_title;
+ return GtkAppend(mitem) && wxMenuBase::DoAppend(mitem);
}
-void wxMenu::AppendSeparator()
+bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
{
- wxMenuItem *mitem = new wxMenuItem(this, wxID_SEPARATOR);
+ if ( !wxMenuBase::DoInsert(pos, item) )
+ return FALSE;
-#if (GTK_MINOR_VERSION > 0)
- GtkItemFactoryEntry entry;
- entry.path = "/sep";
- entry.callback = (GtkItemFactoryCallback) NULL;
- entry.callback_action = 0;
- entry.item_type = "<Separator>";
- entry.accelerator = (gchar*) NULL;
+#ifdef __WXGTK12__
+ // 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;
- gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
+ if ( m_style & wxMENU_TEAROFF )
+ {
+ // change the position as the first item is the tear-off marker
+ pos++;
+ }
- /* this will be wrong for more than one separator. do we care? */
- GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/sep" );
-#else
- GtkWidget *menuItem = gtk_menu_item_new();
- gtk_menu_append( GTK_MENU(m_menu), menuItem );
- gtk_widget_show( menuItem );
-#endif
+ 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);
- mitem->SetMenuItem(menuItem);
- m_items.Append( mitem );
+ return TRUE;
+#else // GTK < 1.2
+ // this should be easy to do...
+ wxFAIL_MSG( wxT("not implemented") );
+
+ return FALSE;
+#endif // GTK 1.2/1.0
+}
+
+wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
+{
+ if ( !wxMenuBase::DoRemove(item) )
+ return (wxMenuItem *)NULL;
+
+ // TODO: this code doesn't delete the item factory item and this seems
+ // impossible as of GTK 1.2.6.
+ gtk_widget_destroy( item->GetMenuItem() );
+
+ return item;
+}
+
+int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
+{
+ wxNode *node = m_items.First();
+ while (node)
+ {
+ wxMenuItem *item = (wxMenuItem*)node->Data();
+ if (item->GetMenuItem() == menuItem)
+ return item->GetId();
+ node = node->Next();
+ }
+
+ return wxNOT_FOUND;
}
-#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
+
+#if GTK_CHECK_VERSION(1, 2, 0) && wxUSE_ACCEL
+
static wxString GetHotKey( const wxMenuItem& item )
{
wxString hotkey;
- // as wxGetAccelFromString() looks for TAB, insert a dummy one here
- wxString label;
- label << wxT('\t') << item.GetHotKey();
- wxAcceleratorEntry *accel = wxGetAccelFromString(label);
+ wxAcceleratorEntry *accel = item.GetAccel();
if ( accel )
{
int flags = accel->GetFlags();
case WXK_F10:
case WXK_F11:
case WXK_F12:
- hotkey << wxT('F') << code = WXK_F1 + 1;
+ hotkey << wxT('F') << 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:
+ hotkey << wxT("Insert" );
+ break;
+ case WXK_DELETE:
+ hotkey << wxT("Delete" );
break;
- // if there are any other keys wxGetAccelFromString() may return,
- // we should process them here
+ // if there are any other keys wxGetAccelFromString() may
+ // return, we should process them here
default:
- if ( wxIsalnum(code) )
+ if ( code < 127 )
{
- hotkey << (wxChar)code;
-
- break;
+ gchar *name = gdk_keyval_name((guint)code);
+ if ( name )
+ {
+ hotkey << name;
+ break;
+ }
}
wxFAIL_MSG( wxT("unknown keyboard accel") );
}
- }
- if (accel)
+
delete accel;
+ }
return hotkey;
}
-#endif // wxUSE_ACCEL
-
-void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
-{
- wxMenuItem *mitem = new wxMenuItem(this, id, item, helpStr, checkable);
-
-#if (GTK_MINOR_VERSION > 0)
- /* text has "_" instead of "&" after mitem->SetText() */
- wxString text( mitem->GetText() );
-
- /* local buffer in multibyte form */
- char buf[200];
- strcpy( buf, "/" );
- strcat( buf, text.mb_str() );
-
- GtkItemFactoryEntry entry;
- entry.path = buf;
- entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
- entry.callback_action = 0;
- if (checkable)
- entry.item_type = "<CheckItem>";
- else
- entry.item_type = "<Item>";
-
-#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)
- static char s_accel[32]; // must be big enough for <control><alt><shift>F12
- strncpy(s_accel, GetHotKey(*mitem).mb_str(), WXSIZEOF(s_accel));
- entry.accelerator = s_accel;
-#else
- entry.accelerator = NULL;
-#endif
-
- gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
- /* in order to get the pointer to the item we need the item text _without_ underscores */
- wxString s = wxT("<main>/");
- for ( const wxChar *pc = text; *pc != wxT('\0'); pc++ )
- {
- while (*pc == wxT('_')) pc++; /* skip it */
- s << *pc;
- }
+#endif // wxUSE_ACCEL
- GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, s.mb_str() );
-#else
+//-----------------------------------------------------------------------------
+// substitute for missing GtkPixmapMenuItem
+//-----------------------------------------------------------------------------
- GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label( mitem->GetText().mb_str() )
- : gtk_menu_item_new_with_label( mitem->GetText().mb_str() );
+#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"
+{
- gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
- GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
- (gpointer)this );
+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);
- gtk_menu_append( GTK_MENU(m_menu), menuItem );
- gtk_widget_show( menuItem );
+/* we must override the following functions */
-#endif
+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);
- gtk_signal_connect( GTK_OBJECT(menuItem), "select",
- GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
- (gpointer)this );
+static void changed_have_pixmap_status (GtkPixmapMenuItem *menu_item);
- gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
- GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
- (gpointer)this );
+static GtkMenuItemClass *parent_class = NULL;
- mitem->SetMenuItem(menuItem);
-
- m_items.Append( mitem );
}
-void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr )
-{
- wxMenuItem *mitem = new wxMenuItem(this, id, item, helpStr, FALSE, subMenu);
-
-#if (GTK_MINOR_VERSION > 0)
- /* text has "_" instead of "&" after mitem->SetText() */
- wxString text( mitem->GetText() );
+#define BORDER_SPACING 3
+#define PMAP_WIDTH 20
- /* local buffer in multibyte form */
- char buf[200];
- strcpy( buf, "/" );
- strcat( buf, text.mb_str() );
-
- GtkItemFactoryEntry entry;
- entry.path = buf;
- entry.callback = (GtkItemFactoryCallback) 0;
- entry.callback_action = 0;
- entry.item_type = "<Branch>";
-
- gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
+GtkType
+gtk_pixmap_menu_item_get_type (void)
+{
+ static GtkType pixmap_menu_item_type = 0;
- /* in order to get the pointer to the item we need the item text _without_ underscores */
- wxString s = wxT("<main>/");
- for ( const wxChar *pc = text; *pc != wxT('\0'); pc++ )
+ if (!pixmap_menu_item_type)
{
- if (*pc == wxT('_')) pc++; /* skip it */
- s << *pc;
+ 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);
}
- GtkWidget *menuItem = gtk_item_factory_get_item( m_factory, s.mb_str() );
-
-#else
-
- GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str());
-
- gtk_menu_append( GTK_MENU(m_menu), menuItem );
- gtk_widget_show( menuItem );
-
-#endif
-
- gtk_signal_connect( GTK_OBJECT(menuItem), "select",
- GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
- (gpointer*)this );
-
- gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
- GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
- (gpointer*)this );
-
- gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
-
- mitem->SetMenuItem(menuItem);
-
- m_items.Append( mitem );
+ return pixmap_menu_item_type;
}
-void wxMenu::Append( wxMenuItem *item )
+/**
+ * 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)
{
- m_items.Append( item );
+ return GTK_WIDGET (gtk_type_new (gtk_pixmap_menu_item_get_type ()));
+}
- GtkWidget *menuItem = (GtkWidget*) NULL;
+static void
+gtk_pixmap_menu_item_class_init (GtkPixmapMenuItemClass *klass)
+{
+ GtkObjectClass *object_class;
+ GtkWidgetClass *widget_class;
+ GtkMenuItemClass *menu_item_class;
+ GtkContainerClass *container_class;
- if (item->IsSeparator())
- menuItem = gtk_menu_item_new();
- else if (item->IsSubMenu())
- menuItem = gtk_menu_item_new_with_label(item->GetText().mbc_str());
- else
- menuItem = item->IsCheckable() ? gtk_check_menu_item_new_with_label(item->GetText().mbc_str())
- : gtk_menu_item_new_with_label(item->GetText().mbc_str());
+ object_class = (GtkObjectClass*) klass;
+ widget_class = (GtkWidgetClass*) klass;
+ menu_item_class = (GtkMenuItemClass*) klass;
+ container_class = (GtkContainerClass*) klass;
- if (!item->IsSeparator())
- {
- gtk_signal_connect( GTK_OBJECT(menuItem), "select",
- GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
- (gpointer*)this );
+ parent_class = (GtkMenuItemClass*) gtk_type_class (gtk_menu_item_get_type ());
- gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
- GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
- (gpointer*)this );
+ 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;
- if (!item->IsSubMenu())
- {
- gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
- GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
- (gpointer*)this );
- }
- }
-
- gtk_menu_append( GTK_MENU(m_menu), menuItem );
- gtk_widget_show( menuItem );
- item->SetMenuItem(menuItem);
-}
+ container_class->forall = gtk_pixmap_menu_item_forall;
+ container_class->remove = gtk_pixmap_menu_item_remove;
-void wxMenu::Delete( int id )
-{
- wxNode *node = m_items.First();
- while (node)
- {
- wxMenuItem *item = (wxMenuItem*)node->Data();
- if (item->GetId() == id)
- {
- gtk_widget_destroy( item->GetMenuItem() );
- m_items.DeleteNode( node );
- return;
- }
- node = node->Next();
- }
+ klass->orig_toggle_size = menu_item_class->toggle_size;
+ klass->have_pixmap_count = 0;
}
-int wxMenu::FindItem( const wxString itemString ) const
+static void
+gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item)
{
- wxString s = wxT("");
- for ( const wxChar *pc = itemString; *pc != wxT('\0'); pc++ )
- {
- if (*pc == wxT('&'))
- {
- pc++; /* skip it */
-#if (GTK_MINOR_VERSION > 0)
- s << wxT('_');
-#endif
- }
- s << *pc;
- }
+ GtkMenuItem *mi;
- wxNode *node = m_items.First();
- while (node)
- {
- wxMenuItem *item = (wxMenuItem*)node->Data();
- if (item->GetText() == s)
- {
- return item->GetId();
- }
- node = node->Next();
- }
+ mi = GTK_MENU_ITEM (menu_item);
- return wxNOT_FOUND;
+ menu_item->pixmap = NULL;
}
-void wxMenu::Enable( int id, bool enable )
+static void
+gtk_pixmap_menu_item_draw (GtkWidget *widget,
+ GdkRectangle *area)
{
- wxMenuItem *item = FindItem(id);
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget));
+ g_return_if_fail (area != NULL);
- wxCHECK_RET( item, wxT("wxMenu::Enable: no such item") );
+ if (GTK_WIDGET_CLASS (parent_class)->draw)
+ (* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area);
- item->Enable(enable);
+ if (GTK_WIDGET_DRAWABLE (widget) &&
+ GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
+ gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
+ }
}
-bool wxMenu::IsEnabled( int id ) const
+static gint
+gtk_pixmap_menu_item_expose (GtkWidget *widget,
+ GdkEventExpose *event)
{
- wxMenuItem *item = FindItem(id);
+ 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);
- wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsEnabled: no such item") );
+ if (GTK_WIDGET_CLASS (parent_class)->expose_event)
+ (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
- return item->IsEnabled();
+ if (GTK_WIDGET_DRAWABLE (widget) &&
+ GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
+ gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
+ }
+
+ return FALSE;
}
-void wxMenu::Check( int id, bool enable )
+/**
+ * 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)
{
- wxMenuItem *item = FindItem(id);
+ 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);
+ }
- wxCHECK_RET( item, wxT("wxMenu::Check: no such item") );
+ changed_have_pixmap_status(menu_item);
- item->Check(enable);
+ if (GTK_WIDGET_VISIBLE (pixmap) && GTK_WIDGET_VISIBLE (menu_item))
+ gtk_widget_queue_resize (pixmap);
}
-bool wxMenu::IsChecked( int id ) const
+static void
+gtk_pixmap_menu_item_map (GtkWidget *widget)
{
- wxMenuItem *item = FindItem(id);
-
- wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsChecked: no such item") );
+ GtkPixmapMenuItem *menu_item;
- return item->IsChecked();
-}
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget));
-void wxMenu::SetLabel( int id, const wxString &label )
-{
- wxMenuItem *item = FindItem(id);
+ menu_item = GTK_PIXMAP_MENU_ITEM(widget);
- wxCHECK_RET( item, wxT("wxMenu::SetLabel: no such item") );
+ GTK_WIDGET_CLASS(parent_class)->map(widget);
- item->SetText(label);
+ if (menu_item->pixmap &&
+ GTK_WIDGET_VISIBLE (menu_item->pixmap) &&
+ !GTK_WIDGET_MAPPED (menu_item->pixmap))
+ gtk_widget_map (menu_item->pixmap);
}
-wxString wxMenu::GetLabel( int id ) const
+static void
+gtk_pixmap_menu_item_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
{
- wxMenuItem *item = FindItem(id);
+ GtkPixmapMenuItem *pmenu_item;
- wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetLabel: no such item") );
+ pmenu_item = GTK_PIXMAP_MENU_ITEM(widget);
- return item->GetText();
+ if (pmenu_item->pixmap && GTK_WIDGET_VISIBLE(pmenu_item))
+ {
+ 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);
+ }
+
+ if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
+ GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation);
}
-void wxMenu::SetHelpString( int id, const wxString& helpString )
+static void
+gtk_pixmap_menu_item_forall (GtkContainer *container,
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data)
{
- wxMenuItem *item = FindItem(id);
+ GtkPixmapMenuItem *menu_item;
- wxCHECK_RET( item, wxT("wxMenu::SetHelpString: no such item") );
+ g_return_if_fail (container != NULL);
+ g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container));
+ g_return_if_fail (callback != NULL);
- item->SetHelp( helpString );
-}
+ menu_item = GTK_PIXMAP_MENU_ITEM (container);
-wxString wxMenu::GetHelpString( int id ) const
-{
- wxMenuItem *item = FindItem(id);
-
- wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetHelpString: no such item") );
+ if (menu_item->pixmap)
+ (* callback) (menu_item->pixmap, callback_data);
- return item->GetHelp();
+ GTK_CONTAINER_CLASS(parent_class)->forall(container,include_internals,
+ callback,callback_data);
}
-int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
+static void
+gtk_pixmap_menu_item_size_request (GtkWidget *widget,
+ GtkRequisition *requisition)
{
- wxNode *node = m_items.First();
- while (node)
- {
- wxMenuItem *item = (wxMenuItem*)node->Data();
- if (item->GetMenuItem() == menuItem)
- return item->GetId();
- node = node->Next();
- }
+ GtkPixmapMenuItem *menu_item;
+ GtkRequisition req = {0, 0};
- return wxNOT_FOUND;
-}
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_MENU_ITEM (widget));
+ g_return_if_fail (requisition != NULL);
-wxMenuItem *wxMenu::FindItem(int id) const
-{
- wxNode *node = m_items.First();
- while (node)
- {
- wxMenuItem *item = (wxMenuItem*)node->Data();
- if (item->GetId() == id)
- {
- return item;
- }
- node = node->Next();
- }
+ GTK_WIDGET_CLASS(parent_class)->size_request(widget,requisition);
- /* Not finding anything here can be correct
- * when search the entire menu system for
- * an entry -> no error message. */
+ menu_item = GTK_PIXMAP_MENU_ITEM (widget);
- return (wxMenuItem *) NULL;
-}
+ if (menu_item->pixmap)
+ gtk_widget_size_request(menu_item->pixmap, &req);
-void wxMenu::SetInvokingWindow( wxWindow *win )
-{
- m_invokingWindow = win;
+ 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);
}
-wxWindow *wxMenu::GetInvokingWindow()
+static void
+gtk_pixmap_menu_item_remove (GtkContainer *container,
+ GtkWidget *child)
{
- return m_invokingWindow;
+ 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));
}
-// Update a menu and all submenus recursively. source is the object that has
-// the update event handlers defined for it. If NULL, the menu or associated
-// window will be used.
-void wxMenu::UpdateUI(wxEvtHandler* source)
+
+/* important to only call this if there was actually a _change_ in pixmap == NULL */
+static void
+changed_have_pixmap_status (GtkPixmapMenuItem *menu_item)
{
- if (!source && GetInvokingWindow())
- source = GetInvokingWindow()->GetEventHandler();
- if (!source)
- source = GetEventHandler();
- if (!source)
- source = this;
-
- wxNode* node = GetItems().First();
- while (node)
- {
- wxMenuItem* item = (wxMenuItem*) node->Data();
- if ( !item->IsSeparator() )
- {
- wxWindowID id = item->GetId();
- wxUpdateUIEvent event(id);
- event.SetEventObject( source );
+ if (menu_item->pixmap != NULL) {
+ GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count += 1;
- if (source->ProcessEvent(event))
- {
- if (event.GetSetText())
- SetLabel(id, event.GetText());
- if (event.GetSetChecked())
- Check(id, event.GetChecked());
- if (event.GetSetEnabled())
- Enable(id, event.GetEnabled());
- }
-
- if (item->GetSubMenu())
- item->GetSubMenu()->UpdateUI(source);
+ 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;
+
+ 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;
}
- node = node->Next();
}
+
+ /* 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));
}
+#endif // USE_MENU_BITMAPS
+
projects / wxWidgets.git / blobdiff