corrected off by 1 error in cMB2WC() call (thanks valgrind)

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index ff08f83f5aa22fdfed3c33f237e70682448c5908..97d926f92fbf892fab79a108581c38085c1c77ae 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


@@ -17,12 +19,17 @@
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/bitmap.h"
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/bitmap.h"

+    #include "wx/app.h"

 #endif
 
 #include "wx/accel.h"
 #include "wx/stockitem.h"
 #include "wx/gtk/private.h"
 
 #endif
 
 #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))
 // 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))


@@ -50,14 +57,12 @@ static wxString GetGtkHotKey( const wxMenuItem& item );
 
 static wxString wxReplaceUnderscore( const wxString& title )
 {
 
 static wxString wxReplaceUnderscore( const wxString& title )
 {

-    const wxChar *pc;
-

     // GTK 1.2 wants to have "_" instead of "&" for accelerators
     wxString str;
     // GTK 1.2 wants to have "_" instead of "&" for accelerators
     wxString str;

-    pc = title;
-    while (*pc != wxT('\0'))
+
+    for ( wxString::const_iterator pc = title.begin(); pc != title.end(); ++pc )

     {
     {

-        if ((*pc == wxT('&')) && (*(pc+1) == wxT('&')))
+        if ((*pc == wxT('&')) && (pc+1 != title.end()) && (*(pc+1) == wxT('&')))

         {
             // "&" is doubled to indicate "&" instead of accelerator
             ++pc;
         {
             // "&" is doubled to indicate "&" instead of accelerator
             ++pc;


@@ -78,7 +83,6 @@ static wxString wxReplaceUnderscore( const wxString& title )
 
             str << *pc;
         }
 
             str << *pc;
         }

-        ++pc;

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


@@ -92,9 +96,6 @@ static wxString wxReplaceUnderscore( const wxString& title )
 
 static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
 {
 
 static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();


@@ -138,13 +139,11 @@ 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)
 {

-    // the parent window is known after wxFrame::SetMenu()
-    m_needParent = false;

     m_style = style;
     m_style = style;

-    m_invokingWindow = (wxWindow*) NULL;
+    m_invokingWindow = NULL;

 
 

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

     {
         wxFAIL_MSG( wxT("wxMenuBar creation failed") );
         return;
     {
         wxFAIL_MSG( wxT("wxMenuBar creation failed") );
         return;


@@ -155,12 +154,12 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
     if (style & wxMB_DOCKABLE)
     {
         m_widget = gtk_handle_box_new();
     if (style & wxMB_DOCKABLE)
     {
         m_widget = gtk_handle_box_new();

-        gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_menubar) );
-        gtk_widget_show( GTK_WIDGET(m_menubar) );
+        gtk_container_add(GTK_CONTAINER(m_widget), m_menubar);
+        gtk_widget_show(m_menubar);

     }
     else
     {
     }
     else
     {

-        m_widget = GTK_WIDGET(m_menubar);
+        m_widget = m_menubar;

     }
 
     PostCreation();
     }
 
     PostCreation();


@@ -255,6 +254,50 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win )
     }
 }
 
     }
 }
 

+void wxMenuBar::SetLayoutDirection(wxLayoutDirection dir)
+{
+    if ( dir == wxLayout_Default )
+    {
+        const wxWindow *const frame = GetFrame();
+        if ( frame )
+        {
+            // inherit layout from frame.
+            dir = frame->GetLayoutDirection();
+        }
+        else // use global layout
+        {
+            dir = wxTheApp->GetLayoutDirection();
+        }
+    }
+
+    if ( dir == wxLayout_Default )
+        return;
+
+    GTKSetLayout(m_menubar, dir);
+
+    // also set the layout of all menus we already have (new ones will inherit
+    // the current layout)
+    for ( wxMenuList::compatibility_iterator node = m_menus.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxMenu *const menu = node->GetData();
+        menu->SetLayoutDirection(dir);
+    }
+}
+
+wxLayoutDirection wxMenuBar::GetLayoutDirection() const
+{
+    return GTKGetLayout(m_menubar);
+}
+
+void wxMenuBar::Attach(wxFrame *frame)
+{
+    wxMenuBarBase::Attach(frame);
+
+    SetLayoutDirection(wxLayout_Default);
+}
+

 void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 {
     m_invokingWindow = (wxWindow*) NULL;
 void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 {
     m_invokingWindow = (wxWindow*) NULL;


@@ -288,6 +331,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
 
     // The "m_owner" is the "menu item"
     menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
 
     // The "m_owner" is the "menu item"
     menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );

+    menu->SetLayoutDirection(GetLayoutDirection());

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


@@ -510,9 +554,6 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
 extern "C" {
 static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 {
 extern "C" {
 static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     int id = menu->FindMenuIdByMenuItem(widget);
 
     /* should find it for normal (not popup) menu */
     int id = menu->FindMenuIdByMenuItem(widget);
 
     /* should find it for normal (not popup) menu */


@@ -587,8 +628,6 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 extern "C" {
 static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
 {
 extern "C" {
 static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     int id = menu->FindMenuIdByMenuItem(widget);
 
     wxASSERT( id != -1 ); // should find it!
     int id = menu->FindMenuIdByMenuItem(widget);
 
     wxASSERT( id != -1 ); // should find it!


@@ -615,8 +654,6 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
 extern "C" {
 static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
 {
 extern "C" {
 static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     int id = menu->FindMenuIdByMenuItem(widget);
 
     wxASSERT( id != -1 ); // should find it!
     int id = menu->FindMenuIdByMenuItem(widget);
 
     wxASSERT( id != -1 ); // should find it!


@@ -733,6 +770,12 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 
 void wxMenuItem::SetText( const wxString& str )
 {
 
 void wxMenuItem::SetText( const wxString& str )
 {

+    // cache some data which must be used later
+    bool isstock = wxIsStockID(GetId());
+    const char *stockid = NULL;
+    if (isstock)
+        stockid = wxGetStockGtkID(GetId());
+

     // Some optimization to avoid flicker
     wxString oldLabel = m_text;
     oldLabel = wxStripMenuCodes(oldLabel);
     // Some optimization to avoid flicker
     wxString oldLabel = m_text;
     oldLabel = wxStripMenuCodes(oldLabel);


@@ -744,7 +787,7 @@ void wxMenuItem::SetText( const wxString& str )
     DoSetText(str);
 
     if (oldLabel == label1 &&
     DoSetText(str);
 
     if (oldLabel == label1 &&

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

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


@@ -755,71 +798,124 @@ void wxMenuItem::SetText( const wxString& str )
         else
             label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
 
         else
             label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
 

-        gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV_SYS(m_text) );
+        // stock menu items can have empty labels:
+        wxString text = m_text;
+        if (text.IsEmpty() && !IsSeparator())
+        {
+            wxASSERT_MSG(isstock, wxT("A non-stock menu item with an empty label?"));
+            text = wxGetStockLabel(GetId());
+
+            // need & => _ conversion
+            text = GTKProcessMenuItemLabel(text, NULL);
+        }
+
+        gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV_SYS(text) );

     }
 
     }
 

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

     guint accel_key;
     GdkModifierType accel_mods;
     guint accel_key;
     GdkModifierType accel_mods;

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

     {
     {

-        gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem),
-                                       m_parentMenu->m_accel,
-                                       accel_key,
-                                       accel_mods );
+        gtk_accelerator_parse( (const char*) oldbuf, &accel_key, &accel_mods);
+        if (accel_key != 0)
+        {
+            gtk_widget_remove_accelerator(m_menuItem,
+                                        m_parentMenu->m_accel,
+                                        accel_key,
+                                        accel_mods );
+        }
+    }
+    else if (isstock)
+    {
+        // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
+        if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
+            gtk_widget_remove_accelerator( m_menuItem,
+                                           m_parentMenu->m_accel,
+                                           accel_key,
+                                           accel_mods );

     }
 
     }
 

+    // add new accelerator to our parent's accelerator group

     wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*this) );
     wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*this) );

-    gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
-    if (accel_key != 0)
+    if (buf[(size_t)0] != '\0')
+    {
+        gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
+        if (accel_key != 0)
+        {
+            gtk_widget_add_accelerator( m_menuItem,
+                                        "activate",
+                                        m_parentMenu->m_accel,
+                                        accel_key,
+                                        accel_mods,
+                                        GTK_ACCEL_VISIBLE);
+        }
+    }
+    else if (isstock)

     {
     {

-        gtk_widget_add_accelerator( GTK_WIDGET(m_menuItem),
-                                    "activate",
-                                    m_parentMenu->m_accel,
-                                    accel_key,
-                                    accel_mods,
-                                    GTK_ACCEL_VISIBLE);
+        // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
+        if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
+            gtk_widget_remove_accelerator( m_menuItem,
+                                           m_parentMenu->m_accel,
+                                           accel_key,
+                                           accel_mods );

     }
 }
 
     }
 }
 

-// it's valid for this function to be called even if m_menuItem == NULL
-void wxMenuItem::DoSetText( const wxString& str )
+// NOTE: this function is different from the similar functions GTKProcessMnemonics()
+//       implemented in control.cpp and from wxMenuItemBase::GetLabelFromText...
+//       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
     // '\t' is the deliminator indicating a hot key

-    m_text.Empty();
-    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('&')))
+        if (*pc == wxT('&'))

         {
         {

-            // "&" is doubled to indicate "&" instead of accelerator
-            ++pc;
-            m_text << wxT('&');
-        }
-        else if (*pc == wxT('&'))
-        {
-            m_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
         {

-            m_text << wxT("__");
+            text << wxT("__");

         }
         else
         {
         }
         else
         {

-            m_text << *pc;
+            text << *pc;

         }
         ++pc;
     }
 
         }
         ++pc;
     }
 

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

     {
     {

-       pc++;
-       m_hotKey = pc;
+        hotKey->Empty();
+        if(*pc == wxT('\t'))
+        {
+            pc++;
+            hotKey->assign(pc, str.end());
+        }

     }
 
     }
 

-    // wxPrintf( wxT("DoSetText(): str %s m_text %s hotkey %s\n"), str.c_str(), m_text.c_str(), m_hotKey.c_str() );
+    return text;
+}
+
+// it's valid for this function to be called even if m_menuItem == NULL
+void wxMenuItem::DoSetText( const wxString& str )
+{
+    m_text.Empty();
+    m_text = GTKProcessMenuItemLabel(str, &m_hotKey);

 }
 
 #if wxUSE_ACCEL
 }
 
 #if wxUSE_ACCEL


@@ -829,14 +925,15 @@ wxAcceleratorEntry *wxMenuItem::GetAccel() const
     if ( !GetHotKey() )
     {
         // nothing
     if ( !GetHotKey() )
     {
         // nothing

-        return (wxAcceleratorEntry *)NULL;
+        return NULL;

     }
 
     }
 

-    // as wxGetAccelFromString() looks for TAB, insert a dummy one here
+    // accelerator parsing code looks for them after a TAB, so insert a dummy
+    // one here

     wxString label;
     label << wxT('\t') << GetHotKey();
 
     wxString label;
     label << wxT('\t') << GetHotKey();
 

-    return wxGetAccelFromString(label);
+    return wxAcceleratorEntry::Create(label);

 }
 
 #endif // wxUSE_ACCEL
 }
 
 #endif // wxUSE_ACCEL


@@ -924,6 +1021,8 @@ wxMenu::~wxMenu()
    {
        // see wxMenu::Init
        gtk_widget_unref( 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 )
        // if the menu is inserted in another menu at this time, there was
        // one more reference to it:
        if ( m_owner )


@@ -931,21 +1030,47 @@ wxMenu::~wxMenu()
    }
 }
 
    }
 }
 

+void wxMenu::SetLayoutDirection(const wxLayoutDirection dir)
+{
+    if ( m_owner )
+        wxWindow::GTKSetLayout(m_owner, dir);
+    //else: will be called later by wxMenuBar again
+}
+
+wxLayoutDirection wxMenu::GetLayoutDirection() const
+{
+    return wxWindow::GTKGetLayout(m_owner);
+}
+

 bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
 {
     GtkWidget *menuItem;
 
 bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
 {
     GtkWidget *menuItem;
 

-    wxString text;
+    // cache some data used later
+    wxString text = mitem->GetText();
+    int id = mitem->GetId();
+    bool isstock = wxIsStockID(id);
+    const char *stockid = NULL;
+    if (isstock)
+        stockid = wxGetStockGtkID(mitem->GetId());
+
+    // stock menu items can have an empty label
+    if (text.IsEmpty() && !mitem->IsSeparator())
+    {
+        wxASSERT_MSG(isstock, wxT("A non-stock menu item with an empty label?"));
+        text = wxGetStockLabel(id);
+
+        // need & => _ conversion
+        text = wxMenuItem::GTKProcessMenuItemLabel(text, NULL);
+    }

 
     if ( mitem->IsSeparator() )
     {
         menuItem = gtk_separator_menu_item_new();
     }
     else if ( mitem->GetBitmap().Ok() ||
 
     if ( mitem->IsSeparator() )
     {
         menuItem = gtk_separator_menu_item_new();
     }
     else if ( mitem->GetBitmap().Ok() ||

-                (mitem->GetKind() == wxITEM_NORMAL &&
-                    wxIsStockID(mitem->GetId())) )
+                (mitem->GetKind() == wxITEM_NORMAL && isstock) )

     {
     {

-        text = mitem->GetText();

         wxBitmap bitmap(mitem->GetBitmap());
 
         menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );
         wxBitmap bitmap(mitem->GetBitmap());
 
         menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );


@@ -955,9 +1080,8 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
         {
             // use stock bitmap for this item if available on the assumption
             // that it never hurts to follow GTK+ conventions more closely
         {
             // use stock bitmap for this item if available on the assumption
             // that it never hurts to follow GTK+ conventions more closely

-            const char *stock = wxGetStockGtkID(mitem->GetId());
-            image = stock ? gtk_image_new_from_stock(stock, GTK_ICON_SIZE_MENU)
-                          : NULL;
+            image = stockid ? gtk_image_new_from_stock(stockid, GTK_ICON_SIZE_MENU)
+                            : NULL;

         }
         else // we have a custom bitmap
         {
         }
         else // we have a custom bitmap
         {


@@ -989,8 +1113,8 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
     }
     else // a normal item
     {
     }
     else // a normal item
     {

-        // text has "_" instead of "&" after mitem->SetText() so don't use it
-        text = mitem->GetText() ;
+        // NB: 'text' variable has "_" instead of "&" after mitem->SetText()
+        //     so don't use it

 
         switch ( mitem->GetKind() )
         {
 
         switch ( mitem->GetKind() )
         {


@@ -1038,15 +1162,29 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
     wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*mitem) );
 
     // wxPrintf( wxT("item: %s hotkey %s\n"), mitem->GetText().c_str(), GetGtkHotKey(*mitem).c_str() );
     wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*mitem) );
 
     // wxPrintf( wxT("item: %s hotkey %s\n"), mitem->GetText().c_str(), GetGtkHotKey(*mitem).c_str() );

-    gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
-    if (accel_key != 0)
+    if (buf[(size_t)0] != '\0')
+    {
+        gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
+        if (accel_key != 0)
+        {
+            gtk_widget_add_accelerator (menuItem,
+                                        "activate",
+                                        m_accel,
+                                        accel_key,
+                                        accel_mods,
+                                        GTK_ACCEL_VISIBLE);
+        }
+    }
+    else if (isstock)

     {
     {

-        gtk_widget_add_accelerator (GTK_WIDGET(menuItem),
-                                    "activate",
-                                    m_accel,
-                                    accel_key,
-                                    accel_mods,
-                                    GTK_ACCEL_VISIBLE);
+        // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
+        if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
+            gtk_widget_add_accelerator( menuItem,
+                                        "activate",
+                                        m_accel,
+                                        accel_key,
+                                        accel_mods,
+                                        GTK_ACCEL_VISIBLE);

     }
 
     if (pos == -1)
     }
 
     if (pos == -1)


@@ -1142,6 +1280,14 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

+void wxMenu::Attach(wxMenuBarBase *menubar)
+{
+    wxMenuBase::Attach(menubar);
+
+    // inherit layout direction from menubar.
+    SetLayoutDirection(menubar->GetLayoutDirection());
+}
+

 // ----------------------------------------------------------------------------
 // helpers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // helpers
 // ----------------------------------------------------------------------------


@@ -1209,10 +1355,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey << wxT("Down" );
                 break;
             case WXK_PAGEUP:
                 hotkey << wxT("Down" );
                 break;
             case WXK_PAGEUP:

-                hotkey << wxT("PgUp" );
+                hotkey << wxT("Page_Up" );

                 break;
             case WXK_PAGEDOWN:
                 break;
             case WXK_PAGEDOWN:

-                hotkey << wxT("PgDn" );
+                hotkey << wxT("Page_Down" );

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


@@ -1330,10 +1476,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey << wxT("KP_Down" );
                 break;
             case WXK_NUMPAD_PAGEUP:
                 hotkey << wxT("KP_Down" );
                 break;
             case WXK_NUMPAD_PAGEUP:

-                hotkey << wxT("KP_PgUp" );
+                hotkey << wxT("KP_Page_Up" );

                 break;
             case WXK_NUMPAD_PAGEDOWN:
                 break;
             case WXK_NUMPAD_PAGEDOWN:

-                hotkey << wxT("KP_PgDn" );
+                hotkey << wxT("KP_Page_Down" );

                 break;
             case WXK_NUMPAD_END:
                 hotkey << wxT("KP_End" );
                 break;
             case WXK_NUMPAD_END:
                 hotkey << wxT("KP_End" );


@@ -1388,14 +1534,15 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey += wxString::Format(wxT("Special%d"), code - WXK_SPECIAL1 + 1);
                 break;
           */
                 hotkey += wxString::Format(wxT("Special%d"), code - WXK_SPECIAL1 + 1);
                 break;
           */

-                // if there are any other keys wxGetAccelFromString() may
+                // if there are any other keys wxAcceleratorEntry::Create() may

                 // return, we should process them here
 
             default:
                 if ( code < 127 )
                 {
                 // return, we should process them here
 
             default:
                 if ( code < 127 )
                 {

-                    wxString name = wxGTK_CONV_BACK( gdk_keyval_name((guint)code) );
-                    if ( name )
+                    const wxString
+                        name = wxGTK_CONV_BACK_SYS(gdk_keyval_name((guint)code));
+                    if ( !name.empty() )

                     {
                         hotkey << name;
                         break;
                     {
                         hotkey << name;
                         break;


@@ -1525,3 +1672,127 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
 }
 
 #endif // wxUSE_MENUS_NATIVE
 }
 
 #endif // wxUSE_MENUS_NATIVE

+
+#ifdef __WXGTK20__
+
+#include <gtk/gtk.h>
+
+const char *wxGetStockGtkID(wxWindowID id)
+{
+    #define STOCKITEM(wx,gtk)      \
+        case wx:                   \
+            return gtk;
+
+    #define STOCKITEM_MISSING(wx)  \
+        case wx:                 \
+            return NULL;
+
+    #if GTK_CHECK_VERSION(2,4,0)
+        #define STOCKITEM_24(wx,gtk) STOCKITEM(wx,gtk)
+    #else
+        #define STOCKITEM_24(wx,gtk) STOCKITEM_MISSING(wx)
+    #endif
+
+    #if GTK_CHECK_VERSION(2,6,0)
+        #define STOCKITEM_26(wx,gtk) STOCKITEM(wx,gtk)
+    #else
+        #define STOCKITEM_26(wx,gtk) STOCKITEM_MISSING(wx)
+    #endif
+
+    #if GTK_CHECK_VERSION(2,10,0)
+        #define STOCKITEM_210(wx,gtk) STOCKITEM(wx,gtk)
+    #else
+        #define STOCKITEM_210(wx,gtk) STOCKITEM_MISSING(wx)
+    #endif
+
+
+    switch (id)
+    {
+        STOCKITEM_26(wxID_ABOUT,         GTK_STOCK_ABOUT)
+        STOCKITEM(wxID_ADD,              GTK_STOCK_ADD)
+        STOCKITEM(wxID_APPLY,            GTK_STOCK_APPLY)
+        STOCKITEM(wxID_BOLD,             GTK_STOCK_BOLD)
+        STOCKITEM(wxID_CANCEL,           GTK_STOCK_CANCEL)
+        STOCKITEM(wxID_CLEAR,            GTK_STOCK_CLEAR)
+        STOCKITEM(wxID_CLOSE,            GTK_STOCK_CLOSE)
+        STOCKITEM(wxID_COPY,             GTK_STOCK_COPY)
+        STOCKITEM(wxID_CUT,              GTK_STOCK_CUT)
+        STOCKITEM(wxID_DELETE,           GTK_STOCK_DELETE)
+        STOCKITEM_26(wxID_EDIT,          GTK_STOCK_EDIT)
+        STOCKITEM(wxID_FIND,             GTK_STOCK_FIND)
+        STOCKITEM_26(wxID_FILE,          GTK_STOCK_FILE)
+        STOCKITEM(wxID_REPLACE,          GTK_STOCK_FIND_AND_REPLACE)
+        STOCKITEM(wxID_BACKWARD,         GTK_STOCK_GO_BACK)
+        STOCKITEM(wxID_DOWN,             GTK_STOCK_GO_DOWN)
+        STOCKITEM(wxID_FORWARD,          GTK_STOCK_GO_FORWARD)
+        STOCKITEM(wxID_UP,               GTK_STOCK_GO_UP)
+        STOCKITEM(wxID_HELP,             GTK_STOCK_HELP)
+        STOCKITEM(wxID_HOME,             GTK_STOCK_HOME)
+        STOCKITEM_24(wxID_INDENT,        GTK_STOCK_INDENT)
+        STOCKITEM(wxID_INDEX,            GTK_STOCK_INDEX)
+        STOCKITEM(wxID_ITALIC,           GTK_STOCK_ITALIC)
+        STOCKITEM(wxID_JUSTIFY_CENTER,   GTK_STOCK_JUSTIFY_CENTER)
+        STOCKITEM(wxID_JUSTIFY_FILL,     GTK_STOCK_JUSTIFY_FILL)
+        STOCKITEM(wxID_JUSTIFY_LEFT,     GTK_STOCK_JUSTIFY_LEFT)
+        STOCKITEM(wxID_JUSTIFY_RIGHT,    GTK_STOCK_JUSTIFY_RIGHT)
+        STOCKITEM(wxID_NEW,              GTK_STOCK_NEW)
+        STOCKITEM(wxID_NO,               GTK_STOCK_NO)
+        STOCKITEM(wxID_OK,               GTK_STOCK_OK)
+        STOCKITEM(wxID_OPEN,             GTK_STOCK_OPEN)
+        STOCKITEM(wxID_PASTE,            GTK_STOCK_PASTE)
+        STOCKITEM(wxID_PREFERENCES,      GTK_STOCK_PREFERENCES)
+        STOCKITEM(wxID_PRINT,            GTK_STOCK_PRINT)
+        STOCKITEM(wxID_PREVIEW,          GTK_STOCK_PRINT_PREVIEW)
+        STOCKITEM(wxID_PROPERTIES,       GTK_STOCK_PROPERTIES)
+        STOCKITEM(wxID_EXIT,             GTK_STOCK_QUIT)
+        STOCKITEM(wxID_REDO,             GTK_STOCK_REDO)
+        STOCKITEM(wxID_REFRESH,          GTK_STOCK_REFRESH)
+        STOCKITEM(wxID_REMOVE,           GTK_STOCK_REMOVE)
+        STOCKITEM(wxID_REVERT_TO_SAVED,  GTK_STOCK_REVERT_TO_SAVED)
+        STOCKITEM(wxID_SAVE,             GTK_STOCK_SAVE)
+        STOCKITEM(wxID_SAVEAS,           GTK_STOCK_SAVE_AS)
+        STOCKITEM_210(wxID_SELECTALL,    GTK_STOCK_SELECT_ALL)
+        STOCKITEM(wxID_STOP,             GTK_STOCK_STOP)
+        STOCKITEM(wxID_UNDELETE,         GTK_STOCK_UNDELETE)
+        STOCKITEM(wxID_UNDERLINE,        GTK_STOCK_UNDERLINE)
+        STOCKITEM(wxID_UNDO,             GTK_STOCK_UNDO)
+        STOCKITEM_24(wxID_UNINDENT,      GTK_STOCK_UNINDENT)
+        STOCKITEM(wxID_YES,              GTK_STOCK_YES)
+        STOCKITEM(wxID_ZOOM_100,         GTK_STOCK_ZOOM_100)
+        STOCKITEM(wxID_ZOOM_FIT,         GTK_STOCK_ZOOM_FIT)
+        STOCKITEM(wxID_ZOOM_IN,          GTK_STOCK_ZOOM_IN)
+        STOCKITEM(wxID_ZOOM_OUT,         GTK_STOCK_ZOOM_OUT)
+
+        default:
+            wxFAIL_MSG( _T("invalid stock item ID") );
+            break;
+    };
+
+    #undef STOCKITEM
+
+    return NULL;
+}
+
+bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key)
+{
+    if (!id)
+        return false;
+
+    GtkStockItem stock_item;
+    if (gtk_stock_lookup (id, &stock_item))
+    {
+        if (key) *key = stock_item.keyval;
+        if (mod) *mod = stock_item.modifier;
+
+        // some GTK stock items have zero values for the keyval;
+        // it means that they do not have an accelerator...
+        if (stock_item.keyval)
+            return true;
+    }
+
+    return false;
+}
+
+#endif // __WXGTK20__
+
+#endif // wxUSE_MENUS