X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a260fe6a435f318c386b2da660fd30a7a2b02ce5..22d6efa851642c6a69174278fc50f712f41e2271:/src/gtk/menu.cpp?ds=sidebyside

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 860adb822d..1fec1d74fc 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -20,6 +20,13 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
 //-----------------------------------------------------------------------------
 // wxMenuBar
 //-----------------------------------------------------------------------------
@@ -28,13 +35,27 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 
 wxMenuBar::wxMenuBar( long style )
 {
-    m_needParent = FALSE; // hmmm
+    /* the parent window is known after wxFrame::SetMenu() */
+    m_needParent = FALSE;
+    m_style = style;
 
-    PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
+    if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
+        !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, _T("menubar") ))
+    {
+        wxFAIL_MSG( _T("wxMenuBar creation failed") );
+	return;
+    }
 
     m_menus.DeleteContents( TRUE );
 
+    /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+    m_accel = gtk_accel_group_new();
+    m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
+    m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
+#else
     m_menubar = gtk_menu_bar_new();
+#endif
 
     if (style & wxMB_DOCKABLE)
     {
@@ -48,50 +69,191 @@ wxMenuBar::wxMenuBar( long style )
     }
 
     PostCreation();
-
-    Show( TRUE );
 }
 
 wxMenuBar::wxMenuBar()
 {
-    m_needParent = FALSE; // hmmm
-
-    PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
+    /* the parent window is known after wxFrame::SetMenu() */
+    m_needParent = FALSE;
+    m_style = 0;
 
+    if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
+        !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("menubar") ))
+    {
+        wxFAIL_MSG( _T("wxMenuBar creation failed") );
+	return;
+    }
+    
     m_menus.DeleteContents( TRUE );
 
+    /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+    m_accel = gtk_accel_group_new();
+    m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
+    m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
+#else
     m_menubar = gtk_menu_bar_new();
+#endif
 
     m_widget = GTK_WIDGET(m_menubar);
 
     PostCreation();
+}
 
-    Show( TRUE );
+wxMenuBar::~wxMenuBar()
+{
+   // how to destroy a GtkItemFactory ?
+}
+
+static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
+{
+    menu->SetInvokingWindow( (wxWindow*) NULL );
+
+#if (GTK_MINOR_VERSION > 0)
+    wxWindow *top_frame = win;
+    while (top_frame->GetParent()) top_frame = top_frame->GetParent();
+
+    /* support for native hot keys  */
+    gtk_accel_group_detach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
+#endif
+
+    wxNode *node = menu->GetItems().First();
+    while (node)
+    {
+        wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+        if (menuitem->IsSubMenu())
+            wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win );
+        node = node->Next();
+    }
+}
+
+static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
+{
+    menu->SetInvokingWindow( win );
+
+#if (GTK_MINOR_VERSION > 0)
+    wxWindow *top_frame = win;
+    while (top_frame->GetParent())
+       top_frame = top_frame->GetParent();
+
+    /* support for native hot keys  */
+    gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
+#endif
+
+    wxNode *node = menu->GetItems().First();
+    while (node)
+    {
+        wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+        if (menuitem->IsSubMenu())
+            wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win );
+        node = node->Next();
+    }
+}
+
+void wxMenuBar::SetInvokingWindow( wxWindow *win )
+{
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+    wxWindow *top_frame = win;
+    while (top_frame->GetParent())
+       top_frame = top_frame->GetParent();
+
+    /* support for native key accelerators indicated by underscroes */
+    gtk_accel_group_attach( m_accel, GTK_OBJECT(top_frame->m_widget) );
+#endif
+
+    wxNode *node = m_menus.First();
+    while (node)
+    {
+        wxMenu *menu = (wxMenu*)node->Data();
+        wxMenubarSetInvokingWindow( menu, win );
+        node = node->Next();
+    }
+}
+
+void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
+{
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+    wxWindow *top_frame = win;
+    while (top_frame->GetParent())
+       top_frame = top_frame->GetParent();
+
+    /* support for native key accelerators indicated by underscroes */
+    gtk_accel_group_detach( m_accel, GTK_OBJECT(top_frame->m_widget) );
+#endif
+
+    wxNode *node = m_menus.First();
+    while (node)
+    {
+        wxMenu *menu = (wxMenu*)node->Data();
+        wxMenubarUnsetInvokingWindow( menu, win );
+        node = node->Next();
+    }
 }
 
 void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {
     m_menus.Append( menu );
-    
-    wxString s = "";
-    for ( const char *pc = title; *pc != '\0'; pc++ )
+
+    const wxChar *pc;
+
+    /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
+    wxString str;
+    for ( pc = title; *pc != _T('\0'); pc++ )
     {
-        if (*pc == '&')
-	{
-	    pc++; /* skip it */
-#if (GTK_MINOR_VERSION > 0)
-    //      s << '_';  not yet
+        if (*pc == _T('&'))
+        {
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+            str << _T('_');
+        } else
+        if (*pc == _T('/'))
+        {
+            str << _T('\\');
 #endif
         }
-        s << *pc;
+        else
+           str << *pc;
+    }
+
+    /* this doesn't have much effect right now */
+    menu->SetTitle( str );
+
+    /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+
+    /* local buffer in multibyte form */
+    wxString buf;
+    buf << _T('/') << str.c_str();
+
+    char *cbuf = new char[buf.Length()];
+    strcpy(cbuf, buf.mbc_str());
+
+    GtkItemFactoryEntry entry;
+    entry.path = (gchar *)cbuf;  // const_cast
+    entry.accelerator = (gchar*) NULL;
+    entry.callback = (GtkItemFactoryCallback) NULL;
+    entry.callback_action = 0;
+    entry.item_type = "<Branch>";
+
+    gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
+    /* in order to get the pointer to the item we need the item text _without_ underscores */
+    wxString tmp = _T("<main>/");
+    for ( pc = str; *pc != _T('\0'); pc++ )
+    {
+       if (*pc == _T('_')) pc++; /* skip it */
+       tmp << *pc;
     }
+    menu->m_owner = gtk_item_factory_get_item( m_factory, tmp.mb_str() );
+    gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
+    delete [] cbuf;
+#else
 
-    menu->SetTitle(s);
-    menu->m_owner = gtk_menu_item_new_with_label( WXSTRINGCAST(s) );
+    menu->m_owner = gtk_menu_item_new_with_label( str.mb_str() );
     gtk_widget_show( menu->m_owner );
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
 
     gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner );
+
+#endif
 }
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
@@ -116,7 +278,7 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString
     return wxNOT_FOUND;
 }
 
-wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem = NULL) const
+wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem ) const
 {
     if ( menuForItem )
     {
@@ -178,7 +340,7 @@ void wxMenuBar::Check( int id, bool check )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_RET( item, "wxMenuBar::Check: no such item" );
+    wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") );
 
     item->Check(check);
 }
@@ -187,7 +349,7 @@ bool wxMenuBar::IsChecked( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_MSG( item, FALSE, "wxMenuBar::IsChecked: no such item" );
+    wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked: no such item") );
 
     return item->IsChecked();
 }
@@ -196,7 +358,7 @@ void wxMenuBar::Enable( int id, bool enable )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_RET( item, "wxMenuBar::Enable: no such item" );
+    wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") );
 
     item->Enable(enable);
 }
@@ -205,7 +367,7 @@ bool wxMenuBar::IsEnabled( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_MSG( item, FALSE, "wxMenuBar::IsEnabled: no such item" );
+    wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled: no such item") );
 
     return item->IsEnabled();
 }
@@ -214,7 +376,7 @@ wxString wxMenuBar::GetLabel( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_MSG( item, "", "wxMenuBar::GetLabel: no such item" );
+    wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel: no such item") );
 
     return item->GetText();
 }
@@ -223,7 +385,7 @@ void wxMenuBar::SetLabel( int id, const wxString &label )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_RET( item, "wxMenuBar::SetLabel: no such item" );
+    wxCHECK_RET( item, _T("wxMenuBar::SetLabel: no such item") );
 
     item->SetText( label );
 }
@@ -232,7 +394,7 @@ void wxMenuBar::EnableTop( int pos, bool flag )
 {
     wxNode *node = m_menus.Nth( pos );
 
-    wxCHECK_RET( node, "menu not found" );
+    wxCHECK_RET( node, _T("menu not found") );
 
     wxMenu* menu = (wxMenu*)node->Data();
 
@@ -244,7 +406,7 @@ wxString wxMenuBar::GetLabelTop( int pos ) const
 {
     wxNode *node = m_menus.Nth( pos );
 
-    wxCHECK_MSG( node, "invalid", "menu not found" );
+    wxCHECK_MSG( node, _T("invalid"), _T("menu not found") );
 
     wxMenu* menu = (wxMenu*)node->Data();
 
@@ -255,7 +417,7 @@ void wxMenuBar::SetLabelTop( int pos, const wxString& label )
 {
     wxNode *node = m_menus.Nth( pos );
 
-    wxCHECK_RET( node, "menu not found" );
+    wxCHECK_RET( node, _T("menu not found") );
 
     wxMenu* menu = (wxMenu*)node->Data();
 
@@ -266,7 +428,7 @@ void wxMenuBar::SetHelpString( int id, const wxString& helpString )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_RET( item, "wxMenuBar::SetHelpString: no such item" );
+    wxCHECK_RET( item, _T("wxMenuBar::SetHelpString: no such item") );
 
     item->SetHelp( helpString );
 }
@@ -275,7 +437,7 @@ wxString wxMenuBar::GetHelpString( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_MSG( item, "", "wxMenuBar::GetHelpString: no such item" );
+    wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString: no such item") );
 
     return item->GetHelp();
 }
@@ -286,6 +448,8 @@ wxString wxMenuBar::GetHelpString( int id ) const
 
 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 */
@@ -295,7 +459,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
         return;
 
     wxMenuItem* item = menu->FindItem( id );
-    wxCHECK_RET( item, "error in menu item callback" );
+    wxCHECK_RET( item, _T("error in menu item callback") );
 
     if (item->IsCheckable())
     {
@@ -335,6 +499,8 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 
 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!
@@ -345,15 +511,6 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
     wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
     event.SetEventObject( menu );
 
-/*   wxMSW doesn't call callback here either
-
-     if (menu->m_callback)
-     {
-        (void) (*(menu->m_callback)) (*menu, event);
-        return;
-     }
-*/
-
     if (menu->GetEventHandler()->ProcessEvent(event))
         return;
 
@@ -367,6 +524,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
 
 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!
@@ -404,31 +563,47 @@ wxMenuItem::wxMenuItem()
 // it's valid for this function to be called even if m_menuItem == NULL
 void wxMenuItem::SetName( const wxString& str )
 {
-    m_text = "";
-    for ( const char *pc = str; *pc != '\0'; pc++ )
+    /* '\t' is the deliminator indicating a hot key */
+    m_text = _T("");
+    const wxChar *pc = str;
+    for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ )
     {
-        if (*pc == '&')
-	{
-	    pc++; /* skip it */
+        if (*pc == _T('&'))
+        {
 #if (GTK_MINOR_VERSION > 0)
-            m_text << '_';
+            m_text << _T('_');
+        } else
+        if (*pc == _T('/'))      /* we have to filter out slashes ... */
+        {
+            m_text << _T('\\');  /* ... and replace them with back slashes */
 #endif
         }
-        m_text << *pc;
+        else
+           m_text << *pc;
+    }
+
+    /* only GTK 1.2 knows about hot keys */
+    m_hotKey = _T("");
+#if (GTK_MINOR_VERSION > 0)
+    if(*pc == _T('\t'))
+    {
+       pc++;
+       m_hotKey = pc;
     }
+#endif
 
     if (m_menuItem)
     {
         GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
-        gtk_label_set( label, m_text.c_str());
+        gtk_label_set( label, m_text.mb_str());
     }
 }
 
 void wxMenuItem::Check( bool check )
 {
-    wxCHECK_RET( m_menuItem, "invalid menu item" );
+    wxCHECK_RET( m_menuItem, _T("invalid menu item") );
 
-    wxCHECK_RET( IsCheckable(), "Can't check uncheckable item!" )
+    wxCHECK_RET( IsCheckable(), _T("Can't check uncheckable item!") )
 
     if (check == m_isChecked) return;
 
@@ -438,7 +613,7 @@ void wxMenuItem::Check( bool check )
 
 void wxMenuItem::Enable( bool enable )
 {
-    wxCHECK_RET( m_menuItem, "invalid menu item" );
+    wxCHECK_RET( m_menuItem, _T("invalid menu item") );
 
     gtk_widget_set_sensitive( m_menuItem, enable );
     m_isEnabled = enable;
@@ -446,7 +621,7 @@ void wxMenuItem::Enable( bool enable )
 
 bool wxMenuItem::IsChecked() const
 {
-    wxCHECK_MSG( m_menuItem, FALSE, "invalid menu item" );
+    wxCHECK_MSG( m_menuItem, FALSE, _T("invalid menu item") );
 
     wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
 
@@ -461,37 +636,62 @@ bool wxMenuItem::IsChecked() const
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
-wxMenu::wxMenu( const wxString& title, const wxFunction func )
+void
+wxMenu::Init( const wxString& title,
+              long style,
+	      const wxFunction func
+	      )
 {
     m_title = title;
     m_items.DeleteContents( TRUE );
     m_invokingWindow = (wxWindow *) NULL;
-    
+    m_style = style;
+
 #if (GTK_MINOR_VERSION > 0)
     m_accel = gtk_accel_group_new();
     m_factory = gtk_item_factory_new( GTK_TYPE_MENU, "<main>", m_accel );
     m_menu = gtk_item_factory_get_widget( m_factory, "<main>" );
-#else    
+#else
     m_menu = gtk_menu_new();  // Do not show!
 #endif
 
     m_callback = func;
+
     m_eventHandler = this;
     m_clientData = (void*) NULL;
 
-    if (m_title.IsNull()) m_title = "";
-    if (m_title != "")
+    if (m_title.IsNull()) m_title = _T("");
+    if (m_title != _T(""))
     {
         Append(-2, m_title);
         AppendSeparator();
     }
 
     m_owner = (GtkWidget*) NULL;
+
+#if (GTK_MINOR_VERSION > 0)
+    /* Tearoffs are entries, just like separators. So if we want this
+       menu to be a tear-off one, we just append a tearoff entry
+       immediately. */
+    if(m_style & wxMENU_TEAROFF)
+    {
+       GtkItemFactoryEntry entry;
+       entry.path = "/tearoff";
+       entry.callback = (GtkItemFactoryCallback) NULL;
+       entry.callback_action = 0;
+       entry.item_type = "<Tearoff>";
+       entry.accelerator = (gchar*) NULL;
+       gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
+       //GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/tearoff" );
+    }
+#endif
 }
 
 wxMenu::~wxMenu()
 {
-    /* how do we delete an item-factory ? */
+   /* how do we delete an item-factory ? */
+   gtk_widget_destroy( m_menu );
+
 }
 
 void wxMenu::SetTitle( const wxString& title )
@@ -510,14 +710,66 @@ void wxMenu::AppendSeparator()
     wxMenuItem *mitem = new wxMenuItem();
     mitem->SetId(ID_SEPARATOR);
 
+#if (GTK_MINOR_VERSION > 0)
+    GtkItemFactoryEntry entry;
+    entry.path = "/sep";
+    entry.callback = (GtkItemFactoryCallback) NULL;
+    entry.callback_action = 0;
+    entry.item_type = "<Separator>";
+    entry.accelerator = (gchar*) NULL;
+
+    gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
+
+    /* this will be wrong for more than one separator. do we care? */
+    GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/sep" );
+#else
     GtkWidget *menuItem = gtk_menu_item_new();
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
-    
+#endif
+
     mitem->SetMenuItem(menuItem);
     m_items.Append( mitem );
 }
 
+static char* GetHotKey( const wxString &hotkey, char *hotbuf )
+{
+    if (hotkey.IsEmpty()) return (char*) NULL;
+
+    switch (hotkey[0])
+    {
+        case _T('a'):   /* Alt */
+        case _T('A'):
+        case _T('m'):   /* Meta */
+        case _T('M'):
+        {
+            strcpy( hotbuf, "<alt>" );
+            wxString last = hotkey.Right(1);
+            strcat( hotbuf, last.mb_str() );
+            return hotbuf;
+        }
+        case _T('c'):    /* Ctrl */
+        case _T('C'):
+        case _T('s'):    /* Strg, yeah man, I'm German */
+        case _T('S'):
+        {
+            strcpy( hotbuf, "<control>" );
+            wxString last = hotkey.Right(1);
+            strcat( hotbuf, last.mb_str() );
+            return hotbuf;
+        }
+        case _T('F'):   /* function keys */
+        {
+            strcpy( hotbuf, hotkey.mb_str() );
+            return hotbuf;
+        }
+        default:
+        {
+        }
+    }
+    return (char*) NULL;
+}
+
 void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
 {
     wxMenuItem *mitem = new wxMenuItem();
@@ -525,47 +777,52 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
     mitem->SetText(item);
     mitem->SetHelp(helpStr);
     mitem->SetCheckable(checkable);
-    const char *text = mitem->GetText();
-    
+
 #if (GTK_MINOR_VERSION > 0)
-    char buf[100];
+    /* text has "_" instead of "&" after mitem->SetText() */
+    wxString text( mitem->GetText() );
+
+    /* local buffer in multibyte form */
+    char buf[200];
     strcpy( buf, "/" );
-    strcat( buf, text );
-    
+    strcat( buf, text.mb_str() );
+
     GtkItemFactoryEntry entry;
     entry.path = buf;
-    entry.accelerator = (gchar*) NULL;
     entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
     entry.callback_action = 0;
     if (checkable)
         entry.item_type = "<CheckItem>";
     else
         entry.item_type = "<Item>";
-    
+
+    char hotbuf[50];
+    entry.accelerator = GetHotKey( mitem->GetHotKey(), hotbuf );
+
     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 s = "<main>/";
-    for ( const char *pc = text; *pc != '\0'; pc++ )
+    wxString s = _T("<main>/");
+    for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
     {
-        if (*pc == '_') pc++; /* skip it */
+        if (*pc == _T('_')) pc++; /* skip it */
         s << *pc;
     }
-    
-    GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, s );
-    
+
+    GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, s.mb_str() );
+
 #else
 
-    GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label(text)
-                                    : gtk_menu_item_new_with_label(text);
-				    
+    GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label( mitem->GetText().mb_str() )
+                                    : gtk_menu_item_new_with_label( mitem->GetText().mb_str() );
+
     gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
                         GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
                         (gpointer)this );
-			
+
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
-    
+
 #endif
 
     gtk_signal_connect( GTK_OBJECT(menuItem), "select",
@@ -581,16 +838,48 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
     m_items.Append( mitem );
 }
 
-void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxString &helpStr )
+void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr )
 {
     wxMenuItem *mitem = new wxMenuItem();
     mitem->SetId(id);
-    mitem->SetText(text);
+    mitem->SetText(item);
     mitem->SetHelp(helpStr);
 
-    GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText());
-    mitem->SetMenuItem(menuItem);
-    mitem->SetSubMenu(subMenu);
+#if (GTK_MINOR_VERSION > 0)
+    /* text has "_" instead of "&" after mitem->SetText() */
+    wxString text( mitem->GetText() );
+
+    /* local buffer in multibyte form */
+    char buf[200];
+    strcpy( buf, "/" );
+    strcat( buf, text.mb_str() );
+
+    GtkItemFactoryEntry entry;
+    entry.path = buf;
+    entry.callback = (GtkItemFactoryCallback) 0;
+    entry.callback_action = 0;
+    entry.item_type = "<Branch>";
+
+    gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
+
+    /* in order to get the pointer to the item we need the item text _without_ underscores */
+    wxString s = _T("<main>/");
+    for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
+    {
+        if (*pc == _T('_')) pc++; /* skip it */
+        s << *pc;
+    }
+
+    GtkWidget *menuItem = gtk_item_factory_get_item( m_factory, s.mb_str() );
+
+#else
+
+    GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str());
+
+    gtk_menu_append( GTK_MENU(m_menu), menuItem );
+    gtk_widget_show( menuItem );
+
+#endif
 
     gtk_signal_connect( GTK_OBJECT(menuItem), "select",
                         GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
@@ -601,8 +890,10 @@ void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxStri
                         (gpointer*)this );
 
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
-    gtk_menu_append( GTK_MENU(m_menu), menuItem );
-    gtk_widget_show( menuItem );
+
+    mitem->SetMenuItem(menuItem);
+    mitem->SetSubMenu(subMenu);
+
     m_items.Append( mitem );
 }
 
@@ -615,10 +906,10 @@ void wxMenu::Append( wxMenuItem *item )
     if (item->IsSeparator())
         menuItem = gtk_menu_item_new();
     else if (item->IsSubMenu())
-        menuItem = gtk_menu_item_new_with_label(item->GetText());
+        menuItem = gtk_menu_item_new_with_label(item->GetText().mbc_str());
     else
-        menuItem = item->IsCheckable() ? gtk_check_menu_item_new_with_label(item->GetText())
-                                       : gtk_menu_item_new_with_label(item->GetText());
+        menuItem = item->IsCheckable() ? gtk_check_menu_item_new_with_label(item->GetText().mbc_str())
+                                       : gtk_menu_item_new_with_label(item->GetText().mbc_str());
 
     if (!item->IsSeparator())
     {
@@ -645,14 +936,14 @@ void wxMenu::Append( wxMenuItem *item )
 
 int wxMenu::FindItem( const wxString itemString ) const
 {
-    wxString s = "";
-    for ( const char *pc = itemString; *pc != '\0'; pc++ )
+    wxString s = _T("");
+    for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ )
     {
-        if (*pc == '&')
-	{
-	    pc++; /* skip it */
+        if (*pc == _T('&'))
+        {
+            pc++; /* skip it */
 #if (GTK_MINOR_VERSION > 0)
-            s << '_';
+            s << _T('_');
 #endif
         }
         s << *pc;
@@ -676,7 +967,7 @@ void wxMenu::Enable( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_RET( item, "wxMenu::Enable: no such item" );
+    wxCHECK_RET( item, _T("wxMenu::Enable: no such item") );
 
     item->Enable(enable);
 }
@@ -685,7 +976,7 @@ bool wxMenu::IsEnabled( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, FALSE, "wxMenu::IsEnabled: no such item" );
+    wxCHECK_MSG( item, FALSE, _T("wxMenu::IsEnabled: no such item") );
 
     return item->IsEnabled();
 }
@@ -694,7 +985,7 @@ void wxMenu::Check( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_RET( item, "wxMenu::Check: no such item" );
+    wxCHECK_RET( item, _T("wxMenu::Check: no such item") );
 
     item->Check(enable);
 }
@@ -703,7 +994,7 @@ bool wxMenu::IsChecked( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, FALSE, "wxMenu::IsChecked: no such item" );
+    wxCHECK_MSG( item, FALSE, _T("wxMenu::IsChecked: no such item") );
 
     return item->IsChecked();
 }
@@ -712,7 +1003,7 @@ void wxMenu::SetLabel( int id, const wxString &label )
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_RET( item, "wxMenu::SetLabel: no such item" );
+    wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") );
 
     item->SetText(label);
 }
@@ -721,7 +1012,7 @@ wxString wxMenu::GetLabel( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, "", "wxMenu::GetLabel: no such item" );
+    wxCHECK_MSG( item, _T(""), _T("wxMenu::GetLabel: no such item") );
 
     return item->GetText();
 }
@@ -730,7 +1021,7 @@ void wxMenu::SetHelpString( int id, const wxString& helpString )
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_RET( item, "wxMenu::SetHelpString: no such item" );
+    wxCHECK_RET( item, _T("wxMenu::SetHelpString: no such item") );
 
     item->SetHelp( helpString );
 }
@@ -739,7 +1030,7 @@ wxString wxMenu::GetHelpString( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, "", "wxMenu::GetHelpString: no such item" );
+    wxCHECK_MSG( item, _T(""), _T("wxMenu::GetHelpString: no such item") );
 
     return item->GetHelp();
 }