// 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/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"
#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_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
+ #define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
#define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
- #define ACCEL_OBJECT GObject
+ #define ACCEL_OBJECT GtkWindow
#define ACCEL_OBJECTS(a) (a)->acceleratables
- #define ACCEL_OBJ_CAST(obj) G_OBJECT(obj)
+ #define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
#else // GTK+ 1.x
#define ACCEL_OBJECT GtkObject
#define ACCEL_OBJECTS(a) (a)->attach_objects
#define ACCEL_OBJ_CAST(obj) GTK_OBJECT(obj)
#endif
+// we use normal item but with a special id for the menu title
+static const int wxGTK_TITLE_ID = -3;
+
//-----------------------------------------------------------------------------
// 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))
guint have_pixmap_count;
};
-
-GtkType gtk_pixmap_menu_item_get_type (void);
+extern "C" {
+GtkType gtk_pixmap_menu_item_get_type (void);
GtkWidget* gtk_pixmap_menu_item_new (void);
void gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
- GtkWidget *pixmap);
+ GtkWidget *pixmap);
+}
-#endif // USE_MENU_BITMAPS
+#endif // !__WXGTK20__
//-----------------------------------------------------------------------------
// 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;
- for ( pc = title; *pc != wxT('\0'); pc++ )
+ pc = title;
+ while (*pc != wxT('\0'))
{
- if (*pc == wxT('&'))
+ if ((*pc == wxT('&')) && (*(pc+1) == wxT('&')))
{
-#if GTK_CHECK_VERSION(1, 2, 1)
- str << wxT('_');
+ // "&" is doubled to indicate "&" instead of accelerator
+ ++pc;
+ str << wxT('&');
}
- else if (*pc == wxT('/'))
+ else if (*pc == wxT('&'))
{
- str << wxT('\\');
-#endif
+ str << wxT('_');
}
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;
}
+ ++pc;
}
+
+ // wxPrintf( wxT("before %s after %s\n"), title.c_str(), str.c_str() );
+
return str;
}
+//-----------------------------------------------------------------------------
+// activate message from GTK
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu )
+{
+ if (g_isIdle) wxapp_install_idle_handler();
+
+ wxMenuEvent event( wxEVT_MENU_OPEN, -1, menu );
+ event.SetEventObject( menu );
+
+ wxEvtHandler* handler = menu->GetEventHandler();
+ if (handler && handler->ProcessEvent(event))
+ return;
+
+ wxWindow *win = menu->GetInvokingWindow();
+ if (win) win->GetEventHandler()->ProcessEvent( event );
+}
+}
+
//-----------------------------------------------------------------------------
// wxMenuBar
//-----------------------------------------------------------------------------
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() */
+ // 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();
+#ifndef __WXGTK20__
+ m_accel = gtk_accel_group_new();
#endif
if (style & wxMB_DOCKABLE)
PostCreation();
ApplyWidgetStyle();
+
+ for (size_t i = 0; i < n; ++i )
+ Append(menus[i], titles[i]);
}
-wxMenuBar::wxMenuBar()
+wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style)
{
- /* 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;
- }
-
- 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_widget = GTK_WIDGET(m_menubar);
+ 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 )
{
menu->SetInvokingWindow( (wxWindow*) NULL );
-#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 */
+#ifndef __WXGTK20__
+ // support for native hot keys
gtk_accel_group_detach( menu->m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) );
#endif
- 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 */
+#ifndef __WXGTK20__
+ // support for native key accelerators indicated by underscroes
ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget);
if ( !g_slist_find( ACCEL_OBJECTS(m_accel), obj ) )
gtk_accel_group_attach( m_accel, obj );
-#endif // GTK+ 1.2.1+
+#endif
- 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 */
+#ifndef __WXGTK20__
+ // 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+
+#endif
- wxMenuList::Node *node = m_menus.GetFirst();
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node)
{
wxMenu *menu = node->GetData();
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 */
+ // 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)
-
- /* local buffer in multibyte form */
- wxString buf;
- buf << wxT('/') << str.c_str();
-
- char *cbuf = new char[buf.Length()+1];
- strcpy(cbuf, buf.mbc_str());
-
- 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"
+#ifdef __WXGTK20__
+ menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
+#else
+ menu->m_owner = gtk_menu_item_new_with_label( wxGTK_CONV( str ) );
+ GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
+ // set new text
+ gtk_label_set_text( label, wxGTK_CONV( str ) );
+ // reparse key accel
+ guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( str ) );
+ if (accel_key != GDK_VoidSymbol)
{
- // 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, tmp.mb_str() );
- gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
- delete [] cbuf;
-#else
+#endif
- menu->m_owner = gtk_menu_item_new_with_label( str.mb_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 );
+ 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 );
-#endif
+ gtk_signal_connect( GTK_OBJECT(menu->m_owner), "activate",
+ GTK_SIGNAL_FUNC(gtk_menu_open_callback),
+ (gpointer)menu );
// m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
- // adding menu later on.
+ // addings menu later on.
if (m_invokingWindow)
+ {
wxMenubarSetInvokingWindow( menu, m_invokingWindow );
+ // OPTIMISE ME: we should probably cache this, or pass it
+ // directly, but for now this is a minimal
+ // change to validate the new dynamic sizing.
+ // see (and refactor :) similar code in Remove
+ // below.
+
+ wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
+
+ if( frame )
+ frame->UpdateMenuBarSize();
+ }
+
return TRUE;
}
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;
+ // 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;
-#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)
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_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 );
+ menu->m_owner = NULL;
-/*
- 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 ) );
-*/
+ if (m_invokingWindow)
+ {
+ // OPTIMISE ME: see comment in GtkAppend
+ wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
+
+ if( frame )
+ frame->UpdateMenuBarSize();
+ }
return menu;
}
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") );
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('&') )
+ if ( *pc == wxT('_') )
{
- // '_' is the escape character for GTK+ and '&' is the one for
- // wxWindows - skip both of them
+ // '_' is the escape character for GTK+
continue;
}
+ // don't remove ampersands '&' since if we have them in the menu title
+ // it means that they were doubled to indicate "&" instead of accelerator
+
label += *pc;
}
-#else // GTK+ 1.0
- label = text;
-#endif // GTK+ 1.2/1.0
return label;
}
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, str.mb_str());
+ gtk_label_set( glabel, wxGTK_CONV( str ) );
/* reparse key accel */
- (void)gtk_label_parse_uline (GTK_LABEL(label), str.mb_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();
- 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);
- }
}
- menu->SendEvent(item->GetId(), item->IsCheckable() ? item->IsChecked() : -1);
+
+ // Is this menu on a menubar? (possibly nested)
+ wxFrame* frame = NULL;
+ 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.
+ // Don't call frame->ProcessCommand(id) because it toggles
+ // checkable items and we've already done that above.
+ wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
+ commandEvent.SetEventObject(frame);
+ if (item->IsCheckable())
+ commandEvent.SetInt(item->IsChecked());
+ commandEvent.SetEventObject(menu);
+
+ frame->GetEventHandler()->ProcessEvent(commandEvent);
+ }
+ else
+ {
+ // otherwise let the menu have it
+ 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();
wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
event.SetEventObject( menu );
- if (menu->GetEventHandler()->ProcessEvent(event))
+ wxEvtHandler* handler = menu->GetEventHandler();
+ if (handler && handler->ProcessEvent(event))
return;
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();
wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
event.SetEventObject( menu );
- if (menu->GetEventHandler()->ProcessEvent(event))
+ wxEvtHandler* handler = menu->GetEventHandler();
+ if (handler && handler->ProcessEvent(event))
return;
wxWindow *win = menu->GetInvokingWindow();
if (win)
win->GetEventHandler()->ProcessEvent( event );
}
+}
//-----------------------------------------------------------------------------
// wxMenuItem
for ( const wxChar *pc = text.c_str(); *pc; pc++ )
{
- if ( *pc == wxT('_') )
+ if ( *pc == wxT('\t'))
+ break;
+
+ if ( *pc == wxT('_') )
{
- // wxGTK escapes "xxx_xxx" to "xxx__xxx"
+ // GTK 1.2 escapes "xxx_xxx" to "xxx__xxx"
pc++;
label += *pc;
continue;
}
- if ( *pc == wxT('&') )
+#ifdef __WXGTK20__
+ if ( *pc == wxT('\\') )
{
- // wxMSW escapes &
+ // GTK 2.0 escapes "xxx/xxx" to "xxx\/xxx"
+ pc++;
+ label += *pc;
+ continue;
+ }
+#endif
+
+ if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) )
+ {
+ // wxMSW escapes "&"
+ // "&" is doubled to indicate "&" instead of accelerator
continue;
}
label += *pc;
}
+ // wxPrintf( wxT("GetLabelFromText(): text %s label %s\n"), text.c_str(), label.c_str() );
+
return label;
}
void wxMenuItem::SetText( const wxString& str )
{
+ // Some optimization to avoid flicker
+ wxString oldLabel = m_text;
+ oldLabel = wxStripMenuCodes(oldLabel);
+ oldLabel.Replace(wxT("_"), wxT(""));
+ 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;
if (m_labelWidget)
- label = (GtkLabel*) m_labelWidget;
+ label = (GtkLabel*) m_labelWidget;
else
- label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
+ label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
- /* set new text */
- gtk_label_set( label, m_text.mb_str());
+#ifdef __WXGTK20__
+ gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV(m_text) );
+#else
+ // set new text
+ gtk_label_set( label, wxGTK_CONV( m_text ) );
- /* reparse key accel */
- (void)gtk_label_parse_uline (GTK_LABEL(label), m_text.mb_str() );
+ // 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);
}
}
// it's valid for this function to be called even if m_menuItem == NULL
void wxMenuItem::DoSetText( const wxString& str )
{
- /* '\t' is the deliminator indicating a hot key */
+ // '\t' is the deliminator indicating a hot key
m_text.Empty();
const wxChar *pc = str;
- for (; (*pc != wxT('\0')) && (*pc != wxT('\t')); pc++ )
+ while ( (*pc != wxT('\0')) && (*pc != wxT('\t')) )
{
- if (*pc == wxT('&'))
+ if ((*pc == wxT('&')) && (*(pc+1) == wxT('&')))
+ {
+ // "&" is doubled to indicate "&" instead of accelerator
+ ++pc;
+ m_text << wxT('&');
+ }
+ else if (*pc == wxT('&'))
{
-#if GTK_CHECK_VERSION(1, 2, 0)
m_text << wxT('_');
}
else if ( *pc == wxT('_') ) // escape underscores
{
m_text << wxT("__");
}
- else if (*pc == wxT('/')) /* we have to filter out slashes ... */
- {
- m_text << wxT('\\'); /* ... and replace them with back slashes */
-#endif // GTK+ 1.2.0+
- }
else
+ {
m_text << *pc;
+ }
+ ++pc;
}
- /* only GTK 1.2 knows about hot keys */
m_hotKey = wxT("");
-#if GTK_CHECK_VERSION(1, 2, 0)
if(*pc == wxT('\t'))
{
pc++;
m_hotKey = pc;
}
-#endif // GTK+ 1.2.0+
+
+ // wxPrintf( wxT("DoSetText(): str %s m_text %s hotkey %s\n"), str.c_str(), m_text.c_str(), m_hotKey.c_str() );
}
#if wxUSE_ACCEL
{
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+ does it itself for the radio item
- if ( GetKind() == wxITEM_CHECK )
+ switch ( GetKind() )
{
- gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
+ 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") );
}
}
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
//-----------------------------------------------------------------------------
void wxMenu::Init()
{
-#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>" );
-#else
- m_menu = gtk_menu_new(); // Do not show!
-#endif
+ 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;
-#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)
+ // 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 = (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);
}
-#endif // GTK+ 1.2.0+
+
+ 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();
-
- gtk_widget_destroy( m_menu );
-
- gtk_object_unref( GTK_OBJECT(m_factory) );
+ WX_CLEAR_LIST(wxMenuItemList, m_items);
+
+ if ( GTK_IS_WIDGET( m_menu ))
+ {
+ // 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;
+ wxString text;
+#ifndef __WXGTK20__
+ GtkLabel* label;
#endif
-#if GTK_CHECK_VERSION(1, 2, 0)
- // is this a radio item?
- bool isRadio = FALSE;
-#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" );
-#else // GTK+ 1.0
+#ifdef __WXGTK20__
+ menuItem = gtk_separator_menu_item_new();
+#else
+ // TODO
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);
+#endif
}
-#ifdef USE_MENU_BITMAPS
- else if (mitem->GetBitmap().Ok()) // An item with bitmap
+ else if (mitem->GetBitmap().Ok())
{
- wxString text( mitem->GetText() );
+ text = mitem->GetText();
const wxBitmap *bitmap = &mitem->GetBitmap();
+#ifdef __WXGTK20__
+ menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );
+
+ GtkWidget *image;
+ if (bitmap->HasPixbuf())
+ {
+ image = gtk_image_new_from_pixbuf(bitmap->GetPixbuf());
+ }
+ else
+ {
+ GdkPixmap *gdk_pixmap = bitmap->GetPixmap();
+ GdkBitmap *gdk_bitmap = bitmap->GetMask() ?
+ bitmap->GetMask()->GetBitmap() :
+ (GdkBitmap*) NULL;
+ image = gtk_image_new_from_pixmap( gdk_pixmap, gdk_bitmap );
+ }
+
+ gtk_widget_show(image);
+
+ gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(menuItem), image );
+
+#else
+ GdkPixmap *gdk_pixmap = bitmap->GetPixmap();
+ GdkBitmap *gdk_bitmap = bitmap->GetMask() ? bitmap->GetMask()->GetBitmap() : (GdkBitmap*) NULL;
+
menuItem = gtk_pixmap_menu_item_new ();
- GtkWidget *label = gtk_accel_label_new (text.mb_str());
+ label = GTK_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), text.mb_str() );
+ gtk_container_add (GTK_CONTAINER (menuItem), GTK_WIDGET(label));
+
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);
+ gtk_widget_show (GTK_WIDGET(label));
+
+ mitem->SetLabelWidget(GTK_WIDGET(label));
- GtkWidget* pixmap = gtk_pixmap_new( bitmap->GetPixmap(), bitmap->GetMask() ? bitmap->GetMask()->GetBitmap() : (GdkBitmap* )NULL);
+ GtkWidget* pixmap = gtk_pixmap_new( gdk_pixmap, gdk_bitmap );
gtk_widget_show(pixmap);
gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM( menuItem ), pixmap);
- gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
- GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
- (gpointer)this );
- gtk_menu_append( GTK_MENU(m_menu), menuItem );
- gtk_widget_show( menuItem );
+#endif
- appended = TRUE; // We've done this, don't do it again
+ m_prevRadio = NULL;
}
-#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;
+ // text has "_" instead of "&" after mitem->SetText() so don't use it
+ text = mitem->GetText() ;
+
switch ( mitem->GetKind() )
{
case wxITEM_CHECK:
- item_type = "<CheckItem>";
+ {
+#ifdef __WXGTK20__
+ menuItem = gtk_check_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );
+#else
+ menuItem = gtk_check_menu_item_new_with_label( wxGTK_CONV( text ) );
+ label = GTK_LABEL( GTK_BIN(menuItem)->child );
+ // set new text
+ gtk_label_set_text( label, wxGTK_CONV( text ) );
+#endif
+ 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>";
- m_pathLastRadio = buf + 1;
+#ifdef __WXGTK20__
+ m_prevRadio = menuItem = gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV( text ) );
+#else
+ m_prevRadio = menuItem = gtk_radio_menu_item_new_with_label( group, wxGTK_CONV( text ) );
+ label = GTK_LABEL( GTK_BIN(menuItem)->child );
+ // set new text
+ gtk_label_set_text( label, wxGTK_CONV( text ) );
+#endif
}
else // continue the radio group
{
- pathRadio = m_pathLastRadio;
- pathRadio.Replace("_", "");
- pathRadio.Prepend("<main>/");
- item_type = pathRadio;
+#ifdef __WXGTK20__
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (m_prevRadio));
+ m_prevRadio = menuItem = gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV( text ) );
+#else
+ group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (m_prevRadio));
+ m_prevRadio = menuItem = gtk_radio_menu_item_new_with_label( group, wxGTK_CONV( text ) );
+ label = GTK_LABEL( GTK_BIN(menuItem)->child );
+#endif
}
-
- // remember that this one was a radio item to avoid resetting
- // m_pathLastRadio below
- isRadio = TRUE;
break;
+ }
default:
wxFAIL_MSG( _T("unexpected menu item kind") );
// fall through
case wxITEM_NORMAL:
- item_type = "<Item>";
+ {
+#ifdef __WXGTK20__
+ menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );
+#else
+ menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) );
+ label = GTK_LABEL( GTK_BIN(menuItem)->child );
+#endif
+ 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)
- 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
+ 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), "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 );
+ 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 );
+ }
+
+#ifndef __WXGTK20__
+ guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
+ if (accel_key != GDK_VoidSymbol)
+ {
+ gtk_widget_add_accelerator (menuItem,
+ "activate_item",
+ gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)),
+ accel_key,
+ GDK_MOD1_MASK,
+ GTK_ACCEL_LOCKED);
+ }
+#endif
}
-#endif // GTK+ 1.0
mitem->SetMenuItem(menuItem);
-#if GTK_CHECK_VERSION(1, 2, 0)
- if ( !isRadio )
+ if (ms_locked)
{
- m_pathLastRadio.clear();
+ // This doesn't even exist!
+ // gtk_widget_lock_accelerators(mitem->GetMenuItem());
}
-#endif // GTK+ >= 1.2
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;
+ return 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;
+ // TODO
+ if ( !GtkAppend(item, (int)pos) )
+ return NULL;
- if ( m_style & wxMENU_TEAROFF )
- {
- // change the position as the first item is the tear-off marker
- pos++;
- }
-
- 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...
- wxFAIL_MSG( wxT("not implemented") );
-
- return FALSE;
-#endif // GTK 1.2/1.0
+ return item;
}
wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
{
- wxNode *node = m_items.First();
+ wxMenuItemList::compatibility_iterator node = m_items.GetFirst();
while (node)
{
- wxMenuItem *item = (wxMenuItem*)node->Data();
+ wxMenuItem *item = node->GetData();
if (item->GetMenuItem() == menuItem)
- return item->GetId();
- node = node->Next();
+ return item->GetId();
+ node = node->GetNext();
}
return wxNOT_FOUND;
// 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_INSERT:
+ hotkey << wxT("Insert" );
+ break;
+ case WXK_DELETE:
+ hotkey << wxT("Delete" );
+ break;
+ case WXK_UP:
+ hotkey << wxT("Up" );
+ break;
+ case WXK_DOWN:
+ hotkey << wxT("Down" );
+ break;
+ case WXK_PAGEUP:
+ case WXK_PRIOR:
+ hotkey << wxT("Prior" );
+ break;
+ case WXK_PAGEDOWN:
+ case WXK_NEXT:
+ hotkey << wxT("Next" );
+ break;
+ case WXK_LEFT:
+ hotkey << wxT("Left" );
+ break;
+ case WXK_RIGHT:
+ hotkey << wxT("Right" );
+ break;
+ case WXK_HOME:
+ hotkey << wxT("Home" );
+ break;
+ case WXK_END:
+ hotkey << wxT("End" );
+ break;
+ case WXK_RETURN:
+ hotkey << wxT("Return" );
+ break;
+ 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_INSERT:
- hotkey << wxT("Insert" );
+ case WXK_NUMPAD_SPACE:
+ hotkey << wxT("KP_Space" );
break;
- case WXK_DELETE:
- hotkey << wxT("Delete" );
+ 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_PRIOR: case WXK_NUMPAD_PAGEUP:
+ hotkey << wxT("KP_Prior" );
+ break;
+ case WXK_NUMPAD_NEXT: case WXK_NUMPAD_PAGEDOWN:
+ hotkey << wxT("KP_Next" );
+ 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 wxGetAccelFromString() may
// return, we should process them here
default:
if ( code < 127 )
{
- gchar *name = gdk_keyval_name((guint)code);
+ wxString name = wxGTK_CONV_BACK( gdk_keyval_name((guint)code) );
if ( name )
{
hotkey << name;
// substitute for missing GtkPixmapMenuItem
//-----------------------------------------------------------------------------
-#ifdef USE_MENU_BITMAPS
+#ifndef __WXGTK20__
/*
* Copyright (C) 1998, 1999, 2000 Free Software Foundation
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);
+ GdkRectangle *area);
static gint gtk_pixmap_menu_item_expose (GtkWidget *widget,
- GdkEventExpose *event);
+ 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);
+ GtkAllocation *allocation);
static void gtk_pixmap_menu_item_forall (GtkContainer *container,
- gboolean include_internals,
- GtkCallback callback,
- gpointer callback_data);
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data);
static void gtk_pixmap_menu_item_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
+ GtkRequisition *requisition);
static void gtk_pixmap_menu_item_remove (GtkContainer *container,
- GtkWidget *child);
+ GtkWidget *child);
static void changed_have_pixmap_status (GtkPixmapMenuItem *menu_item);
static GtkMenuItemClass *parent_class = NULL;
-}
+} // extern "C"
#define BORDER_SPACING 3
#define PMAP_WIDTH 20
};
pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (),
- &pixmap_menu_item_info);
+ &pixmap_menu_item_info);
}
return pixmap_menu_item_type;
}
+extern "C" {
+
/**
* gtk_pixmap_menu_item_new
*
static void
gtk_pixmap_menu_item_draw (GtkWidget *widget,
- GdkRectangle *area)
+ GdkRectangle *area)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget));
static gint
gtk_pixmap_menu_item_expose (GtkWidget *widget,
- GdkEventExpose *event)
+ GdkEventExpose *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget), FALSE);
void
gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
- GtkWidget *pixmap)
+ GtkWidget *pixmap)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (pixmap != NULL);
if (GTK_WIDGET_VISIBLE (pixmap->parent)) {
if (GTK_WIDGET_MAPPED (pixmap->parent) &&
- GTK_WIDGET_VISIBLE(pixmap) &&
+ GTK_WIDGET_VISIBLE(pixmap) &&
!GTK_WIDGET_MAPPED (pixmap))
gtk_widget_map (pixmap);
}
static void
gtk_pixmap_menu_item_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
+ GtkAllocation *allocation)
{
GtkPixmapMenuItem *pmenu_item;
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 */
+ + (((allocation->height - child_allocation.height) - child_allocation.x)
+ / 2)); /* center pixmaps vertically */
gtk_widget_size_allocate (pmenu_item->pixmap, &child_allocation);
}
static void
gtk_pixmap_menu_item_forall (GtkContainer *container,
- gboolean include_internals,
- GtkCallback callback,
- gpointer callback_data)
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data)
{
GtkPixmapMenuItem *menu_item;
(* callback) (menu_item->pixmap, callback_data);
GTK_CONTAINER_CLASS(parent_class)->forall(container,include_internals,
- callback,callback_data);
+ callback,callback_data);
}
static void
gtk_pixmap_menu_item_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+ GtkRequisition *requisition)
{
GtkPixmapMenuItem *menu_item;
GtkRequisition req = {0, 0};
static void
gtk_pixmap_menu_item_remove (GtkContainer *container,
- GtkWidget *child)
+ GtkWidget *child)
{
GtkBin *bin;
gboolean widget_was_visible;
bin = GTK_BIN (container);
g_return_if_fail ((bin->child == child ||
- (GTK_PIXMAP_MENU_ITEM(container)->pixmap == child)));
+ (GTK_PIXMAP_MENU_ITEM(container)->pixmap == child)));
widget_was_visible = GTK_WIDGET_VISIBLE (child);
gtk_widget_queue_resize(GTK_WIDGET(menu_item));
}
-#endif // USE_MENU_BITMAPS
+} // extern "C"
+
+#endif // !__WXGTK20__
projects / wxWidgets.git / blobdiff