X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc47eed9ca8bbdff1bd3b1f8082d515598c121b1..04354c1deb9e900f89d299a88317569d55e196bf:/src/gtk/menu.cpp diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 029aa9c12f..586b2ea034 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -22,9 +22,26 @@ #include "wx/accel.h" #endif // wxUSE_ACCEL -#include +#include "wx/gtk/private.h" + #include -#include + +// FIXME: is this right? somehow I don't think so (VZ) +#ifdef __WXGTK20__ + #include + + #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 @@ -33,14 +50,21 @@ extern void wxapp_install_idle_handler(); extern bool g_isIdle; -#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL -static wxString GetHotKey( const wxMenuItem& item ); +#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)) @@ -77,6 +101,8 @@ 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 //----------------------------------------------------------------------------- @@ -84,14 +110,14 @@ void gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item, 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_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) +#if GTK_CHECK_VERSION(1, 2, 1) str << wxT('_'); } else if (*pc == wxT('/')) @@ -139,7 +165,7 @@ wxMenuBar::wxMenuBar( long style ) 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, "
", m_accel ); m_menubar = gtk_item_factory_get_widget( m_factory, "
" ); @@ -180,7 +206,7 @@ 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, "
", m_accel ); m_menubar = gtk_item_factory_get_widget( m_factory, "
" ); @@ -204,13 +230,13 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win ) { 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->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 wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); @@ -227,16 +253,16 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( 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->IsTopLevel())) top_frame = top_frame->GetParent(); /* support for native hot keys */ - GtkObject *obj = GTK_OBJECT(top_frame->m_widget); - if ( !g_slist_find( menu->m_accel->attach_objects, obj ) ) + 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 +#endif // GTK+ 1.2.1+ wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); while (node) @@ -251,16 +277,16 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) 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->IsTopLevel())) top_frame = top_frame->GetParent(); /* support for native key accelerators indicated by underscroes */ - GtkObject *obj = GTK_OBJECT(top_frame->m_widget); - if ( !g_slist_find( m_accel->attach_objects, obj ) ) + 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 +#endif // GTK+ 1.2.1+ wxMenuList::Node *node = m_menus.GetFirst(); while (node) @@ -274,14 +300,14 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win ) 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->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+ wxMenuList::Node *node = m_menus.GetFirst(); while (node) @@ -308,7 +334,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) 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; @@ -322,7 +348,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) entry.accelerator = (gchar*) NULL; entry.callback = (GtkItemFactoryCallback) NULL; entry.callback_action = 0; - entry.item_type = ""; + entry.item_type = (char *)""; 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 */ @@ -527,7 +553,7 @@ wxString wxMenuBar::GetLabelTop( size_t pos ) const wxString label; wxString text( menu->GetTitle() ); -#if (GTK_MINOR_VERSION > 0) +#if GTK_CHECK_VERSION(1, 2, 0) for ( const wxChar *pc = text.c_str(); *pc; pc++ ) { if ( *pc == wxT('_') || *pc == wxT('&') ) @@ -578,12 +604,14 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label ) 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; @@ -593,39 +621,25 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) 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 ); - if (item->IsCheckable()) - event.SetInt( item->IsChecked() ); -#if wxUSE_MENU_CALLBACK - if (menu->GetCallback()) - { - (void) (*(menu->GetCallback())) (*menu, event); - return; + // the user pressed on the menu item: report the event below } -#endif // wxUSE_MENU_CALLBACK - if (menu->GetEventHandler()->ProcessEvent(event)) - return; - - wxWindow *win = menu->GetInvokingWindow(); - if (win) - win->GetEventHandler()->ProcessEvent( event ); + menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); } //----------------------------------------------------------------------------- @@ -683,16 +697,27 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) // 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, @@ -701,15 +726,14 @@ 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; @@ -726,27 +750,39 @@ wxMenuItem::~wxMenuItem() 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; } void wxMenuItem::SetText( const wxString& str ) { + // 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; + DoSetText(str); if (m_menuItem) @@ -776,7 +812,7 @@ 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 @@ -786,7 +822,7 @@ void wxMenuItem::DoSetText( const wxString& str ) 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; @@ -794,13 +830,14 @@ void wxMenuItem::DoSetText( const wxString& str ) /* 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 wxUSE_ACCEL @@ -826,13 +863,21 @@ void wxMenuItem::Check( bool check ) { wxCHECK_RET( m_menuItem, wxT("invalid menu item") ); - wxCHECK_RET( IsCheckable(), wxT("Can't check uncheckable 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 ) @@ -855,10 +900,20 @@ bool wxMenuItem::IsChecked() const 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("
/") ); - 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; } @@ -871,7 +926,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler) void wxMenu::Init() { -#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, "
", m_accel ); m_menu = gtk_item_factory_get_widget( m_factory, "
" ); @@ -881,22 +936,22 @@ void wxMenu::Init() 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 = ""; + entry.item_type = (char *)""; 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, "
/tearoff" ); } -#endif +#endif // GTK+ 1.2.0+ // append the title as the very first entry if we have it if ( !!m_title ) @@ -919,29 +974,39 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) { 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_MINOR_VERSION > 0) +#if GTK_CHECK_VERSION(1, 2, 0) GtkItemFactoryEntry entry; - entry.path = "/sep"; + entry.path = (char *)"/sep"; entry.callback = (GtkItemFactoryCallback) NULL; entry.callback_action = 0; - entry.item_type = ""; + entry.item_type = (char *)""; 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, "
/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_MINOR_VERSION > 0) +#if GTK_CHECK_VERSION(1, 2, 0) /* text has "_" instead of "&" after mitem->SetText() */ wxString text( mitem->GetText() ); @@ -954,7 +1019,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) entry.path = buf; entry.callback = (GtkItemFactoryCallback) 0; entry.callback_action = 0; - entry.item_type = ""; + entry.item_type = (char *)""; entry.accelerator = (gchar*) NULL; gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */ @@ -973,11 +1038,12 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) 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); @@ -1008,25 +1074,61 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) appended = TRUE; // We've done this, don't do it again } +#endif // USE_MENU_BITMAPS else // a normal item { -#if (GTK_MINOR_VERSION > 0) +#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() ); + 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; - if ( mitem->IsCheckable() ) - entry.item_type = ""; - else - entry.item_type = ""; + + wxString pathRadio; + const char *item_type; + switch ( mitem->GetKind() ) + { + case wxITEM_CHECK: + item_type = ""; + break; + + case wxITEM_RADIO: + if ( m_pathLastRadio.empty() ) + { + // start of a new radio group + item_type = ""; + m_pathLastRadio = buf + 1; + } + else // continue the radio group + { + pathRadio = m_pathLastRadio; + pathRadio.Replace("_", ""); + pathRadio.Prepend("
/"); + 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 = ""; + break; + } + + entry.item_type = (char *)item_type; // cast needed for GTK+ entry.accelerator = (gchar*) NULL; #if wxUSE_ACCEL @@ -1066,7 +1168,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) (gpointer)this ); } -#if GTK_MINOR_VERSION == 0 +#if !GTK_CHECK_VERSION(1, 2, 0) if (!appended) { gtk_menu_append( GTK_MENU(m_menu), menuItem ); @@ -1076,6 +1178,13 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) mitem->SetMenuItem(menuItem); +#if GTK_CHECK_VERSION(1, 2, 0) + if ( endOfRadioGroup ) + { + m_pathLastRadio.clear(); + } +#endif // GTK+ >= 1.2 + return TRUE; } @@ -1146,7 +1255,8 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const // helpers // ---------------------------------------------------------------------------- -#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL +#if GTK_CHECK_VERSION(1, 2, 0) && wxUSE_ACCEL + static wxString GetHotKey( const wxMenuItem& item ) { wxString hotkey; @@ -1179,8 +1289,10 @@ static wxString GetHotKey( const wxMenuItem& item ) case WXK_F12: hotkey << wxT('F') << code - WXK_F1 + 1; break; - - // GTK seems to use XStringToKeySym here + + // 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; @@ -1194,15 +1306,18 @@ static wxString GetHotKey( const wxMenuItem& item ) 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") ); @@ -1213,6 +1328,7 @@ static wxString GetHotKey( const wxMenuItem& item ) return hotkey; } + #endif // wxUSE_ACCEL @@ -1220,6 +1336,8 @@ static wxString GetHotKey( const wxMenuItem& item ) // substitute for missing GtkPixmapMenuItem //----------------------------------------------------------------------------- +#ifdef USE_MENU_BITMAPS + /* * Copyright (C) 1998, 1999, 2000 Free Software Foundation * All rights reserved. @@ -1253,6 +1371,9 @@ static wxString GetHotKey( const wxMenuItem& item ) #include #include +extern "C" +{ + 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, @@ -1278,6 +1399,8 @@ static void changed_have_pixmap_status (GtkPixmapMenuItem *menu_item); static GtkMenuItemClass *parent_class = NULL; +} + #define BORDER_SPACING 3 #define PMAP_WIDTH 20 @@ -1290,7 +1413,7 @@ gtk_pixmap_menu_item_get_type (void) { GtkTypeInfo pixmap_menu_item_info = { - "GtkPixmapMenuItem", + (char *)"GtkPixmapMenuItem", sizeof (GtkPixmapMenuItem), sizeof (GtkPixmapMenuItemClass), (GtkClassInitFunc) gtk_pixmap_menu_item_class_init, @@ -1300,7 +1423,7 @@ gtk_pixmap_menu_item_get_type (void) (GtkClassInitFunc) NULL, }; - pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (), + pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (), &pixmap_menu_item_info); } @@ -1310,7 +1433,7 @@ gtk_pixmap_menu_item_get_type (void) /** * gtk_pixmap_menu_item_new * - * Creates a new pixmap menu item. Use gtk_pixmap_menu_item_set_pixmap() + * 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: @@ -1372,7 +1495,7 @@ gtk_pixmap_menu_item_draw (GtkWidget *widget, if (GTK_WIDGET_CLASS (parent_class)->draw) (* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area); - if (GTK_WIDGET_DRAWABLE (widget) && + if (GTK_WIDGET_DRAWABLE (widget) && GTK_PIXMAP_MENU_ITEM(widget)->pixmap) { gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL); } @@ -1389,7 +1512,7 @@ gtk_pixmap_menu_item_expose (GtkWidget *widget, if (GTK_WIDGET_CLASS (parent_class)->expose_event) (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event); - if (GTK_WIDGET_DRAWABLE (widget) && + if (GTK_WIDGET_DRAWABLE (widget) && GTK_PIXMAP_MENU_ITEM(widget)->pixmap) { gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL); } @@ -1422,8 +1545,8 @@ gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item, if (GTK_WIDGET_REALIZED (pixmap->parent) && !GTK_WIDGET_REALIZED (pixmap)) gtk_widget_realize (pixmap); - - if (GTK_WIDGET_VISIBLE (pixmap->parent)) { + + if (GTK_WIDGET_VISIBLE (pixmap->parent)) { if (GTK_WIDGET_MAPPED (pixmap->parent) && GTK_WIDGET_VISIBLE(pixmap) && !GTK_WIDGET_MAPPED (pixmap)) @@ -1431,7 +1554,7 @@ gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item, } changed_have_pixmap_status(menu_item); - + if (GTK_WIDGET_VISIBLE (pixmap) && GTK_WIDGET_VISIBLE (menu_item)) gtk_widget_queue_resize (pixmap); } @@ -1517,7 +1640,7 @@ gtk_pixmap_menu_item_size_request (GtkWidget *widget, 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); @@ -1538,19 +1661,19 @@ gtk_pixmap_menu_item_remove (GtkContainer *container, g_return_if_fail (GTK_IS_WIDGET (child)); bin = GTK_BIN (container); - g_return_if_fail ((bin->child == child || + 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; + 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)); } @@ -1572,7 +1695,7 @@ changed_have_pixmap_status (GtkPixmapMenuItem *menu_item) 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; + GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size; } } @@ -1581,8 +1704,9 @@ changed_have_pixmap_status (GtkPixmapMenuItem *menu_item) 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))) + if (GTK_WIDGET_VISIBLE(GTK_WIDGET(menu_item))) gtk_widget_queue_resize(GTK_WIDGET(menu_item)); } +#endif // USE_MENU_BITMAPS