#endif // wxUSE_ACCEL
#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
static wxString GetHotKey( const wxMenuItem& item );
#endif
-////// BEGIN CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI //////
+//-----------------------------------------------------------------------------
+// substitute for missing GtkPixmapMenuItem
+//-----------------------------------------------------------------------------
-#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_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(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)))
+#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)))
struct _GtkPixmapMenuItem
{
- GtkMenuItem menu_item;
+ GtkMenuItem menu_item;
- GtkWidget *pixmap;
+ GtkWidget *pixmap;
};
struct _GtkPixmapMenuItemClass
{
- GtkMenuItemClass parent_class;
+ GtkMenuItemClass parent_class;
- guint orig_toggle_size;
- guint have_pixmap_count;
+ 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);
-/* Added by JACS */
-
-GtkWidget* gtk_pixmap_menu_item_new_with_label (const gchar *label, GtkWidget** labelWidget);
-
-////// END CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI //////
+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);
//-----------------------------------------------------------------------------
// idle system
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;
}
}
- wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id );
- event.SetEventObject( menu );
- if (item->IsCheckable())
- event.SetInt( item->IsChecked() );
-
-#if wxUSE_MENU_CALLBACK
- if (menu->GetCallback())
- {
- (void) (*(menu->GetCallback())) (*menu, event);
- return;
- }
-#endif // wxUSE_MENU_CALLBACK
-
- if (menu->GetEventHandler()->ProcessEvent(event))
- return;
-
- wxWindow *win = menu->GetInvokingWindow();
- if (win)
- win->GetEventHandler()->ProcessEvent( event );
+ menu->SendEvent(item->GetId(), item->IsCheckable() ? item->IsChecked() : -1);
}
//-----------------------------------------------------------------------------
wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
{
wxString label;
-#if (GTK_MINOR_VERSION > 0)
+
for ( const wxChar *pc = text.c_str(); *pc; pc++ )
{
- if ( *pc == wxT('_') || *pc == wxT('&') )
+ if ( *pc == wxT('_') )
{
- // '_' is the escape character for GTK+ and '&' is the one for
- // wxWindows - skip both of them
+ // wxGTK escapes "xxx_xxx" to "xxx__xxx"
+ pc++;
+ label += *pc;
+ continue;
+ }
+
+ if ( *pc == wxT('&') )
+ {
+ // wxMSW escapes &
continue;
}
label += *pc;
}
-#else // GTK+ 1.0
- label = text;
-#endif // GTK+ 1.2/1.0
return label;
}
wxString wxMenuItem::GetFactoryPath() const
{
- /* in order to get the pointer to the item we need the item text _without_
- underscores */
+ /* in order to get the pointer to the item we need the item text
+ _without_ underscores */
wxString path( wxT("<main>/") );
- path += GetLabel();
+ for ( const wxChar *pc = m_text.c_str(); *pc; pc++ )
+ {
+ if ( *pc == wxT('_') || *pc == wxT('&') )
+ {
+ // remove '_' and '&' unconditionally
+ continue;
+ }
+
+ path += *pc;
+ }
+
return path;
}
}
else if (mitem->GetBitmap().Ok()) // An item with bitmap
{
- //// UNFINISHED, because I don't know how to handle hotkeys and
- //// accelerators :-(
+ 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);
- GtkWidget* labelWidget;
- menuItem = gtk_pixmap_menu_item_new_with_label(mitem->GetText().mb_str(), &labelWidget);
- //menuItem = gtk_pixmap_menu_item_new_with_label("", &labelWidget);
- mitem->SetLabelWidget(labelWidget);
+ mitem->SetLabelWidget(label);
- //// TODO: should we store the widget somewhere to avoid a memory leak?
- GtkWidget* w = gtk_pixmap_new(mitem->GetBitmap().GetPixmap(), mitem->GetBitmap().GetMask() ? mitem->GetBitmap().GetMask()->GetBitmap() : (GdkBitmap* )NULL);
- gtk_widget_show(w);
- gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM( menuItem ), w);
+ 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),
gtk_menu_append( GTK_MENU(m_menu), menuItem );
gtk_widget_show( menuItem );
- //mitem->SetMenuItem(menuItem);
- //mitem->SetText(mitem->GetText());
-
appended = TRUE; // We've done this, don't do it again
}
else // a normal item
#endif // wxUSE_ACCEL
-////// BEGIN CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI //////
+//-----------------------------------------------------------------------------
+// substitute for missing GtkPixmapMenuItem
+//-----------------------------------------------------------------------------
/*
* Copyright (C) 1998, 1999, 2000 Free Software Foundation
/* Author: Dietmar Maurer <dm@vlsivie.tuwien.ac.at> */
-//#include "gtkpixmapmenuitem.h"
#include <gtk/gtkaccellabel.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkmenuitem.h>
gtk_widget_queue_resize(GTK_WIDGET(menu_item));
}
-/* Added by JACS */
-
-GtkWidget*
-gtk_pixmap_menu_item_new_with_label (const gchar *label, GtkWidget** labelWidget)
-{
- GtkWidget *menu_item;
- GtkWidget *accel_label;
-
- menu_item = gtk_pixmap_menu_item_new ();
- accel_label = gtk_accel_label_new (label);
- if (labelWidget)
- *labelWidget = accel_label;
- gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5);
-
- gtk_container_add (GTK_CONTAINER (menu_item), accel_label);
- gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label), menu_item);
- gtk_widget_show (accel_label);
-
- return menu_item;
-}
-
-////// END CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI //////
projects / wxWidgets.git / blobdiff