use IMPLEMENT_APP_CONSOLE and not IMPLEMENT_APP for console apps

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index bd901c5000d1da0ccf15b166bd37a9bec7f514c8..679ca8785970d698f323c0a6352afc7ddfaee668 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/gtk/menu.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/gtk/menu.cpp

-// Purpose:
+// Purpose:     implementation of wxMenuBar and wxMenu classes for wxGTK

 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling


@@ -10,6 +10,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_MENUS
+

 #include "wx/menu.h"
 
 #ifndef WX_PRECOMP
 #include "wx/menu.h"
 
 #ifndef WX_PRECOMP


@@ -23,113 +25,33 @@
 #include "wx/accel.h"
 #include "wx/stockitem.h"
 #include "wx/gtk/private.h"
 #include "wx/accel.h"
 #include "wx/stockitem.h"
 #include "wx/gtk/private.h"

-
-#ifdef __WXGTK20__
-#include <gdk/gdktypes.h>
-#endif
-
-// FIXME: is this right? somehow I don't think so (VZ)
-
-#define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
-//#define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
-//#define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
-
-#define ACCEL_OBJECT        GtkWindow
-#define ACCEL_OBJECTS(a)    (a)->acceleratables
-#define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
+#include "wx/gtk/private/mnemonics.h"

 
 // we use normal item but with a special id for the menu title
 static const int wxGTK_TITLE_ID = -3;
 
 
 // we use normal item but with a special id for the menu title
 static const int wxGTK_TITLE_ID = -3;
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+// forward declare it as it's used by wxMenuBar too when using Hildon
+extern "C"
+{
+    static void gtk_menu_clicked_callback(GtkWidget *widget, wxMenu *menu);
+}

 
 #if wxUSE_ACCEL
 
 #if wxUSE_ACCEL

+static bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key);

 static wxString GetGtkHotKey( const wxMenuItem& item );
 #endif
 
 static wxString GetGtkHotKey( const wxMenuItem& item );
 #endif
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-static wxString wxReplaceUnderscore( const wxString& title )
-{
-    const wxChar *pc;
-
-    // GTK 1.2 wants to have "_" instead of "&" for accelerators
-    wxString str;
-    pc = title;
-    while (*pc != wxT('\0'))
-    {
-        if ((*pc == wxT('&')) && (*(pc+1) == wxT('&')))
-        {
-            // "&" is doubled to indicate "&" instead of accelerator
-            ++pc;
-            str << wxT('&');
-        }
-        else if (*pc == wxT('&'))
-        {
-            str << wxT('_');
-        }
-        else
-        {
-            if ( *pc == wxT('_') )
-            {
-                // underscores must be doubled to prevent them from being
-                // interpreted as accelerator character prefix by GTK
-                str << *pc;
-            }
-
-            str << *pc;
-        }
-        ++pc;
-    }
-
-    // wxPrintf( wxT("before %s after %s\n"), title.c_str(), str.c_str() );
-
-    return str;
-}
-
-//-----------------------------------------------------------------------------
-// activate message from GTK
-//-----------------------------------------------------------------------------
-

 static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
 {
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();
 static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
 {
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();

-    if (handler && handler->ProcessEvent(event))
+    if (handler && handler->SafelyProcessEvent(event))

         return;
 
     wxWindow *win = menu->GetInvokingWindow();
     if (win)
         return;
 
     wxWindow *win = menu->GetInvokingWindow();
     if (win)

-        win->GetEventHandler()->ProcessEvent( event );
-}
-
-extern "C" {
-
-static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu )
-{
-    wxMenuEvent event(wxEVT_MENU_OPEN, -1, menu);
-
-    DoCommonMenuCallbackCode(menu, event);
-}
-
-static void gtk_menu_close_callback( GtkWidget *widget, wxMenuBar *menubar )
-{
-    if ( !menubar->GetMenuCount() )
-    {
-        // if menubar is empty we can't call GetMenu(0) below
-        return;
-    }
-
-    wxMenuEvent event( wxEVT_MENU_CLOSE, -1, NULL );
-
-    DoCommonMenuCallbackCode(menubar->GetMenu(0), event);
-}
-
+        win->HandleWindowEvent( event );

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


@@ -140,9 +62,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 
 void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
 {
 
 void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
 {

-    m_style = style;

     m_invokingWindow = NULL;
 
     m_invokingWindow = NULL;
 

+#if wxUSE_LIBHILDON
+    // Hildon window uses a single menu instead of a menu bar, so wxMenuBar is
+    // the same as menu in this case
+    m_widget =
+    m_menubar = gtk_menu_new();
+#else // !wxUSE_LIBHILDON

     if (!PreCreation( NULL, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") ))
     {
     if (!PreCreation( NULL, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") ))
     {


@@ -166,17 +93,10 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
     PostCreation();
 
     ApplyWidgetStyle();
     PostCreation();
 
     ApplyWidgetStyle();

+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON

 
     for (size_t i = 0; i < n; ++i )
         Append(menus[i], titles[i]);
 
     for (size_t i = 0; i < n; ++i )
         Append(menus[i], titles[i]);

-
-    // VZ: for some reason connecting to menus "deactivate" doesn't work (we
-    //     don't get it when the menu is dismissed by clicking outside the
-    //     toolbar) so we connect to the global one, even if it means that we
-    //     can't pass the menu which was closed in wxMenuEvent object
-    g_signal_connect (m_menubar, "deactivate",
-                      G_CALLBACK (gtk_menu_close_callback), this);
-

 }
 
 wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style)
 }
 
 wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style)


@@ -198,43 +118,50 @@ wxMenuBar::~wxMenuBar()
 {
 }
 
 {
 }
 

-static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
+static void
+wxMenubarUnsetInvokingWindow(wxMenu* menu, wxWindow* win, GtkWindow* tlw = NULL)

 {
     menu->SetInvokingWindow( (wxWindow*) NULL );
 
 {
     menu->SetInvokingWindow( (wxWindow*) NULL );
 

-    wxWindow *top_frame = win;
-    while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
-        top_frame = top_frame->GetParent();
+    // support for native hot keys
+    if (menu->m_accel)
+    {
+        if (tlw == NULL)
+            tlw = GTK_WINDOW(wxGetTopLevelParent(win)->m_widget);
+        if (g_slist_find(menu->m_accel->acceleratables, tlw))
+            gtk_window_remove_accel_group(tlw, menu->m_accel);
+    }

 
     wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
     while (node)
     {
         wxMenuItem *menuitem = node->GetData();
         if (menuitem->IsSubMenu())
 
     wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
     while (node)
     {
         wxMenuItem *menuitem = node->GetData();
         if (menuitem->IsSubMenu())

-            wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win );
+            wxMenubarUnsetInvokingWindow(menuitem->GetSubMenu(), win, tlw);

         node = node->GetNext();
     }
 }
 
         node = node->GetNext();
     }
 }
 

-static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
+static void
+wxMenubarSetInvokingWindow(wxMenu* menu, wxWindow* win, GtkWindow* tlw = NULL)

 {
     menu->SetInvokingWindow( win );
 
 {
     menu->SetInvokingWindow( win );
 

-    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 );
+    if (menu->m_accel)
+    {
+        if (tlw == NULL)
+            tlw = GTK_WINDOW(wxGetTopLevelParent(win)->m_widget);
+        if (!g_slist_find(menu->m_accel->acceleratables, tlw))
+            gtk_window_add_accel_group(tlw, menu->m_accel);
+    }

 
     wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
     while (node)
     {
         wxMenuItem *menuitem = node->GetData();
         if (menuitem->IsSubMenu())
 
     wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
     while (node)
     {
         wxMenuItem *menuitem = node->GetData();
         if (menuitem->IsSubMenu())

-            wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win );
+            wxMenubarSetInvokingWindow(menuitem->GetSubMenu(), win, tlw);

         node = node->GetNext();
     }
 }
         node = node->GetNext();
     }
 }


@@ -242,9 +169,6 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
 void wxMenuBar::SetInvokingWindow( wxWindow *win )
 {
     m_invokingWindow = win;
 void wxMenuBar::SetInvokingWindow( wxWindow *win )
 {
     m_invokingWindow = win;

-    wxWindow *top_frame = win;
-    while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
-        top_frame = top_frame->GetParent();

 
     wxMenuList::compatibility_iterator node = m_menus.GetFirst();
     while (node)
 
     wxMenuList::compatibility_iterator node = m_menus.GetFirst();
     while (node)


@@ -302,9 +226,6 @@ void wxMenuBar::Attach(wxFrame *frame)
 void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 {
     m_invokingWindow = (wxWindow*) NULL;
 void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 {
     m_invokingWindow = (wxWindow*) NULL;

-    wxWindow *top_frame = win;
-    while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
-        top_frame = top_frame->GetParent();

 
     wxMenuList::compatibility_iterator node = m_menus.GetFirst();
     while (node)
 
     wxMenuList::compatibility_iterator node = m_menus.GetFirst();
     while (node)


@@ -325,46 +246,53 @@ bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
 
 bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
 {
 
 bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
 {

-    wxString str( wxReplaceUnderscore( title ) );
+    menu->SetLayoutDirection(GetLayoutDirection());

 
 

-    // This doesn't have much effect right now.
-    menu->SetTitle( str );
+#if wxUSE_LIBHILDON
+    // if the menu has only one item, append it directly to the top level menu
+    // instead of inserting a useless submenu
+    if ( menu->GetMenuItemCount() == 1 )
+    {
+        wxMenuItem * const item = menu->FindItemByPosition(0);

 
 

-    // The "m_owner" is the "menu item"
-    menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
-    menu->SetLayoutDirection(GetLayoutDirection());
+        // remove both mnemonics and accelerator: neither is useful under Maemo
+        const wxString str(wxStripMenuCodes(item->GetItemLabel()));

 
 

-    gtk_widget_show( menu->m_owner );
+        if ( item->IsSubMenu() )
+            return GtkAppend(item->GetSubMenu(), str, pos);
+
+        menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );

 
 

-    gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
+        g_signal_connect(menu->m_owner, "activate",
+                          G_CALLBACK(gtk_menu_clicked_callback), menu);
+        item->SetMenuItem(menu->m_owner);
+    }
+    else
+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+    {
+        const wxString str(wxConvertMnemonicsToGTK(title));
+
+        // This doesn't have much effect right now.
+        menu->SetTitle( str );
+
+        // The "m_owner" is the "menu item"
+        menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
+
+        gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
+    }
+
+    gtk_widget_show( 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 );
 
 
     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 );
 

-    g_signal_connect (menu->m_owner, "activate",
-                      G_CALLBACK (gtk_menu_open_callback),
-                      menu);
-

     // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
     // addings menu later on.
     if (m_invokingWindow)
     // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
     // addings menu later on.
     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,27 +328,21 @@ wxMenu *wxMenuBar::Remove(size_t pos)
     if ( !menu )
         return (wxMenu*) NULL;
 
     if ( !menu )
         return (wxMenu*) NULL;
 

-    gtk_menu_item_remove_submenu( GTK_MENU_ITEM(menu->m_owner) );
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu->m_owner), NULL);

     gtk_container_remove(GTK_CONTAINER(m_menubar), menu->m_owner);
 
     gtk_widget_destroy( menu->m_owner );
     menu->m_owner = NULL;
 
     if (m_invokingWindow)
     gtk_container_remove(GTK_CONTAINER(m_menubar), menu->m_owner);
 
     gtk_widget_destroy( menu->m_owner );
     menu->m_owner = NULL;
 
     if (m_invokingWindow)

-    {
-        // OPTIMISE ME:  see comment in GtkAppend
-        wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
-
-        if( frame )
-            frame->UpdateMenuBarSize();
-    }
+        wxMenubarUnsetInvokingWindow( menu, m_invokingWindow );

 
     return menu;
 }
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
 {
 
     return menu;
 }
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
 {

-    if (wxMenuItem::GetLabelFromText(menu->GetTitle()) == wxMenuItem::GetLabelFromText(menuString))
+    if (wxMenuItem::GetLabelText(wxConvertMnemonicsFromGTK(menu->GetTitle())) == wxMenuItem::GetLabelText(menuString))

     {
         int res = menu->FindItem( itemString );
         if (res != wxNOT_FOUND)
     {
         int res = menu->FindItem( itemString );
         if (res != wxNOT_FOUND)


@@ -505,7 +427,7 @@ void wxMenuBar::EnableTop( size_t pos, bool flag )
         gtk_widget_set_sensitive( menu->m_owner, flag );
 }
 
         gtk_widget_set_sensitive( menu->m_owner, flag );
 }
 

-wxString wxMenuBar::GetLabelTop( size_t pos ) const
+wxString wxMenuBar::GetMenuLabel( size_t pos ) const

 {
     wxMenuList::compatibility_iterator node = m_menus.Item( pos );
 
 {
     wxMenuList::compatibility_iterator node = m_menus.Item( pos );
 


@@ -513,26 +435,10 @@ wxString wxMenuBar::GetLabelTop( size_t pos ) const
 
     wxMenu* menu = node->GetData();
 
 
     wxMenu* menu = node->GetData();
 

-    wxString label;
-    wxString text( menu->GetTitle() );
-    for ( const wxChar *pc = text.c_str(); *pc; pc++ )
-    {
-        if ( *pc == wxT('_') )
-        {
-            // '_' is the escape character for GTK+
-            continue;
-        }
-
-        // don't remove ampersands '&' since if we have them in the menu title
-        // it means that they were doubled to indicate "&" instead of accelerator
-
-        label += *pc;
-    }
-
-    return label;
+    return wxConvertMnemonicsFromGTK(menu->GetTitle());

 }
 
 }
 

-void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
+void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label )

 {
     wxMenuList::compatibility_iterator node = m_menus.Item( pos );
 
 {
     wxMenuList::compatibility_iterator node = m_menus.Item( pos );
 


@@ -540,7 +446,7 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
 
     wxMenu* menu = node->GetData();
 
 
     wxMenu* menu = node->GetData();
 

-    const wxString str( wxReplaceUnderscore( label ) );
+    const wxString str(wxConvertMnemonicsToGTK(label));

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


@@ -610,9 +516,8 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
         commandEvent.SetEventObject(frame);
         if (item->IsCheckable())
             commandEvent.SetInt(item->IsChecked());
         commandEvent.SetEventObject(frame);
         if (item->IsCheckable())
             commandEvent.SetInt(item->IsChecked());

-        commandEvent.SetEventObject(menu);

 
 

-        frame->GetEventHandler()->ProcessEvent(commandEvent);
+        frame->HandleWindowEvent(commandEvent);

     }
     else
     {
     }
     else
     {


@@ -640,11 +545,11 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();

-    if (handler && handler->ProcessEvent(event))
+    if (handler && handler->SafelyProcessEvent(event))

         return;
 
     wxWindow *win = menu->GetInvokingWindow();
         return;
 
     wxWindow *win = menu->GetInvokingWindow();

-    if (win) win->GetEventHandler()->ProcessEvent( event );
+    if (win) win->HandleWindowEvent( event );

 }
 }
 
 }
 }
 


@@ -666,12 +571,12 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();

-    if (handler && handler->ProcessEvent(event))
+    if (handler && handler->SafelyProcessEvent(event))

         return;
 
     wxWindow *win = menu->GetInvokingWindow();
     if (win)
         return;
 
     wxWindow *win = menu->GetInvokingWindow();
     if (win)

-        win->GetEventHandler()->ProcessEvent( event );
+        win->HandleWindowEvent( event );

 }
 }
 
 }
 }
 


@@ -702,6 +607,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
     Init(text);
 }
 
     Init(text);
 }
 

+#if WXWIN_COMPATIBILITY_2_8

 wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        int id,
                        const wxString& text,
 wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        int id,
                        const wxString& text,


@@ -713,10 +619,10 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
 {
     Init(text);
 }
 {
     Init(text);
 }

+#endif

 
 void wxMenuItem::Init(const wxString& text)
 {
 
 void wxMenuItem::Init(const wxString& text)
 {

-    m_labelWidget = (GtkWidget *) NULL;

     m_menuItem = (GtkWidget *) NULL;
 
     DoSetText(text);
     m_menuItem = (GtkWidget *) NULL;
 
     DoSetText(text);


@@ -729,8 +635,15 @@ wxMenuItem::~wxMenuItem()
 
 // return the menu item text without any menu accels
 /* static */
 
 // return the menu item text without any menu accels
 /* static */

-wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+
+wxString wxMenuItemBase::GetLabelText(const wxString& text)

 {
 {

+    // The argument to this function will now always be in wxWidgets standard label
+    // format, not GTK+ format, so we do what the other ports do.
+
+    return wxStripMenuCodes(text);
+
+#if 0

     wxString label;
 
     for ( const wxChar *pc = text.c_str(); *pc; pc++ )
     wxString label;
 
     for ( const wxChar *pc = text.c_str(); *pc; pc++ )


@@ -764,12 +677,21 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
         label += *pc;
     }
 
         label += *pc;
     }
 

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

 
     return label;
 
     return label;

+#endif

 }
 
 }
 

-void wxMenuItem::SetText( const wxString& str )
+wxString wxMenuItem::GetItemLabel() const
+{
+    wxString label = wxConvertMnemonicsFromGTK(m_text);
+    if (!m_hotKey.IsEmpty())
+        label << "\t" << m_hotKey;
+    return label;
+}
+
+void wxMenuItem::SetItemLabel( const wxString& str )

 {
     // cache some data which must be used later
     bool isstock = wxIsStockID(GetId());
 {
     // cache some data which must be used later
     bool isstock = wxIsStockID(GetId());


@@ -782,23 +704,20 @@ void wxMenuItem::SetText( const wxString& str )
     oldLabel = wxStripMenuCodes(oldLabel);
     oldLabel.Replace(wxT("_"), wxT(""));
     wxString label1 = wxStripMenuCodes(str);
     oldLabel = wxStripMenuCodes(oldLabel);
     oldLabel.Replace(wxT("_"), wxT(""));
     wxString label1 = wxStripMenuCodes(str);

-    wxString oldhotkey = GetHotKey();    // Store the old hotkey in Ctrl-foo format
+#if wxUSE_ACCEL
+    wxString oldhotkey = m_hotKey;    // Store the old hotkey in Ctrl-foo format

     wxCharBuffer oldbuf = wxGTK_CONV_SYS( GetGtkHotKey(*this) );  // and as <control>foo
     wxCharBuffer oldbuf = wxGTK_CONV_SYS( GetGtkHotKey(*this) );  // and as <control>foo

+#endif // wxUSE_ACCEL

 
     DoSetText(str);
 
 
     DoSetText(str);
 

+#if wxUSE_ACCEL

     if (oldLabel == label1 &&
     if (oldLabel == label1 &&

-        oldhotkey == GetHotKey())    // Make sure we can change a hotkey even if the label is unaltered
+        oldhotkey == m_hotKey)    // Make sure we can change a hotkey even if the label is unaltered

         return;
 
     if (m_menuItem)
     {
         return;
 
     if (m_menuItem)
     {

-        GtkLabel *label;
-        if (m_labelWidget)
-            label = (GtkLabel*) m_labelWidget;
-        else
-            label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
-

         // stock menu items can have empty labels:
         wxString text = m_text;
         if (text.IsEmpty() && !IsSeparator())
         // stock menu items can have empty labels:
         wxString text = m_text;
         if (text.IsEmpty() && !IsSeparator())


@@ -810,7 +729,8 @@ void wxMenuItem::SetText( const wxString& str )
             text = GTKProcessMenuItemLabel(text, NULL);
         }
 
             text = GTKProcessMenuItemLabel(text, NULL);
         }
 

-        gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV_SYS(text) );
+        GtkLabel* label = GTK_LABEL(GTK_BIN(m_menuItem)->child);
+        gtk_label_set_text_with_mnemonic(label, wxGTK_CONV_SYS(text));

     }
 
     // remove old accelerator from our parent's accelerator group, if present
     }
 
     // remove old accelerator from our parent's accelerator group, if present


@@ -861,28 +781,33 @@ void wxMenuItem::SetText( const wxString& str )
                                            accel_key,
                                            accel_mods );
     }
                                            accel_key,
                                            accel_mods );
     }

+#endif // wxUSE_ACCEL

 }
 
 // NOTE: this function is different from the similar functions GTKProcessMnemonics()
 }
 
 // NOTE: this function is different from the similar functions GTKProcessMnemonics()

-//       implemented in control.cpp and from wxMenuItemBase::GetLabelFromText...
+//       implemented in control.cpp and from wxMenuItemBase::GetLabelText...

 //       so there's no real code duplication
 wxString wxMenuItem::GTKProcessMenuItemLabel(const wxString& str, wxString *hotKey)
 {
     wxString text;
 
     // '\t' is the deliminator indicating a hot key
 //       so there's no real code duplication
 wxString wxMenuItem::GTKProcessMenuItemLabel(const wxString& str, wxString *hotKey)
 {
     wxString text;
 
     // '\t' is the deliminator indicating a hot key

-    const wxChar *pc = str;
-    while ( (*pc != wxT('\0')) && (*pc != wxT('\t')) )
+    wxString::const_iterator pc = str.begin();
+    while ( pc != str.end() && *pc != wxT('\t') )

     {
     {

-        if ((*pc == wxT('&')) && (*(pc+1) == wxT('&')))
-        {
-            // "&" is doubled to indicate "&" instead of accelerator
-            ++pc;
-            text << wxT('&');
-        }
-        else if (*pc == wxT('&'))
+        if (*pc == wxT('&'))

         {
         {

-            text << wxT('_');
+            wxString::const_iterator next = pc + 1;
+            if (next != str.end() && *next == wxT('&'))
+            {
+                // "&" is doubled to indicate "&" instead of accelerator
+                ++pc;
+                text << wxT('&');
+            }
+            else
+            {
+                text << wxT('_');
+            }

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


@@ -900,8 +825,8 @@ wxString wxMenuItem::GTKProcessMenuItemLabel(const wxString& str, wxString *hotK
         hotKey->Empty();
         if(*pc == wxT('\t'))
         {
         hotKey->Empty();
         if(*pc == wxT('\t'))
         {

-            pc++;
-            *hotKey = pc;
+            ++pc;
+            hotKey->assign(pc, str.end());

         }
     }
 
         }
     }
 


@@ -919,7 +844,7 @@ void wxMenuItem::DoSetText( const wxString& str )
 
 wxAcceleratorEntry *wxMenuItem::GetAccel() const
 {
 
 wxAcceleratorEntry *wxMenuItem::GetAccel() const
 {

-    if ( !GetHotKey() )
+    if (m_hotKey.empty())

     {
         // nothing
         return NULL;
     {
         // nothing
         return NULL;


@@ -928,7 +853,7 @@ wxAcceleratorEntry *wxMenuItem::GetAccel() const
     // accelerator parsing code looks for them after a TAB, so insert a dummy
     // one here
     wxString label;
     // accelerator parsing code looks for them after a TAB, so insert a dummy
     // one here
     wxString label;

-    label << wxT('\t') << GetHotKey();
+    label << wxT('\t') << m_hotKey;

 
     return wxAcceleratorEntry::Create(label);
 }
 
     return wxAcceleratorEntry::Create(label);
 }


@@ -978,15 +903,35 @@ bool wxMenuItem::IsChecked() const
 // wxMenu
 //-----------------------------------------------------------------------------
 
 // wxMenu
 //-----------------------------------------------------------------------------
 

+extern "C" {
+// "map" from m_menu
+static void menu_map(GtkWidget*, wxMenu* menu)
+{
+    wxMenuEvent event(wxEVT_MENU_OPEN, menu->m_popupShown ? -1 : 0, menu);
+    DoCommonMenuCallbackCode(menu, event);
+}
+
+// "hide" from m_menu
+static void menu_hide(GtkWidget*, wxMenu* menu)
+{
+    wxMenuEvent event(wxEVT_MENU_CLOSE, menu->m_popupShown ? -1 : 0, menu);
+    menu->m_popupShown = false;
+    DoCommonMenuCallbackCode(menu, event);
+}
+}
+

 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 void wxMenu::Init()
 {
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 void wxMenu::Init()
 {

+    m_popupShown = false;
+

     m_accel = gtk_accel_group_new();
     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:
     m_accel = gtk_accel_group_new();
     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);
+    g_object_ref(m_menu);
+    gtk_object_sink(GTK_OBJECT(m_menu));

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


@@ -1008,23 +953,23 @@ void wxMenu::Init()
         Append(wxGTK_TITLE_ID, m_title);
         AppendSeparator();
     }
         Append(wxGTK_TITLE_ID, m_title);
         AppendSeparator();
     }

+
+    // "show" occurs for sub-menus which are not showing, so use "map" instead
+    g_signal_connect(m_menu, "map", G_CALLBACK(menu_map), this);
+    g_signal_connect(m_menu, "hide", G_CALLBACK(menu_hide), this);

 }
 
 wxMenu::~wxMenu()
 {
 }
 
 wxMenu::~wxMenu()
 {

-   WX_CLEAR_LIST(wxMenuItemList, m_items);
-
-   if ( GTK_IS_WIDGET( m_menu ))
-   {
-       // see wxMenu::Init
-       gtk_widget_unref( m_menu );
-       g_object_unref( m_accel );
-       
-       // if the menu is inserted in another menu at this time, there was
-       // one more reference to it:
-       if ( m_owner )
-           gtk_widget_destroy( m_menu );
-   }
+    // see wxMenu::Init
+    g_object_unref(m_menu);
+
+    // if the menu is inserted in another menu at this time, there was
+    // one more reference to it:
+    if (m_owner)
+       gtk_widget_destroy(m_menu);
+
+    g_object_unref(m_accel);

 }
 
 void wxMenu::SetLayoutDirection(const wxLayoutDirection dir)
 }
 
 void wxMenu::SetLayoutDirection(const wxLayoutDirection dir)


@@ -1044,7 +989,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
     GtkWidget *menuItem;
 
     // cache some data used later
     GtkWidget *menuItem;
 
     // cache some data used later

-    wxString text = mitem->GetText();
+    wxString text = mitem->wxMenuItemBase::GetItemLabel();

     int id = mitem->GetId();
     bool isstock = wxIsStockID(id);
     const char *stockid = NULL;
     int id = mitem->GetId();
     bool isstock = wxIsStockID(id);
     const char *stockid = NULL;


@@ -1064,6 +1009,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
     if ( mitem->IsSeparator() )
     {
         menuItem = gtk_separator_menu_item_new();
     if ( mitem->IsSeparator() )
     {
         menuItem = gtk_separator_menu_item_new();

+        m_prevRadio = NULL;

     }
     else if ( mitem->GetBitmap().Ok() ||
                 (mitem->GetKind() == wxITEM_NORMAL && isstock) )
     }
     else if ( mitem->GetBitmap().Ok() ||
                 (mitem->GetKind() == wxITEM_NORMAL && isstock) )


@@ -1110,7 +1056,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
     }
     else // a normal item
     {
     }
     else // a normal item
     {

-        // NB: 'text' variable has "_" instead of "&" after mitem->SetText()
+        // NB: 'text' variable has "_" instead of "&" after mitem->SetItemLabel()

         //     so don't use it
 
         switch ( mitem->GetKind() )
         //     so don't use it
 
         switch ( mitem->GetKind() )


@@ -1154,11 +1100,11 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
 
     }
 
 
     }
 

+#if wxUSE_ACCEL

     guint accel_key;
     GdkModifierType accel_mods;
     wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*mitem) );
 
     guint accel_key;
     GdkModifierType accel_mods;
     wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*mitem) );
 

-    // wxPrintf( wxT("item: %s hotkey %s\n"), mitem->GetText().c_str(), GetGtkHotKey(*mitem).c_str() );

     if (buf[(size_t)0] != '\0')
     {
         gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
     if (buf[(size_t)0] != '\0')
     {
         gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);


@@ -1183,6 +1129,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
                                         accel_mods,
                                         GTK_ACCEL_VISIBLE);
     }
                                         accel_mods,
                                         GTK_ACCEL_VISIBLE);
     }

+#endif // wxUSE_ACCEL

 
     if (pos == -1)
         gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem);
 
     if (pos == -1)
         gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem);


@@ -1254,11 +1201,19 @@ wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 {
     if ( !wxMenuBase::DoRemove(item) )
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 {
     if ( !wxMenuBase::DoRemove(item) )

-        return (wxMenuItem *)NULL;
+        return NULL;
+
+    GtkWidget * const mitem = item->GetMenuItem();
+    if ( m_prevRadio == mitem )
+    {
+        // deleting an item starts a new radio group (has to as we shouldn't
+        // keep a deleted pointer anyhow)
+        m_prevRadio = NULL;
+    }

 
 

-    // TODO: this code doesn't delete the item factory item and this seems
-    //       impossible as of GTK 1.2.6.
-    gtk_widget_destroy( item->GetMenuItem() );
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL);
+    gtk_widget_destroy(mitem);
+    item->SetMenuItem(NULL);

 
     return item;
 }
 
     return item;
 }


@@ -1557,123 +1512,6 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
 
 #endif // wxUSE_ACCEL
 
 
 #endif // wxUSE_ACCEL
 

-// ----------------------------------------------------------------------------
-// Pop-up menu stuff
-// ----------------------------------------------------------------------------
-
-#if wxUSE_MENUS_NATIVE
-
-extern "C" WXDLLIMPEXP_CORE
-void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting  )
-{
-    *is_waiting = false;
-}
-
-WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win )
-{
-    menu->SetInvokingWindow( win );
-
-    wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
-    while (node)
-    {
-        wxMenuItem *menuitem = node->GetData();
-        if (menuitem->IsSubMenu())
-        {
-            SetInvokingWindow( menuitem->GetSubMenu(), win );
-        }
-
-        node = node->GetNext();
-    }
-}
-
-extern "C" WXDLLIMPEXP_CORE
-void wxPopupMenuPositionCallback( GtkMenu *menu,
-                                  gint *x, gint *y,
-                                  gboolean * WXUNUSED(whatever),
-                                  gpointer user_data )
-{
-    // ensure that the menu appears entirely on screen
-    GtkRequisition req;
-    gtk_widget_get_child_requisition(GTK_WIDGET(menu), &req);
-
-    wxSize sizeScreen = wxGetDisplaySize();
-    wxPoint *pos = (wxPoint*)user_data;
-
-    gint xmax = sizeScreen.x - req.width,
-         ymax = sizeScreen.y - req.height;
-
-    *x = pos->x < xmax ? pos->x : xmax;
-    *y = pos->y < ymax ? pos->y : ymax;
-}
-
-bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
-{
-    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
-
-    wxCHECK_MSG( menu != NULL, false, wxT("invalid popup-menu") );
-
-    // NOTE: if you change this code, you need to update
-    //       the same code in taskbar.cpp as well. This
-    //       is ugly code duplication, I know.
-
-    SetInvokingWindow( menu, this );
-
-    menu->UpdateUI();
-
-    bool is_waiting = true;
-
-    gulong handler = g_signal_connect (menu->m_menu, "hide",
-                                       G_CALLBACK (gtk_pop_hide_callback),
-                                       &is_waiting);
-
-    wxPoint pos;
-    gpointer userdata;
-    GtkMenuPositionFunc posfunc;
-    if ( x == -1 && y == -1 )
-    {
-        // use GTK's default positioning algorithm
-        userdata = NULL;
-        posfunc = NULL;
-    }
-    else
-    {
-        pos = ClientToScreen(wxPoint(x, y));
-        userdata = &pos;
-        posfunc = wxPopupMenuPositionCallback;
-    }
-
-    wxMenuEvent eventOpen(wxEVT_MENU_OPEN, -1, menu);
-    DoCommonMenuCallbackCode(menu, eventOpen);
-
-    gtk_menu_popup(
-                  GTK_MENU(menu->m_menu),
-                  (GtkWidget *) NULL,           // parent menu shell
-                  (GtkWidget *) NULL,           // parent menu item
-                  posfunc,                      // function to position it
-                  userdata,                     // client data
-                  0,                            // button used to activate it
-                  gtk_get_current_event_time()
-                );
-
-    while (is_waiting)
-    {
-        gtk_main_iteration();
-    }
-
-    g_signal_handler_disconnect (menu->m_menu, handler);
-
-    wxMenuEvent eventClose(wxEVT_MENU_CLOSE, -1, menu);
-    DoCommonMenuCallbackCode(menu, eventClose);
-
-    return true;
-}
-
-#endif // wxUSE_MENUS_NATIVE
-
-#ifdef __WXGTK20__
-
-#include <gtk/gtk.h>
-

 const char *wxGetStockGtkID(wxWindowID id)
 {
     #define STOCKITEM(wx,gtk)      \
 const char *wxGetStockGtkID(wxWindowID id)
 {
     #define STOCKITEM(wx,gtk)      \


@@ -1770,6 +1608,8 @@ const char *wxGetStockGtkID(wxWindowID id)
     return NULL;
 }
 
     return NULL;
 }
 

+#if wxUSE_ACCEL
+static

 bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key)
 {
     if (!id)
 bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key)
 {
     if (!id)


@@ -1789,5 +1629,6 @@ bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key)
 
     return false;
 }
 
     return false;
 }

+#endif // wxUSE_ACCEL

 
 

-#endif // __WXGTK20__
+#endif // wxUSE_MENUS