X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d38ceae8b9d776425a058e9b652ca143cd049a2f..9b64e79868d4d32c3541bbd049d3f9f94c8edbfe:/src/gtk1/menu.cpp

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index feb4c5e2f3..d3ebf032d7 100644
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -36,9 +36,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 wxMenuBar::wxMenuBar( long style )
 {
     /* the parent window is known after wxFrame::SetMenu() */
-    m_needParent = FALSE; 
+    m_needParent = FALSE;
+    m_style = style;
+    m_invokingWindow = (wxWindow*) NULL;
 
-    PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, style, "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 );
 
@@ -47,7 +54,7 @@ wxMenuBar::wxMenuBar( long style )
     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    
+#else
     m_menubar = gtk_menu_bar_new();
 #endif
 
@@ -63,17 +70,22 @@ wxMenuBar::wxMenuBar( long style )
     }
 
     PostCreation();
-
-    Show( TRUE );
 }
 
 wxMenuBar::wxMenuBar()
 {
     /* the parent window is known after wxFrame::SetMenu() */
     m_needParent = FALSE;
+    m_style = 0;
+    m_invokingWindow = (wxWindow*) NULL;
 
-    PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
-
+    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. */
@@ -81,15 +93,13 @@ wxMenuBar::wxMenuBar()
     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    
+#else
     m_menubar = gtk_menu_bar_new();
 #endif
 
     m_widget = GTK_WIDGET(m_menubar);
 
     PostCreation();
-
-    Show( TRUE );
 }
 
 wxMenuBar::~wxMenuBar()
@@ -97,56 +107,163 @@ 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 )
+{
+    m_invokingWindow = 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 )
+{
+    m_invokingWindow = (wxWindow*) NULL;
+#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 );
-    
+
+    const wxChar *pc;
+
     /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
     wxString str;
-    for ( const wxChar *pc = title; *pc != _T('\0'); pc++ )
+    for ( pc = title; *pc != T('\0'); pc++ )
     {
-        if (*pc == _T('&'))
-	{
+        if (*pc == T('&'))
+        {
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
-            str << _T('_');
+            str << T('_');
+        }
+        else if (*pc == T('/'))
+        {
+            str << T('\\');
 #endif
         }
         else
-           str << *pc;
+        {
+#if __WXGTK12__
+            if ( *pc == T('_') )
+            {
+                // underscores must be doubled to prevent them from being
+                // interpreted as accelerator character prefix by GTK
+                str << *pc;
+            }
+#endif // GTK+ 1.2
+
+            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 */
-    char buf[200];
-    strcpy( buf, "/" );
-    strcat( buf, str.mb_str() );
-    
+    wxString buf;
+    buf << T('/') << str.c_str();
+
+    char *cbuf = new char[buf.Length()+1];
+    strcpy(cbuf, buf.mbc_str());
+
     GtkItemFactoryEntry entry;
-    entry.path = buf;
+    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 ( const wxChar *pc = str; *pc != _T('\0'); pc++ )
+    wxString tmp = T("<main>/");
+    for ( pc = str; *pc != T('\0'); pc++ )
     {
-        if (*pc == _T('_')) pc++; /* skip it */
-        tmp << *pc;
+       // contrary to the common sense, we must throw out _all_ underscores,
+       // (i.e. "Hello__World" => "HelloWorld" and not "Hello_World" as we
+       // might naively think). IMHO it's a bug in GTK+ (VZ) 
+       while (*pc == T('_'))
+           pc++;
+       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->m_owner = gtk_menu_item_new_with_label( str.mb_str() );
@@ -154,8 +271,13 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
     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
+
+    // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
+    // adding menu later on.
+    if (m_invokingWindow)
+        wxMenubarSetInvokingWindow( menu, m_invokingWindow );
 }
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
@@ -180,7 +302,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 )
     {
@@ -242,7 +364,7 @@ void wxMenuBar::Check( int id, bool check )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") );
+    wxCHECK_RET( item, T("wxMenuBar::Check: no such item") );
 
     item->Check(check);
 }
@@ -251,7 +373,7 @@ bool wxMenuBar::IsChecked( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked: no such item") );
+    wxCHECK_MSG( item, FALSE, T("wxMenuBar::IsChecked: no such item") );
 
     return item->IsChecked();
 }
@@ -260,7 +382,7 @@ void wxMenuBar::Enable( int id, bool enable )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") );
+    wxCHECK_RET( item, T("wxMenuBar::Enable: no such item") );
 
     item->Enable(enable);
 }
@@ -269,7 +391,7 @@ bool wxMenuBar::IsEnabled( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled: no such item") );
+    wxCHECK_MSG( item, FALSE, T("wxMenuBar::IsEnabled: no such item") );
 
     return item->IsEnabled();
 }
@@ -278,7 +400,7 @@ wxString wxMenuBar::GetLabel( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel: no such item") );
+    wxCHECK_MSG( item, T(""), T("wxMenuBar::GetLabel: no such item") );
 
     return item->GetText();
 }
@@ -287,7 +409,7 @@ void wxMenuBar::SetLabel( int id, const wxString &label )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_RET( item, _T("wxMenuBar::SetLabel: no such item") );
+    wxCHECK_RET( item, T("wxMenuBar::SetLabel: no such item") );
 
     item->SetText( label );
 }
@@ -296,7 +418,7 @@ void wxMenuBar::EnableTop( int pos, bool flag )
 {
     wxNode *node = m_menus.Nth( pos );
 
-    wxCHECK_RET( node, _T("menu not found") );
+    wxCHECK_RET( node, T("menu not found") );
 
     wxMenu* menu = (wxMenu*)node->Data();
 
@@ -308,7 +430,7 @@ wxString wxMenuBar::GetLabelTop( int pos ) const
 {
     wxNode *node = m_menus.Nth( pos );
 
-    wxCHECK_MSG( node, _T("invalid"), _T("menu not found") );
+    wxCHECK_MSG( node, T("invalid"), T("menu not found") );
 
     wxMenu* menu = (wxMenu*)node->Data();
 
@@ -319,7 +441,7 @@ void wxMenuBar::SetLabelTop( int pos, const wxString& label )
 {
     wxNode *node = m_menus.Nth( pos );
 
-    wxCHECK_RET( node, _T("menu not found") );
+    wxCHECK_RET( node, T("menu not found") );
 
     wxMenu* menu = (wxMenu*)node->Data();
 
@@ -330,7 +452,7 @@ void wxMenuBar::SetHelpString( int id, const wxString& helpString )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_RET( item, _T("wxMenuBar::SetHelpString: no such item") );
+    wxCHECK_RET( item, T("wxMenuBar::SetHelpString: no such item") );
 
     item->SetHelp( helpString );
 }
@@ -339,7 +461,7 @@ wxString wxMenuBar::GetHelpString( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString: no such item") );
+    wxCHECK_MSG( item, T(""), T("wxMenuBar::GetHelpString: no such item") );
 
     return item->GetHelp();
 }
@@ -361,7 +483,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
         return;
 
     wxMenuItem* item = menu->FindItem( id );
-    wxCHECK_RET( item, _T("error in menu item callback") );
+    wxCHECK_RET( item, T("error in menu item callback") );
 
     if (item->IsCheckable())
     {
@@ -413,15 +535,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;
 
@@ -474,19 +587,39 @@ wxMenuItem::wxMenuItem()
 // it's valid for this function to be called even if m_menuItem == NULL
 void wxMenuItem::SetName( const wxString& str )
 {
-    m_text = _T("");
-    for ( const wxChar *pc = str; *pc != _T('\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 == _T('&'))
-	{
+        if (*pc == T('&'))
+        {
 #if (GTK_MINOR_VERSION > 0)
-            m_text << _T('_');
+            m_text << T('_');
+        }
+        else if ( *pc == T('_') )    // escape underscores
+        {
+            m_text << T("__");
+        }
+        else if (*pc == T('/'))      /* we have to filter out slashes ... */
+        {
+            m_text << T('\\');  /* ... and replace them with back slashes */
 #endif
         }
         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 );
@@ -496,9 +629,9 @@ void wxMenuItem::SetName( const wxString& str )
 
 void wxMenuItem::Check( bool check )
 {
-    wxCHECK_RET( m_menuItem, _T("invalid menu item") );
+    wxCHECK_RET( m_menuItem, T("invalid menu item") );
 
-    wxCHECK_RET( IsCheckable(), _T("Can't check uncheckable item!") )
+    wxCHECK_RET( IsCheckable(), T("Can't check uncheckable item!") )
 
     if (check == m_isChecked) return;
 
@@ -508,7 +641,7 @@ void wxMenuItem::Check( bool check )
 
 void wxMenuItem::Enable( bool enable )
 {
-    wxCHECK_RET( m_menuItem, _T("invalid menu item") );
+    wxCHECK_RET( m_menuItem, T("invalid menu item") );
 
     gtk_widget_set_sensitive( m_menuItem, enable );
     m_isEnabled = enable;
@@ -516,7 +649,7 @@ void wxMenuItem::Enable( bool enable )
 
 bool wxMenuItem::IsChecked() const
 {
-    wxCHECK_MSG( m_menuItem, FALSE, _T("invalid menu item") );
+    wxCHECK_MSG( m_menuItem, FALSE, T("invalid menu item") );
 
     wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
 
@@ -531,37 +664,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 = _T("");
-    if (m_title != _T(""))
+    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 )
@@ -580,14 +738,68 @@ 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 );
 }
 
+#if (GTK_MINOR_VERSION > 0)
+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;
+}
+#endif
+
 void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
 {
     wxMenuItem *mitem = new wxMenuItem();
@@ -595,50 +807,52 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
     mitem->SetText(item);
     mitem->SetHelp(helpStr);
     mitem->SetCheckable(checkable);
-    
+
 #if (GTK_MINOR_VERSION > 0)
-    /* text has "_" instead of "&" after mitem->SetText() */ 
+    /* 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.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 = _T("<main>/");
-    for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
+    wxString s = T("<main>/");
+    for ( const wxChar *pc = text; *pc != T('\0'); pc++ )
     {
-        if (*pc == _T('_')) pc++; /* skip it */
+        while (*pc == T('_')) pc++; /* skip it */
         s << *pc;
     }
-    
+
     GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, s.mb_str() );
-    
+
 #else
 
     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",
@@ -654,16 +868,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);
 
+#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());
-    mitem->SetMenuItem(menuItem);
-    mitem->SetSubMenu(subMenu);
+
+    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),
@@ -674,8 +920,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 );
 }
 
@@ -718,14 +966,14 @@ void wxMenu::Append( wxMenuItem *item )
 
 int wxMenu::FindItem( const wxString itemString ) const
 {
-    wxString s = _T("");
-    for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ )
+    wxString s = T("");
+    for ( const wxChar *pc = itemString; *pc != T('\0'); pc++ )
     {
-        if (*pc == _T('&'))
-	{
-	    pc++; /* skip it */
+        if (*pc == T('&'))
+        {
+            pc++; /* skip it */
 #if (GTK_MINOR_VERSION > 0)
-            s << _T('_');
+            s << T('_');
 #endif
         }
         s << *pc;
@@ -749,7 +997,7 @@ void wxMenu::Enable( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_RET( item, _T("wxMenu::Enable: no such item") );
+    wxCHECK_RET( item, T("wxMenu::Enable: no such item") );
 
     item->Enable(enable);
 }
@@ -758,7 +1006,7 @@ bool wxMenu::IsEnabled( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, FALSE, _T("wxMenu::IsEnabled: no such item") );
+    wxCHECK_MSG( item, FALSE, T("wxMenu::IsEnabled: no such item") );
 
     return item->IsEnabled();
 }
@@ -767,7 +1015,7 @@ void wxMenu::Check( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_RET( item, _T("wxMenu::Check: no such item") );
+    wxCHECK_RET( item, T("wxMenu::Check: no such item") );
 
     item->Check(enable);
 }
@@ -776,7 +1024,7 @@ bool wxMenu::IsChecked( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, FALSE, _T("wxMenu::IsChecked: no such item") );
+    wxCHECK_MSG( item, FALSE, T("wxMenu::IsChecked: no such item") );
 
     return item->IsChecked();
 }
@@ -785,7 +1033,7 @@ void wxMenu::SetLabel( int id, const wxString &label )
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") );
+    wxCHECK_RET( item, T("wxMenu::SetLabel: no such item") );
 
     item->SetText(label);
 }
@@ -794,7 +1042,7 @@ wxString wxMenu::GetLabel( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, _T(""), _T("wxMenu::GetLabel: no such item") );
+    wxCHECK_MSG( item, T(""), T("wxMenu::GetLabel: no such item") );
 
     return item->GetText();
 }
@@ -803,7 +1051,7 @@ void wxMenu::SetHelpString( int id, const wxString& helpString )
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_RET( item, _T("wxMenu::SetHelpString: no such item") );
+    wxCHECK_RET( item, T("wxMenu::SetHelpString: no such item") );
 
     item->SetHelp( helpString );
 }
@@ -812,7 +1060,7 @@ wxString wxMenu::GetHelpString( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, _T(""), _T("wxMenu::GetHelpString: no such item") );
+    wxCHECK_MSG( item, T(""), T("wxMenu::GetHelpString: no such item") );
 
     return item->GetHelp();
 }