don't call SelectObject() twice in SetBrush() nor SetFont() neither

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index d74c9b2ca6211f0f7df9ac2ff81baffdb2c3d4ad..2c148ae7b8ccbd8b58a9538eb8f8f90ceab48e6c 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"


@@ -96,10 +99,10 @@ 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* 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 // USE_MENU_BITMAPS
 


@@ -113,9 +116,16 @@ static wxString wxReplaceUnderscore( const wxString& title )
 
     /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
     wxString str;
 
     /* 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('&')))
+        {
+            // "&" is doubled to indicate "&" instead of accelerator
+            ++pc;
+            str << wxT('&');
+        }
+        else if (*pc == wxT('&'))

         {
 #if GTK_CHECK_VERSION(1, 2, 0)
             str << wxT('_');
         {
 #if GTK_CHECK_VERSION(1, 2, 0)
             str << wxT('_');


@@ -138,7 +148,7 @@ static wxString wxReplaceUnderscore( const wxString& title )
 #endif
         else
         {
 #endif
         else
         {

-#if __WXGTK12__
+#ifdef __WXGTK12__

             if ( *pc == wxT('_') )
             {
                 // underscores must be doubled to prevent them from being
             if ( *pc == wxT('_') )
             {
                 // underscores must be doubled to prevent them from being


@@ -149,10 +159,30 @@ static wxString wxReplaceUnderscore( const wxString& title )
 
             str << *pc;
         }
 
             str << *pc;
         }

+        ++pc;

     }
     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
 //-----------------------------------------------------------------------------


@@ -173,8 +203,6 @@ 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();
     /* 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();


@@ -214,8 +242,6 @@ 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();
     /* 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();


@@ -241,16 +267,14 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
 {
     menu->SetInvokingWindow( (wxWindow*) NULL );
 
 {
     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();
 
     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 */

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


@@ -275,7 +299,7 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
         gtk_accel_group_attach( menu->m_accel, obj );
 #endif // GTK+ 1.2.1+
 
         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();


@@ -299,7 +323,7 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win )
         gtk_accel_group_attach( m_accel, obj );
 #endif // GTK+ 1.2.1+
 
         gtk_accel_group_attach( m_accel, obj );
 #endif // GTK+ 1.2.1+
 

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


@@ -316,11 +340,11 @@ void wxMenuBar::UnsetInvokingWindow( 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 key accelerators indicated by underscroes */
+    // 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+
 
     gtk_accel_group_detach( m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) );
 #endif // GTK+ 1.2.1+
 

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


@@ -341,18 +365,18 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title)
 {
     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. */
+    // 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)
 
 #if GTK_CHECK_VERSION(1, 2, 1)
 

-    /* local buffer in multibyte form */

     wxString buf;
     buf << wxT('/') << str.c_str();
 
     wxString buf;
     buf << wxT('/') << str.c_str();
 

-    char *cbuf = new char[buf.Length()+1];
-    strcpy(cbuf, buf.mbc_str());
+    // local buffer in multibyte form
+    char cbuf[400];
+    strcpy(cbuf, wxGTK_CONV(buf) );

 
     GtkItemFactoryEntry entry;
     entry.path = (gchar *)cbuf;  // const_cast
 
     GtkItemFactoryEntry entry;
     entry.path = (gchar *)cbuf;  // const_cast


@@ -361,8 +385,8 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title)
     entry.callback_action = 0;
     entry.item_type = (char *)"<Branch>";
 
     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 */
+    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++ )
     wxString tmp = wxT("<main>/");
     const wxChar *pc;
     for ( pc = str; *pc != wxT('\0'); pc++ )


@@ -374,12 +398,11 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title)
            pc++;
        tmp << *pc;
     }
            pc++;
        tmp << *pc;
     }

-    menu->m_owner = gtk_item_factory_get_item( m_factory, tmp.mb_str() );
+    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 );
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );

-    delete [] cbuf;

 #else
 
 #else
 

-    menu->m_owner = gtk_menu_item_new_with_label( str.mb_str() );
+    menu->m_owner = gtk_menu_item_new_with_label( wxGTK_CONV( str ) );

     gtk_widget_show( menu->m_owner );
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
 
     gtk_widget_show( menu->m_owner );
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
 


@@ -387,11 +410,28 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title)
 
 #endif
 
 
 #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
     // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables

-    // adding menu later on.
+    // addings menu later on.

     if (m_invokingWindow)
     if (m_invokingWindow)

+    {

         wxMenubarSetInvokingWindow( menu, 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;
 }
 
     return TRUE;
 }
 


@@ -400,7 +440,6 @@ 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;
 

-#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
     // 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


@@ -416,14 +455,6 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
     menu_shell->children = g_list_insert(menu_shell->children, data, pos);
 
     return TRUE;
     menu_shell->children = g_list_insert(menu_shell->children, data, pos);
 
     return TRUE;

-#else  // GTK < 1.2
-    // this should be easy to do with GTK 1.0 - can use standard functions for
-    // this and don't need any hacks like above, but as I don't have GTK 1.0
-    // any more I can't do it
-    wxFAIL_MSG( wxT("TODO") );
-
-    return FALSE;
-#endif // GTK 1.2/1.0

 }
 
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 }
 
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)


@@ -439,6 +470,36 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
     return menuOld;
 }
 
     return menuOld;
 }
 

+static wxMenu *CopyMenu (wxMenu *menu)
+{
+    wxMenu *menucopy = new wxMenu ();
+    wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
+    while (node)
+    {
+        wxMenuItem *item = node->GetData();
+        int itemid = item->GetId();
+        wxString text = item->GetText();
+        text.Replace(wxT("_"), wxT("&"));
+        wxMenu *submenu = item->GetSubMenu();
+        if (!submenu)
+        {
+            wxMenuItem* itemcopy = new wxMenuItem(menucopy,
+                                        itemid, text,
+                                        menu->GetHelpString(itemid));
+            itemcopy->SetBitmap(item->GetBitmap());
+            itemcopy->SetCheckable(item->IsCheckable());
+            menucopy->Append(itemcopy);
+        }
+        else
+          menucopy->Append (itemid, text, CopyMenu(submenu),
+                            menu->GetHelpString(itemid));
+
+        node = node->GetNext();
+    }
+
+    return menucopy;
+}
+

 wxMenu *wxMenuBar::Remove(size_t pos)
 {
     wxMenu *menu = wxMenuBarBase::Remove(pos);
 wxMenu *wxMenuBar::Remove(size_t pos)
 {
     wxMenu *menu = wxMenuBarBase::Remove(pos);


@@ -452,18 +513,32 @@ wxMenu *wxMenuBar::Remove(size_t pos)
     printf( "menu shell entries before %d\n", (int)g_list_length( menu_shell->children ) );
 */
 
     printf( "menu shell entries before %d\n", (int)g_list_length( menu_shell->children ) );
 */
 

+    wxMenu *menucopy = CopyMenu( menu );
+

     // unparent calls unref() and that would delete the widget so we raise
     // the ref count to 2 artificially before invoking unparent.
     gtk_widget_ref( menu->m_menu );
     gtk_widget_unparent( menu->m_menu );
 
     gtk_widget_destroy( menu->m_owner );
     // unparent calls unref() and that would delete the widget so we raise
     // the ref count to 2 artificially before invoking unparent.
     gtk_widget_ref( menu->m_menu );
     gtk_widget_unparent( menu->m_menu );
 
     gtk_widget_destroy( menu->m_owner );

+    delete menu;

 
 

+    menu = menucopy;

 /*
     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 ) );
 */
 
 /*
     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 menu;
 }
 


@@ -476,7 +551,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();


@@ -491,7 +566,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();


@@ -509,7 +584,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();


@@ -526,7 +601,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();


@@ -544,7 +619,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") );
 


@@ -556,7 +631,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") );
 


@@ -564,28 +639,26 @@ wxString wxMenuBar::GetLabelTop( size_t pos ) const
 
     wxString label;
     wxString text( menu->GetTitle() );
 
     wxString label;
     wxString text( menu->GetTitle() );

-#if GTK_CHECK_VERSION(1, 2, 0)

     for ( const wxChar *pc = text.c_str(); *pc; pc++ )
     {
     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;
         }
 
             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;
     }

-#else // GTK+ 1.0
-    label = text;
-#endif // GTK+ 1.2/1.0

 
     return label;
 }
 
 void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
 {
 
     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") );
 
 
     wxCHECK_RET( node, wxT("menu not found") );
 


@@ -600,10 +673,10 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
         GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
 
         /* set new text */
         GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
 
         /* set new text */

-        gtk_label_set( label, str.mb_str());
+        gtk_label_set( label, wxGTK_CONV( str ) );

 
         /* reparse key accel */
 
         /* reparse key accel */

-        (void)gtk_label_parse_uline (GTK_LABEL(label), str.mb_str() );
+        (void)gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( str ) );

         gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );
     }
 
         gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );
     }
 


@@ -633,7 +706,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
     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


@@ -646,11 +719,41 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
         {
             return;
         }
         {
             return;
         }

+    }

 
 

-        // the user pressed on the menu item: report the event below
+
+    // Is this menu on a menubar?  (possibly nested)
+    wxFrame* frame = NULL;
+    wxMenu*  pm = menu;
+    while ( pm && !frame )
+    {
+        if ( pm->IsAttached() )
+            frame = pm->GetMenuBar()->GetFrame();
+        pm = pm->GetParent();

     }
 
     }
 

-    menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
+    // 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);
+    }

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


@@ -671,7 +774,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();


@@ -696,7 +800,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();


@@ -764,23 +869,36 @@ 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('_') )

         {
         {

-            // wxGTK escapes "xxx_xxx" to "xxx__xxx"
+            // GTK 1.2 escapes "xxx_xxx" to "xxx__xxx"

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

-        if ( *pc == wxT('&') )
+#if GTK_CHECK_VERSION(2, 0, 0)
+        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;
     }
 
             continue;
         }
 
         label += *pc;
     }
 

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

     return label;
 }
 
     return label;
 }
 


@@ -793,49 +911,62 @@ 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)
     {
         GtkLabel *label;
         if (m_labelWidget)
     DoSetText(str);
 
     if (m_menuItem)
     {
         GtkLabel *label;
         if (m_labelWidget)

-          label = (GtkLabel*) m_labelWidget;
+            label = (GtkLabel*) m_labelWidget;

         else
         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());
+#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];
+        }

 
 

-        /* reparse key accel */
-        (void)gtk_label_parse_uline (GTK_LABEL(label), m_text.mb_str() );
+        gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV(tmp) );
+#else
+        // set new text
+        gtk_label_set( label, wxGTK_CONV( m_text ) );
+
+        // reparse key accel
+        (void)gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV(m_text) );

         gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );
         gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );

+#endif

     }
 }
 
 // it's valid for this function to be called even if m_menuItem == NULL
 void wxMenuItem::DoSetText( const wxString& str )
 {
     }
 }
 
 // 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;
     m_text.Empty();
     const wxChar *pc = str;

-    for (; (*pc != wxT('\0')) && (*pc != wxT('\t')); pc++ )
+    while ( (*pc != wxT('\0')) && (*pc != wxT('\t')) )

     {
     {

-#if GTK_CHECK_VERSION(1, 2, 0)
-        if (*pc == wxT('&'))
+        if ((*pc == wxT('&')) && (*(pc+1) == wxT('&')))
+        {
+            // "&" is doubled to indicate "&" instead of accelerator
+            ++pc;
+            m_text << wxT('&');
+        }
+        else if (*pc == wxT('&'))

         {
             m_text << wxT('_');
         }
         {
             m_text << wxT('_');
         }

+#if GTK_CHECK_VERSION(2, 0, 0)

         else if ( *pc == wxT('_') )    // escape underscores
         {
         else if ( *pc == wxT('_') )    // escape underscores
         {

+            // m_text << wxT("__");    doesn't work

             m_text << wxT("__");
         }
             m_text << wxT("__");
         }

-#else // GTK+ < 1.2.0
-        if (*pc == wxT('&'))
-        {
-        }
-#endif
-#if GTK_CHECK_VERSION(2, 0, 0)

         else if (*pc == wxT('/'))      // we have to escape slashes
         {
             m_text << wxT("\\/");
         else if (*pc == wxT('/'))      // we have to escape slashes
         {
             m_text << wxT("\\/");


@@ -844,26 +975,31 @@ void wxMenuItem::DoSetText( const wxString& str )
         {
             m_text << wxT("\\\\");
         }
         {
             m_text << wxT("\\\\");
         }

-#elif GTK_CHECK_VERSION(1, 2, 0)
+#else
+        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
         else if (*pc == wxT('/'))      /* we have to filter out slashes ... */
         {
             m_text << wxT('\\');  /* ... and replace them with back slashes */
         }
 #endif

-        else
+        else {

             m_text << *pc;
             m_text << *pc;

+        }
+        ++pc;

     }
 
     }
 

-    /* only GTK 1.2 knows about hot keys */
+    // wxPrintf( L"str %s m_text %s\n", str.c_str(), m_text.c_str() );
+

     m_hotKey = wxT("");
 
     m_hotKey = wxT("");
 

-#if GTK_CHECK_VERSION(1, 2, 0)

     if(*pc == wxT('\t'))
     {
        pc++;
        m_hotKey = pc;
     }
     if(*pc == wxT('\t'))
     {
        pc++;
        m_hotKey = pc;
     }

-#endif // GTK+ 1.2.0+

 }
 
 #if wxUSE_ACCEL
 }
 
 #if wxUSE_ACCEL


@@ -926,18 +1062,25 @@ bool wxMenuItem::IsChecked() const
 
 wxString wxMenuItem::GetFactoryPath() const
 {
 
 wxString wxMenuItem::GetFactoryPath() const
 {

-    /* in order to get the pointer to the item we need the item text
-       _without_ underscores */
+    // In order to get the pointer to the item we need the item
+    // text _without_ underscores in GTK 1.2

     wxString path( wxT("<main>/") );
 
     for ( const wxChar *pc = m_text.c_str(); *pc; pc++ )
     {
     wxString path( wxT("<main>/") );
 
     for ( const wxChar *pc = m_text.c_str(); *pc; pc++ )
     {

-        if ( *pc == wxT('_') || *pc == wxT('&') )
+        if ( *pc == wxT('_') )

         {
         {

-            // remove '_' and '&' unconditionally
+#ifdef __WXGTK20__
+            pc++;
+#else
+            // remove '_' unconditionally

             continue;
             continue;

+#endif

         }
 
         }
 

+        // don't remove ampersands '&' since if we have them in the menu item title
+        // it means that they were doubled to indicate "&" instead of accelerator
+

         path += *pc;
     }
 
         path += *pc;
     }
 


@@ -952,20 +1095,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 void wxMenu::Init()
 {
 
 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>" );
     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_owner = (GtkWidget*) NULL;
 
 
     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. */
+    // 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;
     if(m_style & wxMENU_TEAROFF)
     {
        GtkItemFactoryEntry entry;


@@ -974,10 +1112,9 @@ void wxMenu::Init()
        entry.callback_action = 0;
        entry.item_type = (char *)"<Tearoff>";
        entry.accelerator = (gchar*) 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 ? */
+       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 *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/tearoff" );
     }

-#endif // GTK+ 1.2.0+

 
     // append the title as the very first entry if we have it
     if ( !!m_title )
 
     // append the title as the very first entry if we have it
     if ( !!m_title )


@@ -989,9 +1126,10 @@ void wxMenu::Init()
 
 wxMenu::~wxMenu()
 {
 
 wxMenu::~wxMenu()
 {

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

 
 

-   gtk_widget_destroy( m_menu );
+   if ( GTK_IS_WIDGET( m_menu ))
+       gtk_widget_destroy( m_menu );

 
    gtk_object_unref( GTK_OBJECT(m_factory) );
 }
 
    gtk_object_unref( GTK_OBJECT(m_factory) );
 }


@@ -1004,14 +1142,11 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
     bool appended = FALSE;
 #endif
 
     bool appended = FALSE;
 #endif
 

-#if GTK_CHECK_VERSION(1, 2, 0)

     // does this item terminate the current radio group?
     bool endOfRadioGroup = TRUE;
     // does this item terminate the current radio group?
     bool endOfRadioGroup = TRUE;

-#endif // GTK+ >= 1.2

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

-#if GTK_CHECK_VERSION(1, 2, 0)

         GtkItemFactoryEntry entry;
         entry.path = (char *)"/sep";
         entry.callback = (GtkItemFactoryCallback) NULL;
         GtkItemFactoryEntry entry;
         entry.path = (char *)"/sep";
         entry.callback = (GtkItemFactoryCallback) NULL;


@@ -1019,27 +1154,23 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
         entry.item_type = (char *)"<Separator>";
         entry.accelerator = (gchar*) NULL;
 
         entry.item_type = (char *)"<Separator>";
         entry.accelerator = (gchar*) NULL;
 

-        gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
+        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? */
+        // 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;
         menuItem = gtk_item_factory_get_widget( m_factory, "<main>/sep" );
 
         // we might have a separator inside a radio group
         endOfRadioGroup = FALSE;

-#else // GTK+ 1.0
-        menuItem = gtk_menu_item_new();
-#endif // GTK 1.2/1.0

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

-#if GTK_CHECK_VERSION(1, 2, 0)
-        /* 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 */
+        // local buffer in multibyte form

         char buf[200];
         strcpy( buf, "/" );
         char buf[200];
         strcpy( buf, "/" );

-        strcat( buf, text.mb_str() );
+        strcat( buf, wxGTK_CONV( text ) );

 
         GtkItemFactoryEntry entry;
         entry.path = buf;
 
         GtkItemFactoryEntry entry;
         entry.path = buf;


@@ -1048,13 +1179,10 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
         entry.item_type = (char *)"<Branch>";
         entry.accelerator = (gchar*) NULL;
 
         entry.item_type = (char *)"<Branch>";
         entry.accelerator = (gchar*) NULL;
 

-        gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
+        gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  // what is 2 ?

 
         wxString path( mitem->GetFactoryPath() );
 
         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
+        menuItem = gtk_item_factory_get_item( m_factory, wxGTK_CONV( path ) );

 
         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 );
 


@@ -1071,19 +1199,39 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
         const wxBitmap *bitmap = &mitem->GetBitmap();
 
         menuItem = gtk_pixmap_menu_item_new ();
         const wxBitmap *bitmap = &mitem->GetBitmap();
 
         menuItem = gtk_pixmap_menu_item_new ();

-        GtkWidget *label = gtk_accel_label_new (text.mb_str());
+        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);
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
         gtk_container_add (GTK_CONTAINER (menuItem), label);

-        guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), text.mb_str() );

         gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuItem);
         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)
         if (accel_key != GDK_VoidSymbol)

-           {
+        {

             gtk_widget_add_accelerator (menuItem,
             gtk_widget_add_accelerator (menuItem,

-                                       "activate_item",
-                                       gtk_menu_ensure_uline_accel_group (GTK_MENU (m_menu)),
-                                       accel_key, 0,
-                                       GTK_ACCEL_LOCKED);
+                                        "activate_item",
+                                        gtk_menu_get_accel_group(
+                                            GTK_MENU(m_menu)),
+                                        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, 0,
+                                        GTK_ACCEL_LOCKED);
+        }
+

         gtk_widget_show (label);
 
         mitem->SetLabelWidget(label);
         gtk_widget_show (label);
 
         mitem->SetLabelWidget(label);


@@ -1095,7 +1243,9 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
         gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
                             GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
                             (gpointer)this );
         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_menu_append( GTK_MENU(m_menu), menuItem );

+

         gtk_widget_show( menuItem );
 
         appended = TRUE; // We've done this, don't do it again
         gtk_widget_show( menuItem );
 
         appended = TRUE; // We've done this, don't do it again


@@ -1103,18 +1253,19 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
 #endif // USE_MENU_BITMAPS
     else // a normal item
     {
 #endif // USE_MENU_BITMAPS
     else // a normal item
     {

-#if GTK_CHECK_VERSION(1, 2, 0)
-        /* text has "_" instead of "&" after mitem->SetText() */
+        // text has "_" instead of "&" after mitem->SetText() so don't use it

         wxString text( mitem->GetText() );
 
         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';
+        // 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;
 
         GtkItemFactoryEntry entry;

-        entry.path = buf;
+        entry.path = bufPath;

         entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
         entry.callback_action = 0;
 
         entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
         entry.callback_action = 0;
 


@@ -1131,14 +1282,19 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
                 {
                     // start of a new radio group
                     item_type = "<RadioItem>";
                 {
                     // start of a new radio group
                     item_type = "<RadioItem>";

-                    m_pathLastRadio = buf + 1;
+                    wxString tmp( wxGTK_CONV_BACK( bufPath ) );
+                    tmp.Remove(0,1);
+                    m_pathLastRadio = tmp;

                 }
                 else // continue the radio group
                 {
                     pathRadio = m_pathLastRadio;
                 }
                 else // continue the radio group
                 {
                     pathRadio = m_pathLastRadio;

-                    pathRadio.Replace("_", "");
-                    pathRadio.Prepend("<main>/");
-                    item_type = pathRadio;
+                    pathRadio.Replace(wxT("_"), wxT(""));
+                    pathRadio.Prepend(wxT("<main>/"));
+
+                    strncpy(bufType, wxGTK_CONV(pathRadio), WXSIZEOF(bufType));
+                    bufType[WXSIZEOF(bufType) - 1] = '\0';
+                    item_type = bufType;

                 }
 
                 // continue the existing radio group, if any
                 }
 
                 // continue the existing radio group, if any


@@ -1161,9 +1317,10 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
         // 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)
         // 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
+        char s_accel[50]; // should be big enough, we check for overruns

         wxString tmp( GetHotKey(*mitem) );
         wxString tmp( GetHotKey(*mitem) );

-        strncpy(s_accel, tmp.mb_str(), WXSIZEOF(s_accel));
+        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;
         entry.accelerator = s_accel;
 #else // !wxUSE_ACCEL
         entry.accelerator = (char*) NULL;


@@ -1172,19 +1329,16 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
         gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
 
         wxString path( mitem->GetFactoryPath() );
         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() );
+        menuItem = gtk_item_factory_get_widget( m_factory, wxGTK_CONV( path ) );

 
 

-        gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
-                            GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
-                            (gpointer)this );
-#endif // GTK+ 1.2/1.0
+        if (!menuItem)
+            wxLogError( wxT("Wrong menu path: %s\n"), path.c_str() );

     }
 
     if ( !mitem->IsSeparator() )
     {
     }
 
     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 );


@@ -1194,42 +1348,33 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
                             (gpointer)this );
     }
 
                             (gpointer)this );
     }
 

-#if !GTK_CHECK_VERSION(1, 2, 0)
-    if (!appended)
-    {
-        gtk_menu_append( GTK_MENU(m_menu), menuItem );
-        gtk_widget_show( menuItem );
-    }
-#endif // GTK+ 1.0
-

     mitem->SetMenuItem(menuItem);
 
     mitem->SetMenuItem(menuItem);
 

-#if GTK_CHECK_VERSION(1, 2, 0)

     if ( endOfRadioGroup )
     {
         m_pathLastRadio.clear();
     }
     if ( endOfRadioGroup )
     {
         m_pathLastRadio.clear();
     }

-#endif // GTK+ >= 1.2

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

 
     if ( m_style & wxMENU_TEAROFF )
     {
 
     if ( m_style & wxMENU_TEAROFF )
     {


@@ -1242,13 +1387,7 @@ bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
     menu_shell->children = g_list_remove(menu_shell->children, data);
     menu_shell->children = g_list_insert(menu_shell->children, data, pos);
 
     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)
 }
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)


@@ -1265,13 +1404,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;


@@ -1331,6 +1470,35 @@ static wxString GetHotKey( const wxMenuItem& item )
             case WXK_DELETE:
                 hotkey << wxT("Delete" );
                 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;

 
                 // if there are any other keys wxGetAccelFromString() may
                 // return, we should process them here
 
                 // if there are any other keys wxGetAccelFromString() may
                 // return, we should process them here


@@ -1338,7 +1506,7 @@ static wxString GetHotKey( const wxMenuItem& item )
             default:
                 if ( code < 127 )
                 {
             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;
                     if ( name )
                     {
                         hotkey << name;


@@ -1403,23 +1571,23 @@ extern "C"
 static void gtk_pixmap_menu_item_class_init    (GtkPixmapMenuItemClass *klass);
 static void gtk_pixmap_menu_item_init          (GtkPixmapMenuItem      *menu_item);
 static void gtk_pixmap_menu_item_draw          (GtkWidget              *widget,
 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,
 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,
 
 /* 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,
 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,
 static void gtk_pixmap_menu_item_size_request  (GtkWidget        *widget,

-                                               GtkRequisition   *requisition);
+                                                GtkRequisition   *requisition);

 static void gtk_pixmap_menu_item_remove        (GtkContainer *container,
 static void gtk_pixmap_menu_item_remove        (GtkContainer *container,

-                                               GtkWidget    *child);
+                                                GtkWidget    *child);

 
 static void changed_have_pixmap_status         (GtkPixmapMenuItem *menu_item);
 
 
 static void changed_have_pixmap_status         (GtkPixmapMenuItem *menu_item);
 


@@ -1450,7 +1618,7 @@ gtk_pixmap_menu_item_get_type (void)
       };
 
       pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (),
       };
 
       pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (),

-                                              &pixmap_menu_item_info);
+                                               &pixmap_menu_item_info);

     }
 
   return pixmap_menu_item_type;
     }
 
   return pixmap_menu_item_type;


@@ -1512,7 +1680,7 @@ gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item)
 
 static void
 gtk_pixmap_menu_item_draw (GtkWidget    *widget,
 
 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));
 {
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget));


@@ -1529,7 +1697,7 @@ gtk_pixmap_menu_item_draw (GtkWidget    *widget,
 
 static gint
 gtk_pixmap_menu_item_expose (GtkWidget      *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);
 {
   g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget), FALSE);


@@ -1557,7 +1725,7 @@ gtk_pixmap_menu_item_expose (GtkWidget      *widget,
 
 void
 gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
 
 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);
 {
   g_return_if_fail (menu_item != NULL);
   g_return_if_fail (pixmap != NULL);


@@ -1574,7 +1742,7 @@ gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
 
   if (GTK_WIDGET_VISIBLE (pixmap->parent)) {
     if (GTK_WIDGET_MAPPED (pixmap->parent) &&
 
   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);
   }
         !GTK_WIDGET_MAPPED (pixmap))
       gtk_widget_map (pixmap);
   }


@@ -1605,7 +1773,7 @@ gtk_pixmap_menu_item_map (GtkWidget *widget)
 
 static void
 gtk_pixmap_menu_item_size_allocate (GtkWidget        *widget,
 
 static void
 gtk_pixmap_menu_item_size_allocate (GtkWidget        *widget,

-                                   GtkAllocation    *allocation)
+                                    GtkAllocation    *allocation)

 {
   GtkPixmapMenuItem *pmenu_item;
 
 {
   GtkPixmapMenuItem *pmenu_item;
 


@@ -1622,8 +1790,8 @@ gtk_pixmap_menu_item_size_allocate (GtkWidget        *widget,
       child_allocation.height = pmenu_item->pixmap->requisition.height;
       child_allocation.x = border_width + BORDER_SPACING;
       child_allocation.y = (border_width + BORDER_SPACING
       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);
     }
 
       gtk_widget_size_allocate (pmenu_item->pixmap, &child_allocation);
     }
 


@@ -1633,9 +1801,9 @@ gtk_pixmap_menu_item_size_allocate (GtkWidget        *widget,
 
 static void
 gtk_pixmap_menu_item_forall (GtkContainer    *container,
 
 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;
 
 {
   GtkPixmapMenuItem *menu_item;
 


@@ -1649,12 +1817,12 @@ gtk_pixmap_menu_item_forall (GtkContainer    *container,
     (* callback) (menu_item->pixmap, callback_data);
 
   GTK_CONTAINER_CLASS(parent_class)->forall(container,include_internals,
     (* 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,
 }
 
 static void
 gtk_pixmap_menu_item_size_request (GtkWidget      *widget,

-                                  GtkRequisition *requisition)
+                                   GtkRequisition *requisition)

 {
   GtkPixmapMenuItem *menu_item;
   GtkRequisition req = {0, 0};
 {
   GtkPixmapMenuItem *menu_item;
   GtkRequisition req = {0, 0};


@@ -1676,7 +1844,7 @@ gtk_pixmap_menu_item_size_request (GtkWidget      *widget,
 
 static void
 gtk_pixmap_menu_item_remove (GtkContainer *container,
 
 static void
 gtk_pixmap_menu_item_remove (GtkContainer *container,

-                            GtkWidget    *child)
+                             GtkWidget    *child)

 {
   GtkBin *bin;
   gboolean widget_was_visible;
 {
   GtkBin *bin;
   gboolean widget_was_visible;


@@ -1688,7 +1856,7 @@ gtk_pixmap_menu_item_remove (GtkContainer *container,
 
   bin = GTK_BIN (container);
   g_return_if_fail ((bin->child == child ||
 
   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);
 
 
   widget_was_visible = GTK_WIDGET_VISIBLE (child);