Moved function from mslu to utils to make the

[wxWidgets.git] / src / gtk / menu.cpp

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 3701f416ee1c2eb1c32e736b08f776c3589523f6..83ba105c0095807db4616ea76ddeccc3f08f3a11 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -7,11 +7,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "menu.h"
-#pragma implementation "menuitem.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "menu.h"
+    #pragma implementation "menuitem.h"

 #endif
 
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/app.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/app.h"


@@ -30,19 +33,22 @@
 #ifdef __WXGTK20__
     #include <glib-object.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 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_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
 
 #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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // idle system
 //-----------------------------------------------------------------------------


@@ -50,20 +56,15 @@
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
 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 GetHotKey( const wxMenuItem& item );

 #endif
 
 //-----------------------------------------------------------------------------
 // substitute for missing GtkPixmapMenuItem
 //-----------------------------------------------------------------------------
 
 #endif
 
 //-----------------------------------------------------------------------------
 // substitute for missing GtkPixmapMenuItem
 //-----------------------------------------------------------------------------
 

-// FIXME: I can't make this compile with GTK+ 2.0, disabling for now (VZ)

 #ifndef __WXGTK20__
 #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_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))


@@ -96,12 +97,11 @@ struct _GtkPixmapMenuItemClass
 };
 
 
 };
 
 

-GtkType           gtk_pixmap_menu_item_get_type       (void);
+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* gtk_pixmap_menu_item_new            (void);
 void       gtk_pixmap_menu_item_set_pixmap     (GtkPixmapMenuItem *menu_item,
                                                                     GtkWidget *pixmap);

-
-#endif // USE_MENU_BITMAPS
+#endif // GTK 2.0

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -111,7 +111,7 @@ static wxString wxReplaceUnderscore( const wxString& title )
 {
     const wxChar *pc;
 
 {
     const wxChar *pc;
 

-    /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
+    // GTK 1.2 wants to have "_" instead of "&" for accelerators

     wxString str;
     pc = title;
     while (*pc != wxT('\0'))
     wxString str;
     pc = title;
     while (*pc != wxT('\0'))


@@ -124,43 +124,46 @@ static wxString wxReplaceUnderscore( const wxString& title )
         }
         else if (*pc == wxT('&'))
         {
         }
         else if (*pc == wxT('&'))
         {

-#if GTK_CHECK_VERSION(1, 2, 0)

             str << wxT('_');
             str << wxT('_');

-#endif

         }
         }

-#if GTK_CHECK_VERSION(2, 0, 0)
-        else if (*pc == wxT('/'))
-        {
-            str << wxT("\\/");
-        }
-        else if (*pc == wxT('\\'))
-        {
-            str << wxT("\\\\");
-        }
-#elif GTK_CHECK_VERSION(1, 2, 0)
-        else if (*pc == wxT('/'))
-        {
-            str << wxT('\\');
-        }
-#endif

         else
         {
         else
         {

-#if __WXGTK12__

             if ( *pc == wxT('_') )
             {
                 // underscores must be doubled to prevent them from being
                 // interpreted as accelerator character prefix by GTK
                 str << *pc;
             }
             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;
     }
 
             str << *pc;
         }
         ++pc;
     }

+
+    // wxPrintf( wxT("before %s after %s\n"), title.c_str(), str.c_str() );
+

     return str;
 }
 
     return str;
 }
 

+//-----------------------------------------------------------------------------
+// activate message from GTK
+//-----------------------------------------------------------------------------
+
+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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxMenuBar
 //-----------------------------------------------------------------------------


@@ -169,7 +172,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 
 wxMenuBar::wxMenuBar( long style )
 {
 
 wxMenuBar::wxMenuBar( 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;
     m_needParent = FALSE;
     m_style = style;
     m_invokingWindow = (wxWindow*) NULL;


@@ -181,15 +184,9 @@ wxMenuBar::wxMenuBar( long style )
         return;
     }
 
         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();
     m_menubar = gtk_menu_bar_new();

+#ifndef __WXGTK20__
+    m_accel = gtk_accel_group_new();

 #endif
 
     if (style & wxMB_DOCKABLE)
 #endif
 
     if (style & wxMB_DOCKABLE)


@@ -210,7 +207,7 @@ wxMenuBar::wxMenuBar( long style )
 
 wxMenuBar::wxMenuBar()
 {
 
 wxMenuBar::wxMenuBar()
 {

-    /* the parent window is known after wxFrame::SetMenu() */
+    // the parent window is known after wxFrame::SetMenu()

     m_needParent = FALSE;
     m_style = 0;
     m_invokingWindow = (wxWindow*) NULL;
     m_needParent = FALSE;
     m_style = 0;
     m_invokingWindow = (wxWindow*) NULL;


@@ -222,15 +219,9 @@ wxMenuBar::wxMenuBar()
         return;
     }
 
         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();
     m_menubar = gtk_menu_bar_new();

+#ifndef __WXGTK20__
+    m_accel = gtk_accel_group_new();

 #endif
 
     m_widget = GTK_WIDGET(m_menubar);
 #endif
 
     m_widget = GTK_WIDGET(m_menubar);


@@ -242,7 +233,6 @@ wxMenuBar::wxMenuBar()
 
 wxMenuBar::~wxMenuBar()
 {
 
 wxMenuBar::~wxMenuBar()
 {

-//    gtk_object_unref( GTK_OBJECT(m_factory) );  why not ?

 }
 
 static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
 }
 
 static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )


@@ -253,10 +243,12 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();
 
     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) );
     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();
     while (node)
     {
         wxMenuItem *menuitem = node->GetData();


@@ -270,18 +262,16 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
 {
     menu->SetInvokingWindow( win );
 
 {
     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();
 
     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 );
     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();
     while (node)
     {
         wxMenuItem *menuitem = node->GetData();


@@ -294,18 +284,18 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
 void wxMenuBar::SetInvokingWindow( wxWindow *win )
 {
     m_invokingWindow = win;
 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();
 
     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 );
     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();
     while (node)
     {
         wxMenu *menu = node->GetData();


@@ -317,16 +307,16 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win )
 void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 {
     m_invokingWindow = (wxWindow*) NULL;
 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();
 
     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) );
     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();
     while (node)
     {
         wxMenu *menu = node->GetData();


@@ -343,54 +333,46 @@ bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
     return GtkAppend(menu, title);
 }
 
     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 ) );
 
 {
     wxString str( wxReplaceUnderscore( title ) );
 

-    /* this doesn't have much effect right now */
+    // This doesn't have much effect right now.

     menu->SetTitle( str );
 
     menu->SetTitle( str );
 

-    /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
-#if GTK_CHECK_VERSION(1, 2, 1)
-
-    wxString buf;
-    buf << wxT('/') << str.c_str();
-
-    /* local buffer in multibyte form */
-    char cbuf[400]; 
-    strcpy(cbuf, wxGTK_CONV(buf) );
-
-    GtkItemFactoryEntry entry;
-    entry.path = (gchar *)cbuf;  // const_cast
-    entry.accelerator = (gchar*) NULL;
-    entry.callback = (GtkItemFactoryCallback) NULL;
-    entry.callback_action = 0;
-    entry.item_type = (char *)"<Branch>";
-
-    gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
-    /* in order to get the pointer to the item we need the item text _without_ underscores */
-    wxString tmp = wxT("<main>/");
-    const wxChar *pc;
-    for ( pc = str; *pc != wxT('\0'); pc++ )
+    // The "m_owner" is the "menu item"
+#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, wxGTK_CONV( tmp ) );
-    gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
-#else
+#endif

 
 

-    menu->m_owner = gtk_menu_item_new_with_label( wxGTK_CONV( str ) );

     gtk_widget_show( menu->m_owner );
     gtk_widget_show( menu->m_owner );

+

     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
 
     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
     // addings menu later on.
 
     // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
     // addings menu later on.


@@ -404,7 +386,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title)
             //               see (and refactor :) similar code in Remove
             //               below.
 
             //               see (and refactor :) similar code in Remove
             //               below.
 

-        wxFrame        *frame = wxDynamicCast( m_invokingWindow, wxFrame );
+        wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );

 
         if( frame )
             frame->UpdateMenuBarSize();
 
         if( frame )
             frame->UpdateMenuBarSize();


@@ -418,19 +400,10 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
         return FALSE;
 
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
         return FALSE;
 

-    // GTK+ doesn't have a function to insert a menu using GtkItemFactory (as
-    // of version 1.2.6), so we first append the item and then change its
-    // index
-    if ( !GtkAppend(menu, title) )
-        return FALSE;
-
-    if (pos+1 >= m_menus.GetCount())
-        return TRUE;
+    // TODO

 
 

-    GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget);
-    gpointer data = g_list_last(menu_shell->children)->data;
-    menu_shell->children = g_list_remove(menu_shell->children, data);
-    menu_shell->children = g_list_insert(menu_shell->children, data, pos);
+    if ( !GtkAppend(menu, title, (int)pos) )
+        return FALSE;

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -454,32 +427,18 @@ wxMenu *wxMenuBar::Remove(size_t pos)
     if ( !menu )
         return (wxMenu*) NULL;
 
     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 );
 
     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 ) );
-*/
+    menu->m_owner = NULL;

 
     if (m_invokingWindow)
     {
 
     if (m_invokingWindow)
     {

-            // OPTIMISE ME:  see comment in GtkAppend
+        // OPTIMISE ME:  see comment in GtkAppend
+        wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );

 
 

-       wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
-
-       if( frame )
+        if( frame )

             frame->UpdateMenuBarSize();
     }
 
             frame->UpdateMenuBarSize();
     }
 


@@ -495,7 +454,7 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString
             return res;
     }
 
             return res;
     }
 

-    wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
+    wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();

     while (node)
     {
         wxMenuItem *item = node->GetData();
     while (node)
     {
         wxMenuItem *item = node->GetData();


@@ -510,7 +469,7 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString
 
 int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
 {
 
 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();
     while (node)
     {
         wxMenu *menu = node->GetData();


@@ -528,7 +487,7 @@ static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
 {
     wxMenuItem* result = menu->FindChildItem(id);
 
 {
     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();
     while ( node && result == NULL )
     {
         wxMenuItem *item = node->GetData();


@@ -545,7 +504,7 @@ static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
 wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const
 {
     wxMenuItem* result = 0;
 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();
     while (node && result == 0)
     {
         wxMenu *menu = node->GetData();


@@ -563,7 +522,7 @@ wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const
 
 void wxMenuBar::EnableTop( size_t pos, bool flag )
 {
 
 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") );
 
 
     wxCHECK_RET( node, wxT("menu not found") );
 


@@ -575,7 +534,7 @@ void wxMenuBar::EnableTop( size_t pos, bool flag )
 
 wxString wxMenuBar::GetLabelTop( size_t pos ) const
 {
 
 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") );
 
 
     wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") );
 


@@ -591,6 +550,9 @@ wxString wxMenuBar::GetLabelTop( size_t pos ) const
             continue;
         }
 
             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;
     }
 
         label += *pc;
     }
 


@@ -599,7 +561,7 @@ wxString wxMenuBar::GetLabelTop( size_t pos ) const
 
 void wxMenuBar::SetLabelTop( size_t pos, const wxString& 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") );
 
 
     wxCHECK_RET( node, wxT("menu not found") );
 


@@ -644,10 +606,16 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
     wxMenuItem* item = menu->FindChildItem( id );
     wxCHECK_RET( item, wxT("error in menu item callback") );
 
     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->IsCheckable())
     {
         bool isReallyChecked = item->IsChecked(),

-             isInternallyChecked = item->wxMenuItemBase::IsChecked();
+            isInternallyChecked = item->wxMenuItemBase::IsChecked();

 
         // ensure that the internal state is always consistent with what is
         // shown on the screen
 
         // ensure that the internal state is always consistent with what is
         // shown on the screen


@@ -660,11 +628,36 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
         {
             return;
         }
         {
             return;
         }

-
-        // the user pressed on the menu item: report the event below

     }
 
     }
 

-    menu->SendEvent(id, 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);
+    }

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -685,7 +678,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
     wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
     event.SetEventObject( menu );
 
     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();
         return;
 
     wxWindow *win = menu->GetInvokingWindow();


@@ -710,7 +704,8 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
     wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
     event.SetEventObject( menu );
 
     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();
         return;
 
     wxWindow *win = menu->GetInvokingWindow();


@@ -778,7 +773,10 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 
     for ( const wxChar *pc = text.c_str(); *pc; pc++ )
     {
 
     for ( const wxChar *pc = text.c_str(); *pc; pc++ )
     {

-        if ( *pc == wxT('_')  )
+        if ( *pc == wxT('\t'))
+            break;
+
+        if ( *pc == wxT('_') )

         {
             // GTK 1.2 escapes "xxx_xxx" to "xxx__xxx"
             pc++;
         {
             // GTK 1.2 escapes "xxx_xxx" to "xxx__xxx"
             pc++;


@@ -786,7 +784,7 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
             continue;
         }
 
             continue;
         }
 

-#if GTK_CHECK_VERSION(2, 0, 0)
+#ifdef __WXGTK20__

         if ( *pc == wxT('\\')  )
         {
             // GTK 2.0 escapes "xxx/xxx" to "xxx\/xxx"
         if ( *pc == wxT('\\')  )
         {
             // GTK 2.0 escapes "xxx/xxx" to "xxx\/xxx"


@@ -796,9 +794,18 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
         }
 #endif
 
         }
 #endif
 

+        if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) )
+        {
+            // wxMSW escapes "&"
+            // "&" is doubled to indicate "&" instead of accelerator
+            continue;
+        }
+

         label += *pc;
     }
 
         label += *pc;
     }
 

+    // wxPrintf( wxT("GetLabelFromText(): text %s label %s\n"), text.c_str(), label.c_str() );
+

     return label;
 }
 
     return label;
 }
 


@@ -811,7 +818,7 @@ void wxMenuItem::SetText( const wxString& str )
     wxString label1 = wxStripMenuCodes(str.BeforeFirst('\t'));
     if (oldLabel == label1)
         return;
     wxString label1 = wxStripMenuCodes(str.BeforeFirst('\t'));
     if (oldLabel == label1)
         return;

-    
+

     DoSetText(str);
 
     if (m_menuItem)
     DoSetText(str);
 
     if (m_menuItem)


@@ -822,16 +829,8 @@ void wxMenuItem::SetText( const wxString& str )
         else
             label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
 
         else
             label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
 

-#if GTK_CHECK_VERSION(2, 0, 0)
-        // We have to imitate item_factory_unescape_label here
-        wxString tmp;
-        for (size_t n = 0; n < m_text.Len(); n++)
-        {
-            if (m_text[n] != wxT('\\'))
-                tmp += m_text[n];
-        }
-        
-        gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV(tmp) );
+#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 ) );
 #else
         // set new text
         gtk_label_set( label, wxGTK_CONV( m_text ) );


@@ -861,35 +860,19 @@ void wxMenuItem::DoSetText( const wxString& str )
         {
             m_text << wxT('_');
         }
         {
             m_text << wxT('_');
         }

-#if GTK_CHECK_VERSION(2, 0, 0)
-        else if ( *pc == wxT('_') )    // escape underscores
-        {
-            // m_text << wxT("__");    doesn't work
-        }
-        else if (*pc == wxT('/'))      // we have to escape slashes
-        {
-            m_text << wxT("\\/");
-        }
-        else if (*pc == wxT('\\'))     // we have to double backslashes
-        {
-            m_text << wxT("\\\\");
-        }
-#else

         else if ( *pc == wxT('_') )    // escape underscores
         {
             m_text << wxT("__");
         }
         else if ( *pc == wxT('_') )    // escape underscores
         {
             m_text << wxT("__");
         }

-        else if (*pc == wxT('/'))      /* we have to filter out slashes ... */
+        else

         {
         {

-            m_text << wxT('\\');  /* ... and replace them with back slashes */
-        }
-#endif
-        else {

             m_text << *pc;
         }
         ++pc;
     }
             m_text << *pc;
         }
         ++pc;
     }

-    
+
+    // wxPrintf( wxT("DoSetText(): str %s m_text %s\n"), str.c_str(), m_text.c_str() );
+

     m_hotKey = wxT("");
 
     if(*pc == wxT('\t'))
     m_hotKey = wxT("");
 
     if(*pc == wxT('\t'))


@@ -957,26 +940,6 @@ bool wxMenuItem::IsChecked() const
     return ((GtkCheckMenuItem*)m_menuItem)->active != 0;
 }
 
     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('_') )
-        {
-            // remove '_' unconditionally
-            continue;
-        }
-
-        path += *pc;
-    }
-
-    return path;
-}
-

 //-----------------------------------------------------------------------------
 // wxMenu
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxMenu
 //-----------------------------------------------------------------------------


@@ -986,227 +949,330 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 void wxMenu::Init()
 {
     m_accel = gtk_accel_group_new();
 void wxMenu::Init()
 {
     m_accel = gtk_accel_group_new();

-    m_factory = gtk_item_factory_new( GTK_TYPE_MENU, "<main>", m_accel );
-    m_menu = gtk_item_factory_get_widget( m_factory, "<main>" );
+    m_menu = gtk_menu_new();
+    // NB: keep reference to the menu so that it is not destroyed behind
+    //     our back by GTK+ e.g. when it is removed from menubar:
+    gtk_widget_ref(m_menu);

 
     m_owner = (GtkWidget*) NULL;
 
 
     m_owner = (GtkWidget*) NULL;
 

-    /* Tearoffs are entries, just like separators. So if we want this
-       menu to be a tear-off one, we just append a tearoff entry
-       immediately. */
-    if(m_style & wxMENU_TEAROFF)
+    // 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);

     }
 
     }
 

+    m_prevRadio = NULL;
+

     // append the title as the very first entry if we have it
     // 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()
 {
         AppendSeparator();
     }
 }
 
 wxMenu::~wxMenu()
 {

-   m_items.Clear();
-
-   gtk_widget_destroy( m_menu );
+   WX_CLEAR_LIST(wxMenuItemList, m_items);

 
 

-   gtk_object_unref( GTK_OBJECT(m_factory) );
+   if ( GTK_IS_WIDGET( m_menu ))
+   {
+       gtk_widget_unref( m_menu ); // see wxMenu::Init
+       gtk_widget_destroy( m_menu );
+   }

 }
 
 }
 

-bool wxMenu::GtkAppend(wxMenuItem *mitem)
+bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)

 {
     GtkWidget *menuItem;
 
 {
     GtkWidget *menuItem;
 

-#if defined(USE_MENU_BITMAPS) || !GTK_CHECK_VERSION(1, 2, 0)
-    bool appended = FALSE;
-#endif
-
-    // does this item terminate the current radio group?
-    bool endOfRadioGroup = TRUE;
-

     if ( mitem->IsSeparator() )
     {
     if ( mitem->IsSeparator() )
     {

-        GtkItemFactoryEntry entry;
-        entry.path = (char *)"/sep";
-        entry.callback = (GtkItemFactoryCallback) NULL;
-        entry.callback_action = 0;
-        entry.item_type = (char *)"<Separator>";
-        entry.accelerator = (gchar*) NULL;
-
-        gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
-
-        /* this will be wrong for more than one separator. do we care? */
-        menuItem = gtk_item_factory_get_widget( m_factory, "<main>/sep" );
-
-        // we might have a separator inside a radio group
-        endOfRadioGroup = FALSE;
+#ifdef __WXGTK20__
+        menuItem = gtk_separator_menu_item_new();
+#else
+        // TODO
+        menuItem = gtk_menu_item_new();
+#endif
+        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);

     }
     else if ( mitem->IsSubMenu() )
     {
     }
     else if ( mitem->IsSubMenu() )
     {

-        /* text has "_" instead of "&" after mitem->SetText() */
+        // text has "_" instead of "&" after mitem->SetText()

         wxString text( mitem->GetText() );
 
         wxString text( mitem->GetText() );
 

-        /* local buffer in multibyte form */
-        char buf[200];
-        strcpy( buf, "/" );
-        strcat( buf, wxGTK_CONV( text ) );
-
-        GtkItemFactoryEntry entry;
-        entry.path = buf;
-        entry.callback = (GtkItemFactoryCallback) 0;
-        entry.callback_action = 0;
-        entry.item_type = (char *)"<Branch>";
-        entry.accelerator = (gchar*) NULL;
-
-        gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
-
-        wxString path( mitem->GetFactoryPath() );
-        menuItem = gtk_item_factory_get_item( m_factory, wxGTK_CONV( path ) );
+#ifdef __WXGTK20__
+        menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );
+#else
+        menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) );
+        GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child );
+        // set new text
+        gtk_label_set_text( label, wxGTK_CONV( text ) );
+        // reparse key accel
+        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

 
         gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
 
         gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );

+        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( 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);
 
         // 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);

+
+        m_prevRadio = NULL;

     }
     }

-#ifdef USE_MENU_BITMAPS
-    else if (mitem->GetBitmap().Ok()) // An item with bitmap
+    else if (mitem->GetBitmap().Ok())

     {
     {

-        wxString text( mitem->GetText() );
+        wxString text = mitem->GetText();

         const wxBitmap *bitmap = &mitem->GetBitmap();
         const wxBitmap *bitmap = &mitem->GetBitmap();

+        GdkPixmap *gdk_pixmap = bitmap->GetPixmap();
+        GdkBitmap *gdk_bitmap = bitmap->GetMask() ? bitmap->GetMask()->GetBitmap() : (GdkBitmap*) NULL;
+
+#ifdef __WXGTK20__
+        menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );
+
+        GtkWidget *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 );
+
+        gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
+                            GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
+                            (gpointer)this );
+
+        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);
+#else

 
         menuItem = gtk_pixmap_menu_item_new ();
         GtkWidget *label = gtk_accel_label_new ( wxGTK_CONV( text ) );
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
         gtk_container_add (GTK_CONTAINER (menuItem), label);
 
         menuItem = gtk_pixmap_menu_item_new ();
         GtkWidget *label = gtk_accel_label_new ( wxGTK_CONV( text ) );
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
         gtk_container_add (GTK_CONTAINER (menuItem), label);

-        guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
+

         gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuItem);
         gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuItem);

+        guint accel_key;
+        GdkModifierType accel_mods;
+
+        // accelerator for the item, as specified by its label
+        // (ex. Ctrl+O for open)
+        gtk_accelerator_parse(GetHotKey(*mitem).c_str(), &accel_key,
+                              &accel_mods);

         if (accel_key != GDK_VoidSymbol)
         {
             gtk_widget_add_accelerator (menuItem,
                                         "activate_item",
         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,
+                                        m_accel,
+                                        accel_key, accel_mods,
+                                        GTK_ACCEL_VISIBLE);
+        }
+
+        // accelerator for the underlined char (ex ALT+F for the File menu)
+        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);
         }
                                         GTK_ACCEL_LOCKED);
         }

+

         gtk_widget_show (label);
 
         mitem->SetLabelWidget(label);
 
         gtk_widget_show (label);
 
         mitem->SetLabelWidget(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_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 );
+
+        if (pos == -1)
+            gtk_menu_append( GTK_MENU(m_menu), menuItem );
+        else
+            gtk_menu_insert( GTK_MENU(m_menu), menuItem, pos );

         gtk_widget_show( 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
     {
         // text has "_" instead of "&" after mitem->SetText() so don't use it
         wxString text( mitem->GetText() );
 
     else // a normal item
     {
         // text has "_" instead of "&" after mitem->SetText() so don't use it
         wxString text( mitem->GetText() );
 

-        // buffers containing the menu item path and type in multibyte form
-        char bufPath[256],
-             bufType[256];
-
-        strcpy( bufPath, "/" );
-        strncat( bufPath, wxGTK_CONV(text), WXSIZEOF(bufPath) - 2 );
-        bufPath[WXSIZEOF(bufPath) - 1] = '\0';
-
-        GtkItemFactoryEntry entry;
-        entry.path = bufPath;
-        entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
-        entry.callback_action = 0;
-
-        wxString pathRadio;
-        const char *item_type;

         switch ( mitem->GetKind() )
         {
             case wxITEM_CHECK:
         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 ) );
+                GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child );
+                // set new text
+                gtk_label_set_text( label, wxGTK_CONV( text ) );
+                // reparse key accel
+                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
+                m_prevRadio = NULL;

                 break;
                 break;

+            }

 
             case wxITEM_RADIO:
 
             case wxITEM_RADIO:

-                if ( m_pathLastRadio.empty() )
+            {
+                GSList *group = NULL;
+                if ( m_prevRadio == NULL )

                 {
                     // start of a new radio group
                 {
                     // start of a new radio group

-                    item_type = "<RadioItem>";
-                    wxString tmp( wxGTK_CONV_BACK( bufPath ) );
-                    tmp.Remove(0,1);
-                    m_pathLastRadio = tmp;
+#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 ) );
+                    GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child );
+                    // set new text
+                    gtk_label_set_text( label, wxGTK_CONV( text ) );
+                    // reparse key accel
+                    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

                 }
                 else // continue the radio group
                 {
                 }
                 else // continue the radio group
                 {

-                    pathRadio = m_pathLastRadio;
-                    pathRadio.Replace(wxT("_"), wxT(""));
-                    pathRadio.Prepend(wxT("<main>/"));
-
-                    strncpy(bufType, wxGTK_CONV(pathRadio), WXSIZEOF(bufType));
-                    bufType[WXSIZEOF(bufType) - 1] = '\0';
-                    item_type = bufType;
+#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 ) );
+                    GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child );
+                    // set new text
+                    gtk_label_set_text( label, wxGTK_CONV( text ) );
+                    // reparse key accel
+                    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

                 }
                 }

-
-                // continue the existing radio group, if any
-                endOfRadioGroup = FALSE;

                 break;
                 break;

+            }

 
             default:
                 wxFAIL_MSG( _T("unexpected menu item kind") );
                 // fall through
 
             case wxITEM_NORMAL:
 
             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 ) );
+                GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child );
+                // set new text
+                gtk_label_set_text( label, wxGTK_CONV( text ) );
+                // reparse key accel
+                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
+                m_prevRadio = NULL;

                 break;
                 break;

+            }

         }
 
         }
 

-        entry.item_type = (char *)item_type; // cast needed for GTK+
-        entry.accelerator = (gchar*) NULL;
+        gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
+                            GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
+                            (gpointer)this );

 
 

-#if wxUSE_ACCEL
-        // due to an apparent bug in GTK+, we have to use a static buffer here -
-        // otherwise GTK+ 1.2.2 manages to override the memory we pass to it
-        // somehow! (VZ)
-        char s_accel[50]; // should be big enough, we check for overruns
-        wxString tmp( GetHotKey(*mitem) );
-        strncpy(s_accel, wxGTK_CONV( tmp ), WXSIZEOF(s_accel));
-        s_accel[WXSIZEOF(s_accel) - 1] = '\0';
-        entry.accelerator = s_accel;
-#else // !wxUSE_ACCEL
-        entry.accelerator = (char*) NULL;
-#endif // wxUSE_ACCEL/!wxUSE_ACCEL
-
-        gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
-
-        wxString path( mitem->GetFactoryPath() );
-        menuItem = gtk_item_factory_get_widget( m_factory, wxGTK_CONV( path ) );
-        
-        if (!menuItem)
-            wxLogError( wxT("Wrong menu path: %s\n"), path.c_str() );
+        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);

     }
 
     }
 

+    guint accel_key;
+    GdkModifierType accel_mods;
+    wxCharBuffer buf = wxGTK_CONV( GetHotKey(*mitem) );
+
+    // wxPrintf( wxT("item: %s hotkey %s\n"), mitem->GetText().c_str(), GetHotKey(*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);
+    }
+
+    gtk_widget_show( menuItem );
+

     if ( !mitem->IsSeparator() )
     {
         wxASSERT_MSG( menuItem, wxT("invalid 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), "select",
                             GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
                             (gpointer)this );


@@ -1218,49 +1284,33 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
 
     mitem->SetMenuItem(menuItem);
 
 
     mitem->SetMenuItem(menuItem);
 

-    if ( endOfRadioGroup )
+    if (ms_locked)

     {
     {

-        m_pathLastRadio.clear();
+        // This doesn't even exist!
+        // gtk_widget_lock_accelerators(mitem->GetMenuItem());

     }
 
     return TRUE;
 }
 
     }
 
     return TRUE;
 }
 

-bool wxMenu::DoAppend(wxMenuItem *mitem)
+wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem)

 {
 {

-    return GtkAppend(mitem) && wxMenuBase::DoAppend(mitem);
+    if (!GtkAppend(mitem))
+        return NULL;
+
+    return wxMenuBase::DoAppend(mitem);

 }
 
 }
 

-bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
+wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)

 {
     if ( !wxMenuBase::DoInsert(pos, item) )
 {
     if ( !wxMenuBase::DoInsert(pos, item) )

-        return FALSE;
-
-#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;
-
-    if ( m_style & wxMENU_TEAROFF )
-    {
-        // change the position as the first item is the tear-off marker
-        pos++;
-    }
+        return NULL;

 
 

-    GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget);
-    gpointer data = g_list_last(menu_shell->children)->data;
-    menu_shell->children = g_list_remove(menu_shell->children, data);
-    menu_shell->children = g_list_insert(menu_shell->children, data, pos);
+    // TODO
+    if ( !GtkAppend(item, (int)pos) )
+        return NULL;

 
 

-    return TRUE;
-#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)
 }
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)


@@ -1277,13 +1327,13 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 
 int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
 {
 
 int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
 {

-    wxNode *node = m_items.First();
+    wxMenuItemList::compatibility_iterator node = m_items.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxMenuItem *item = (wxMenuItem*)node->Data();
+        wxMenuItem *item = node->GetData();

         if (item->GetMenuItem() == menuItem)
            return item->GetId();
         if (item->GetMenuItem() == menuItem)
            return item->GetId();

-        node = node->Next();
+        node = node->GetNext();

     }
 
     return wxNOT_FOUND;
     }
 
     return wxNOT_FOUND;


@@ -1293,7 +1343,7 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
 // helpers
 // ----------------------------------------------------------------------------
 
 // helpers
 // ----------------------------------------------------------------------------
 

-#if GTK_CHECK_VERSION(1, 2, 0) && wxUSE_ACCEL
+#if wxUSE_ACCEL

 
 static wxString GetHotKey( const wxMenuItem& item )
 {
 
 static wxString GetHotKey( const wxMenuItem& item )
 {


@@ -1325,7 +1375,7 @@ static wxString GetHotKey( const wxMenuItem& item )
             case WXK_F10:
             case WXK_F11:
             case WXK_F12:
             case WXK_F10:
             case WXK_F11:
             case WXK_F12:

-                hotkey << wxT('F') << code - WXK_F1 + 1;
+                hotkey += wxString::Format(wxT("F%d"), code - WXK_F1 + 1);

                 break;
 
                 // TODO: we should use gdk_keyval_name() (a.k.a.
                 break;
 
                 // TODO: we should use gdk_keyval_name() (a.k.a.


@@ -1350,9 +1400,11 @@ static wxString GetHotKey( const wxMenuItem& item )
                 hotkey << wxT("Down" );
                 break;
             case WXK_PAGEUP:
                 hotkey << wxT("Down" );
                 break;
             case WXK_PAGEUP:

+            case WXK_PRIOR:

                 hotkey << wxT("Prior" );
                 break;
             case WXK_PAGEDOWN:
                 hotkey << wxT("Prior" );
                 break;
             case WXK_PAGEDOWN:

+            case WXK_NEXT:

                 hotkey << wxT("Next" );
                 break;
             case WXK_LEFT:
                 hotkey << wxT("Next" );
                 break;
             case WXK_LEFT:


@@ -1401,7 +1453,7 @@ static wxString GetHotKey( const wxMenuItem& item )
 // substitute for missing GtkPixmapMenuItem
 //-----------------------------------------------------------------------------
 
 // substitute for missing GtkPixmapMenuItem
 //-----------------------------------------------------------------------------
 

-#ifdef USE_MENU_BITMAPS
+#ifndef __WXGTK20__

 
 /*
  * Copyright (C) 1998, 1999, 2000 Free Software Foundation
 
 /*
  * Copyright (C) 1998, 1999, 2000 Free Software Foundation


@@ -1773,5 +1825,5 @@ changed_have_pixmap_status (GtkPixmapMenuItem *menu_item)
     gtk_widget_queue_resize(GTK_WIDGET(menu_item));
 }
 
     gtk_widget_queue_resize(GTK_WIDGET(menu_item));
 }
 

-#endif // USE_MENU_BITMAPS
+#endif