X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3502e687e29f46c747be16a58d39fe79e7b1c7bc..e66474166b164b9e11f9881e79d531bc5182ea31:/src/gtk/menu.cpp?ds=inline

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index aff2211922..e2b79dbf82 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,19 +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; 
 
-    PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
+    PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, style, "menu" );
 
     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)
     {
         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), GTK_WIDGET(m_menubar) );
+        gtk_widget_show( GTK_WIDGET(m_menubar) );
     }
     else
     {
@@ -48,55 +63,196 @@ wxMenuBar::wxMenuBar( long style )
     }
 
     PostCreation();
-
-    Show( TRUE );
 }
 
 wxMenuBar::wxMenuBar()
 {
-    m_needParent = FALSE; // hmmm
+    /* the parent window is known after wxFrame::SetMenu() */
+    m_needParent = FALSE;
 
     PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
 
     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);
+    m_widget = GTK_WIDGET(m_menubar);
 
     PostCreation();
+}
+
+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();
+    }
+}
 
-    Show( TRUE );
+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 );
-    menu->m_title = title; 
+    
+    /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
+    wxString str;
+    for ( const wxChar *pc = title; *pc != _T('\0'); pc++ )
+    {
+        if (*pc == _T('&'))
+	{
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+            str << _T('_');
+        } else 
+	if (*pc == _T('/'))
+	{
+            str << _T('\\');
+#endif
+	}
+        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)
 
-    int pos;
-    do 
+    /* local buffer in multibyte form */
+    char buf[200];
+    strcpy( buf, "/" );
+    strcat( buf, str.mb_str() );
+    
+    GtkItemFactoryEntry entry;
+    entry.path = buf;
+    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++ )
     {
-        pos = menu->m_title.First( '&' );
-        if (pos != -1) menu->m_title.Remove( pos, 1 );
-    } while (pos != -1);
+        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 );
+    
+#else
 
-    menu->m_owner = gtk_menu_item_new_with_label( WXSTRINGCAST(menu->m_title) );
+    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 )
 {
-    if (menu->m_title == menuString)
+    if (menu->GetTitle() == menuString)
     {
         int res = menu->FindItem( itemString );
-        if (res != -1) return res;
+        if (res != wxNOT_FOUND)
+            return res;
     }
-    
-    wxNode *node = menu->m_items.First();
+
+    wxNode *node = ((wxMenu *)menu)->GetItems().First();    // const_cast
     while (node)
     {
         wxMenuItem *item = (wxMenuItem*)node->Data();
@@ -106,7 +262,19 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString
         node = node->Next();
     }
 
-    return -1;
+    return wxNOT_FOUND;
+}
+
+wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem ) const
+{
+    if ( menuForItem )
+    {
+        // TODO return the pointer to the menu
+
+        *menuForItem = NULL;
+    }
+
+    return FindItem(itemId);
 }
 
 int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
@@ -122,26 +290,26 @@ int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemStr
     return -1;
 }
 
-/* Find a wxMenuItem using its id. Recurses down into sub-menus */
+// Find a wxMenuItem using its id. Recurses down into sub-menus
 static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
 {
     wxMenuItem* result = menu->FindItem(id);
 
-    wxNode *node = menu->m_items.First();
-    while ( node && result == NULL ) 
+    wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast
+    while ( node && result == NULL )
     {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->IsSubMenu())
-	{
+        {
             result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
-	}
+        }
         node = node->Next();
     }
 
     return result;
 }
 
-wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const
+wxMenuItem* wxMenuBar::FindItem( int id ) const
 {
     wxMenuItem* result = 0;
     wxNode *node = m_menus.First();
@@ -151,101 +319,114 @@ wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const
         result = FindMenuItemByIdRecursive( menu, id );
         node = node->Next();
     }
-    
+
     return result;
 }
 
 void wxMenuBar::Check( int id, bool check )
 {
     wxMenuItem* item = FindMenuItemById( id );
-    if (item) item->Check(check);
+
+    wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") );
+
+    item->Check(check);
 }
 
-bool wxMenuBar::Checked( int id ) const
+bool wxMenuBar::IsChecked( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
-    if (item) return item->IsChecked();
-    return FALSE;
+
+    wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked: no such item") );
+
+    return item->IsChecked();
 }
 
 void wxMenuBar::Enable( int id, bool enable )
 {
     wxMenuItem* item = FindMenuItemById( id );
-    if (item) item->Enable(enable);
+
+    wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") );
+
+    item->Enable(enable);
 }
 
-bool wxMenuBar::Enabled( int id ) const
+bool wxMenuBar::IsEnabled( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
-    if (item) return item->IsEnabled();
-    
-    return FALSE;
+
+    wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled: no such item") );
+
+    return item->IsEnabled();
 }
 
 wxString wxMenuBar::GetLabel( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
-    
-    if (item) return item->GetText();
-    
-    return wxString("");
+
+    wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel: no such item") );
+
+    return item->GetText();
 }
 
 void wxMenuBar::SetLabel( int id, const wxString &label )
 {
     wxMenuItem* item = FindMenuItemById( id );
-    
-    if (item) item->SetText( label );
+
+    wxCHECK_RET( item, _T("wxMenuBar::SetLabel: no such item") );
+
+    item->SetText( label );
 }
 
 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();
-  
-    if (menu->m_owner) gtk_widget_set_sensitive( menu->m_owner, flag );
+
+    if (menu->m_owner)
+        gtk_widget_set_sensitive( menu->m_owner, flag );
 }
 
 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();
-  
+
     return menu->GetTitle();
 }
 
 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();
-  
+
     menu->SetTitle( label );
 }
 
 void wxMenuBar::SetHelpString( int id, const wxString& helpString )
 {
     wxMenuItem* item = FindMenuItemById( id );
-    
-    if (item) item->SetHelp( helpString );
+
+    wxCHECK_RET( item, _T("wxMenuBar::SetHelpString: no such item") );
+
+    item->SetHelp( helpString );
 }
 
 wxString wxMenuBar::GetHelpString( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
-    
-    if (item) 
-        return item->GetHelp();
-    else
-        return wxString("");
+
+    wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString: no such item") );
+
+    return item->GetHelp();
 }
 
 //-----------------------------------------------------------------------------
@@ -254,44 +435,49 @@ 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 */
-    wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) ); 
+    wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) );
 
-    if (!menu->IsEnabled(id)) return;
+    if (!menu->IsEnabled(id))
+        return;
 
     wxMenuItem* item = menu->FindItem( id );
-    wxCHECK_RET( item, "error in menu item callback" );
-    
-    if (item->m_isCheckMenu)
+    wxCHECK_RET( item, _T("error in menu item callback") );
+
+    if (item->IsCheckable())
     {
-        if (item->m_isChecked == item->IsChecked())
+        if (item->GetCheckedFlag() == item->IsChecked())
         {
-	    /* the menu item has been checked by calling wxMenuItem->Check() */
+            /* the menu item has been checked by calling wxMenuItem->Check() */
             return;
-	}
-	else
-	{
-	    /* the user pressed on the menu item -> report */
-	    item->m_isChecked = item->IsChecked();  /* make consistent again */
-	}
+        }
+        else
+        {
+            /* the user pressed on the menu item -> report */
+            item->SetCheckedFlag(item->IsChecked());  /* make consistent again */
+        }
     }
 
     wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id );
     event.SetEventObject( menu );
     event.SetInt(id );
 
-    if (menu->m_callback)
+    if (menu->GetCallback())
     {
-        (void) (*(menu->m_callback)) (*menu, event);
+        (void) (*(menu->GetCallback())) (*menu, event);
         return;
     }
 
-    if (menu->GetEventHandler()->ProcessEvent(event)) return;
+    if (menu->GetEventHandler()->ProcessEvent(event))
+        return;
 
     wxWindow *win = menu->GetInvokingWindow();
-    if (win) win->GetEventHandler()->ProcessEvent( event );
+    if (win)
+        win->GetEventHandler()->ProcessEvent( event );
 }
 
 //-----------------------------------------------------------------------------
@@ -300,11 +486,14 @@ 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!
 
-    if (!menu->IsEnabled(id)) return;
+    if (!menu->IsEnabled(id))
+        return;
 
     wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
     event.SetEventObject( menu );
@@ -318,7 +507,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
      }
 */
 
-    if (menu->GetEventHandler()->ProcessEvent(event)) return;
+    if (menu->GetEventHandler()->ProcessEvent(event))
+        return;
 
     wxWindow *win = menu->GetInvokingWindow();
     if (win) win->GetEventHandler()->ProcessEvent( event );
@@ -330,19 +520,24 @@ 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!
 
-    if (!menu->IsEnabled(id)) return;
+    if (!menu->IsEnabled(id))
+        return;
 
     wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
     event.SetEventObject( menu );
 
-    if (menu->GetEventHandler()->ProcessEvent(event)) return;
+    if (menu->GetEventHandler()->ProcessEvent(event))
+        return;
 
     wxWindow *win = menu->GetInvokingWindow();
-    if (win) win->GetEventHandler()->ProcessEvent( event );
+    if (win)
+        win->GetEventHandler()->ProcessEvent( event );
 }
 
 //-----------------------------------------------------------------------------
@@ -361,28 +556,50 @@ wxMenuItem::wxMenuItem()
     m_menuItem = (GtkWidget *) NULL;
 }
 
-/* it's valid for this function to be called even if m_menuItem == NULL */
+// 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 */
-        m_text << *pc;
+        if (*pc == _T('&'))
+	{
+#if (GTK_MINOR_VERSION > 0)
+            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 );
-        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;
 
@@ -392,7 +609,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;
@@ -400,7 +617,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!
 
@@ -420,25 +637,37 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func )
     m_title = title;
     m_items.DeleteContents( TRUE );
     m_invokingWindow = (wxWindow *) NULL;
+    
+#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    
     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;
 }
 
+wxMenu::~wxMenu()
+{
+    /* how do we delete an item-factory ? */
+}
+
 void wxMenu::SetTitle( const wxString& title )
 {
-    /* Waiting for something better. */
+    // TODO Waiting for something better
     m_title = title;
 }
 
@@ -452,13 +681,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();
@@ -466,39 +748,109 @@ 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();
-    GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label(text)
-                                    : gtk_menu_item_new_with_label(text);
-
-    mitem->SetMenuItem(menuItem);
+    
+#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) 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++ )
+    {
+        if (*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 );
+                        (gpointer)this );
+			
+    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),
-                        (gpointer*)this );
+                        (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
                         GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
-                        (gpointer*)this );
+                        (gpointer)this );
+
+    mitem->SetMenuItem(menuItem);
 
-    gtk_menu_append( GTK_MENU(m_menu), menuItem );
-    gtk_widget_show( menuItem );
     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);
-
-    GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText());
+    mitem->SetText(item);
     mitem->SetHelp(helpStr);
-    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),
@@ -509,119 +861,149 @@ 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 );
+    
+    mitem->SetMenuItem(menuItem);
+    mitem->SetSubMenu(subMenu);
+
+    m_items.Append( mitem );
+}
+
+void wxMenu::Append( wxMenuItem *item )
+{
+    m_items.Append( item );
+
+    GtkWidget *menuItem = (GtkWidget*) NULL;
+
+    if (item->IsSeparator())
+        menuItem = gtk_menu_item_new();
+    else if (item->IsSubMenu())
+        menuItem = gtk_menu_item_new_with_label(item->GetText().mbc_str());
+    else
+        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())
+    {
+        gtk_signal_connect( GTK_OBJECT(menuItem), "select",
+                            GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
+                            (gpointer*)this );
+
+        gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
+                            GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
+                            (gpointer*)this );
+
+        if (!item->IsSubMenu())
+        {
+            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 );
-    m_items.Append( mitem );
+    item->SetMenuItem(menuItem);
 }
 
 int wxMenu::FindItem( const wxString itemString ) const
 {
-    wxString s( itemString );
-
-    int pos;
-    do 
+    wxString s = _T("");
+    for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ )
     {
-        pos = s.First( '&' );
-        if (pos != -1) s.Remove( pos, 1 );
-    } while (pos != -1);
+        if (*pc == _T('&'))
+	{
+	    pc++; /* skip it */
+#if (GTK_MINOR_VERSION > 0)
+            s << _T('_');
+#endif
+        }
+        s << *pc;
+    }
 
     wxNode *node = m_items.First();
     while (node)
     {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->GetText() == s)
-	{
+        {
             return item->GetId();
-	}
+        }
         node = node->Next();
     }
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
 void wxMenu::Enable( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
-    if (item)
-    { 
-        item->Enable(enable);
-    }
+
+    wxCHECK_RET( item, _T("wxMenu::Enable: no such item") );
+
+    item->Enable(enable);
 }
 
 bool wxMenu::IsEnabled( int id ) const
 {
     wxMenuItem *item = FindItem(id);
-    if (item)
-    {
-        return item->IsEnabled();
-    }
-    else
-    {
-        return FALSE;
-    }
+
+    wxCHECK_MSG( item, FALSE, _T("wxMenu::IsEnabled: no such item") );
+
+    return item->IsEnabled();
 }
 
 void wxMenu::Check( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
-    if (item)
-    {
-        item->Check(enable);
-    }
+
+    wxCHECK_RET( item, _T("wxMenu::Check: no such item") );
+
+    item->Check(enable);
 }
 
 bool wxMenu::IsChecked( int id ) const
 {
     wxMenuItem *item = FindItem(id);
-    if (item)
-    {
-        return item->IsChecked();
-    }
-    else
-    {
-        return FALSE;
-    }
+
+    wxCHECK_MSG( item, FALSE, _T("wxMenu::IsChecked: no such item") );
+
+    return item->IsChecked();
 }
 
 void wxMenu::SetLabel( int id, const wxString &label )
 {
     wxMenuItem *item = FindItem(id);
-    if (item)
-    {
-        item->SetText(label);
-    }
+
+    wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") );
+
+    item->SetText(label);
 }
 
 wxString wxMenu::GetLabel( int id ) const
 {
     wxMenuItem *item = FindItem(id);
-    if (item)
-    { 
-        return item->GetText();
-    }
-    else
-    {
-        return "";
-    }
+
+    wxCHECK_MSG( item, _T(""), _T("wxMenu::GetLabel: no such item") );
+
+    return item->GetText();
 }
 
 void wxMenu::SetHelpString( int id, const wxString& helpString )
 {
     wxMenuItem *item = FindItem(id);
-    if (item) item->SetHelp( helpString );
+
+    wxCHECK_RET( item, _T("wxMenu::SetHelpString: no such item") );
+
+    item->SetHelp( helpString );
 }
 
 wxString wxMenu::GetHelpString( int id ) const
 {
     wxMenuItem *item = FindItem(id);
-    if (item)
-    { 
-        return item->GetHelp();
-    }
-    else
-    {
-        return "";
-    }
+
+    wxCHECK_MSG( item, _T(""), _T("wxMenu::GetHelpString: no such item") );
+
+    return item->GetHelp();
 }
 
 int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
@@ -635,19 +1017,19 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
         node = node->Next();
     }
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
 wxMenuItem *wxMenu::FindItem(int id) const
 {
     wxNode *node = m_items.First();
-    while (node) 
+    while (node)
     {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->GetId() == id)
-	{
+        {
             return item;
-	}
+        }
         node = node->Next();
     }
 
@@ -668,10 +1050,9 @@ wxWindow *wxMenu::GetInvokingWindow()
     return m_invokingWindow;
 }
 
-// Update a menu and all submenus recursively.
-// source is the object that has the update event handlers
-// defined for it. If NULL, the menu or associated window
-// will be used.
+// Update a menu and all submenus recursively. source is the object that has
+// the update event handlers defined for it. If NULL, the menu or associated
+// window will be used.
 void wxMenu::UpdateUI(wxEvtHandler* source)
 {
   if (!source && GetInvokingWindow())
@@ -708,4 +1089,3 @@ void wxMenu::UpdateUI(wxEvtHandler* source)
   }
 }
 
-