X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30f82ea416c2b34d1d608cf6ebc369690eb2304e..4d85bcd1f59a00ff4d626f0acc0b24474ec1aa09:/src/gtk/menu.cpp

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index fad9d5bb8e..35a6a05cd0 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -2,20 +2,30 @@
 // Name:        menu.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
 // Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifdef __GNUG__
 #pragma implementation "menu.h"
+#pragma implementation "menuitem.h"
 #endif
 
 #include "wx/menu.h"
 #include "wx/log.h"
 #include "wx/intl.h"
+#include "wx/app.h"
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
 
 //-----------------------------------------------------------------------------
 // wxMenuBar
@@ -23,406 +33,1150 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 
+wxMenuBar::wxMenuBar( long style )
+{
+    /* the parent window is known after wxFrame::SetMenu() */
+    m_needParent = FALSE;
+    m_style = style;
+    m_invokingWindow = (wxWindow*) NULL;
+
+    if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
+        !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") ))
+    {
+        wxFAIL_MSG( wxT("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)
+    {
+        m_widget = gtk_handle_box_new();
+        gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_menubar) );
+        gtk_widget_show( GTK_WIDGET(m_menubar) );
+    }
+    else
+    {
+        m_widget = GTK_WIDGET(m_menubar);
+    }
+
+    PostCreation();
+}
+
 wxMenuBar::wxMenuBar()
 {
-  m_needParent = FALSE; // hmmm
+    /* the parent window is known after wxFrame::SetMenu() */
+    m_needParent = FALSE;
+    m_style = 0;
+    m_invokingWindow = (wxWindow*) NULL;
+
+    if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
+        !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("menubar") ))
+    {
+        wxFAIL_MSG( wxT("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
 
-  PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
+    m_widget = GTK_WIDGET(m_menubar);
 
-  m_menus.DeleteContents( TRUE );
+    PostCreation();
+}
 
-  m_widget = gtk_handle_box_new();
+wxMenuBar::~wxMenuBar()
+{
+//    gtk_object_unref( GTK_OBJECT(m_factory) );  why not ?
+}
 
-  m_menubar = gtk_menu_bar_new();
+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->GetParent()->m_isFrame)) 
+        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 );
 
-  gtk_container_add( GTK_CONTAINER(m_widget), m_menubar );
+#if (GTK_MINOR_VERSION > 0)
+    wxWindow *top_frame = win;
+    while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame)) 
+        top_frame = top_frame->GetParent();
 
-  gtk_widget_show( m_menubar );
+    /* support for native hot keys  */
+    gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
+#endif
 
-  PostCreation();
+    wxNode *node = menu->GetItems().First();
+    while (node)
+    {
+        wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+        if (menuitem->IsSubMenu())
+            wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win );
+        node = node->Next();
+    }
+}
 
-  Show( TRUE );
+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->GetParent()->m_isFrame)) 
+        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::Append( wxMenu *menu, const wxString &title )
+void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 {
-  m_menus.Append( menu );
-  menu->m_title = title;    // ??????
+    m_invokingWindow = (wxWindow*) NULL;
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+    wxWindow *top_frame = win;
+    while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame)) 
+        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();
+    }
+}
 
-  int pos;
-  do {
-    pos = menu->m_title.First( '&' );
-    if (pos != -1) menu->m_title.Remove( pos, 1 );
-  } while (pos != -1);
+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 ( pc = title; *pc != wxT('\0'); pc++ )
+    {
+        if (*pc == wxT('&'))
+        {
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+            str << wxT('_');
+        }
+        else if (*pc == wxT('/'))
+        {
+            str << wxT('\\');
+#endif
+        }
+        else
+        {
+#if __WXGTK12__
+            if ( *pc == wxT('_') )
+            {
+                // 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 */
+    wxString buf;
+    buf << wxT('/') << str.c_str();
+
+    char *cbuf = new char[buf.Length()+1];
+    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 = wxT("<main>/");
+    for ( pc = str; *pc != wxT('\0'); 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 == wxT('_'))
+           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() );
+    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 );
 
-  GtkWidget *root_menu;
-  root_menu = gtk_menu_item_new_with_label( WXSTRINGCAST(menu->m_title) );
-  gtk_widget_show( root_menu );
-  gtk_menu_item_set_submenu( GTK_MENU_ITEM(root_menu), menu->m_menu );
+#endif
 
-  gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), root_menu );
+    // 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 )
 {
-  if (menu->m_title == menuString)
-  {
-    int res = menu->FindItem( itemString );
-    if (res != -1) return res;
-  }
-  wxNode *node = menu->m_items.First();
-  while (node)
-  {
-    wxMenuItem *item = (wxMenuItem*)node->Data();
-    if (item->IsSubMenu())
-      return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
-    node = node->Next();
-  }
-  return -1;
+    if (menu->GetTitle() == menuString)
+    {
+        int res = menu->FindItem( itemString );
+        if (res != wxNOT_FOUND)
+            return res;
+    }
+
+    wxNode *node = ((wxMenu *)menu)->GetItems().First();    // const_cast
+    while (node)
+    {
+        wxMenuItem *item = (wxMenuItem*)node->Data();
+        if (item->IsSubMenu())
+            return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
+
+        node = node->Next();
+    }
+
+    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
 {
-  wxNode *node = m_menus.First();
-  while (node)
-  {
-    wxMenu *menu = (wxMenu*)node->Data();
-    int res = FindMenuItemRecursive( menu, menuString, itemString);
-    if (res != -1) return res;
-    node = node->Next();
-  }
-  return -1;
+    wxNode *node = m_menus.First();
+    while (node)
+    {
+        wxMenu *menu = (wxMenu*)node->Data();
+        int res = FindMenuItemRecursive( menu, menuString, itemString);
+        if (res != -1) return res;
+        node = node->Next();
+    }
+    return -1;
 }
 
 // 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 ) {
-    wxMenuItem *item = (wxMenuItem*)node->Data();
-    if ( item->IsSubMenu() )
-      result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
-    node = node->Next();
-  }
-
-  return result;
+    wxMenuItem* result = menu->FindItem(id);
+
+    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();
-  while (node && result == 0)
-  {
-    wxMenu *menu = (wxMenu*)node->Data();
-    result = FindMenuItemByIdRecursive( menu, id );
-    node = node->Next();
-  }
-  return result;
+    wxMenuItem* result = 0;
+    wxNode *node = m_menus.First();
+    while (node && result == 0)
+    {
+        wxMenu *menu = (wxMenu*)node->Data();
+        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);
+    wxMenuItem* item = FindMenuItemById( id );
+
+    wxCHECK_RET( item, wxT("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;
+    wxMenuItem* item = FindMenuItemById( id );
+
+    wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsChecked: no such item") );
+
+    return item->IsChecked();
 }
 
 void wxMenuBar::Enable( int id, bool enable )
 {
-  wxMenuItem* item = FindMenuItemById( id );
-  if (item) item->Enable(enable);
+    wxMenuItem* item = FindMenuItemById( id );
+
+    wxCHECK_RET( item, wxT("wxMenuBar::Enable: no such item") );
+
+    item->Enable(enable);
+}
+
+bool wxMenuBar::IsEnabled( int id ) const
+{
+    wxMenuItem* item = FindMenuItemById( id );
+
+    wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsEnabled: no such item") );
+
+    return item->IsEnabled();
+}
+
+wxString wxMenuBar::GetLabel( int id ) const
+{
+    wxMenuItem* item = FindMenuItemById( id );
+
+    wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetLabel: no such item") );
+
+    return item->GetText();
+}
+
+void wxMenuBar::SetLabel( int id, const wxString &label )
+{
+    wxMenuItem* item = FindMenuItemById( id );
+
+    wxCHECK_RET( item, wxT("wxMenuBar::SetLabel: no such item") );
+
+    item->SetText( label );
+}
+
+void wxMenuBar::EnableTop( int pos, bool flag )
+{
+    wxNode *node = m_menus.Nth( pos );
+
+    wxCHECK_RET( node, wxT("menu not found") );
+
+    wxMenu* menu = (wxMenu*)node->Data();
+
+    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, wxT("invalid"), wxT("menu not found") );
+
+    wxMenu* menu = (wxMenu*)node->Data();
+
+    return menu->GetTitle();
 }
 
-bool wxMenuBar::Enabled( int id ) const
+void wxMenuBar::SetLabelTop( int pos, const wxString& label )
 {
-  wxMenuItem* item = FindMenuItemById( id );
-  if (item) return item->IsEnabled();
-  return FALSE;
+    wxNode *node = m_menus.Nth( pos );
+
+    wxCHECK_RET( node, wxT("menu not found") );
+
+    wxMenu* menu = (wxMenu*)node->Data();
+
+    menu->SetTitle( label );
+}
+
+void wxMenuBar::SetHelpString( int id, const wxString& helpString )
+{
+    wxMenuItem* item = FindMenuItemById( id );
+
+    wxCHECK_RET( item, wxT("wxMenuBar::SetHelpString: no such item") );
+
+    item->SetHelp( helpString );
+}
+
+wxString wxMenuBar::GetHelpString( int id ) const
+{
+    wxMenuItem* item = FindMenuItemById( id );
+
+    wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetHelpString: no such item") );
+
+    return item->GetHelp();
 }
 
 //-----------------------------------------------------------------------------
-// wxMenu
+// "activate"
 //-----------------------------------------------------------------------------
 
 static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 {
-  int id = menu->FindMenuIdByMenuItem(widget);
+    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) );
+
+    if (!menu->IsEnabled(id))
+        return;
+
+    wxMenuItem* item = menu->FindItem( id );
+    wxCHECK_RET( item, wxT("error in menu item callback") );
+
+    if (item->IsCheckable())
+    {
+        if (item->GetCheckedFlag() == item->IsChecked())
+        {
+            /* the menu item has been checked by calling wxMenuItem->Check() */
+            return;
+        }
+        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->GetCallback())
+    {
+        (void) (*(menu->GetCallback())) (*menu, event);
+        return;
+    }
+
+    if (menu->GetEventHandler()->ProcessEvent(event))
+        return;
+
+    wxWindow *win = menu->GetInvokingWindow();
+    if (win)
+        win->GetEventHandler()->ProcessEvent( event );
+}
+
+//-----------------------------------------------------------------------------
+// "select"
+//-----------------------------------------------------------------------------
+
+static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
+{
+    if (g_isIdle) wxapp_install_idle_handler();
 
-  wxASSERT( id != -1 ); // should find it!
+    int id = menu->FindMenuIdByMenuItem(widget);
 
-  if (!menu->IsEnabled(id)) return;
+    wxASSERT( id != -1 ); // should find it!
 
-  wxCommandEvent event( wxEVENT_TYPE_MENU_COMMAND, id );
-  event.SetEventObject( menu );
-  event.SetInt(id );
-  
-  if (menu->m_callback)
-  {
-     (void) (*(menu->m_callback)) (*menu, event);
-     return;
-  }
+    if (!menu->IsEnabled(id))
+        return;
 
-  if (menu->GetEventHandler()->ProcessEvent(event)) return;
+    wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
+    event.SetEventObject( menu );
 
-  wxWindow *win = menu->GetInvokingWindow();
-  if (win) win->GetEventHandler()->ProcessEvent( event );
+    if (menu->GetEventHandler()->ProcessEvent(event))
+        return;
+
+    wxWindow *win = menu->GetInvokingWindow();
+    if (win) win->GetEventHandler()->ProcessEvent( event );
 }
 
+//-----------------------------------------------------------------------------
+// "deselect"
+//-----------------------------------------------------------------------------
+
+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;
+
+    wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
+    event.SetEventObject( menu );
+
+    if (menu->GetEventHandler()->ProcessEvent(event))
+        return;
+
+    wxWindow *win = menu->GetInvokingWindow();
+    if (win)
+        win->GetEventHandler()->ProcessEvent( event );
+}
+
+//-----------------------------------------------------------------------------
+// wxMenuItem
+//-----------------------------------------------------------------------------
+
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)
 
 wxMenuItem::wxMenuItem()
 {
-  m_id = ID_SEPARATOR;
-  m_isCheckMenu = FALSE;
-  m_isChecked = FALSE;
-  m_isEnabled = TRUE;
-  m_subMenu = (wxMenu *) NULL;
-  m_menuItem = (GtkWidget *) NULL;
+    m_id = ID_SEPARATOR;
+    m_isCheckMenu = FALSE;
+    m_isChecked = FALSE;
+    m_isEnabled = TRUE;
+    m_subMenu = (wxMenu *) NULL;
+    m_menuItem = (GtkWidget *) NULL;
 }
 
-void wxMenuItem::SetText(const wxString& str)
+wxMenuItem::~wxMenuItem()
 {
-  m_text = "";
-  for ( const char *pc = str; *pc != '\0'; pc++ ) {
-    if ( *pc == '&' )
-      pc++; // skip it
+   // don't delete menu items, the menus take care of that
+}
 
-    m_text << *pc;
-  }
+// it's valid for this function to be called even if m_menuItem == NULL
+void wxMenuItem::SetName( const wxString& str )
+{
+    /* '\t' is the deliminator indicating a hot key */
+    m_text = wxT("");
+    const wxChar *pc = str;
+    for (; (*pc != wxT('\0')) && (*pc != wxT('\t')); pc++ )
+    {
+        if (*pc == wxT('&'))
+        {
+#if (GTK_MINOR_VERSION > 0)
+            m_text << wxT('_');
+        }
+        else if ( *pc == wxT('_') )    // escape underscores
+        {
+            m_text << wxT("__");
+        }
+        else if (*pc == wxT('/'))      /* we have to filter out slashes ... */
+        {
+            m_text << wxT('\\');  /* ... and replace them with back slashes */
+#endif
+        }
+        else
+           m_text << *pc;
+    }
+
+    /* only GTK 1.2 knows about hot keys */
+    m_hotKey = wxT("");
+#if (GTK_MINOR_VERSION > 0)
+    if(*pc == wxT('\t'))
+    {
+       pc++;
+       m_hotKey = pc;
+    }
+#endif
+
+    if (m_menuItem)
+    {
+        GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
+        gtk_label_set( label, m_text.mb_str());
+    }
 }
 
 void wxMenuItem::Check( bool check )
 {
-  wxCHECK_RET( IsCheckable(), "Can't check uncheckable item!" )
+    wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
 
-  m_isChecked = check;
-  gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
+    wxCHECK_RET( IsCheckable(), wxT("Can't check uncheckable item!") )
+
+    if (check == m_isChecked) return;
+
+    m_isChecked = check;
+    gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
 }
 
-void wxMenuItem::Enable( bool enable ) 
-{ 
-  gtk_widget_set_sensitive( m_menuItem, enable );
-  m_isEnabled = enable; 
+void wxMenuItem::Enable( bool enable )
+{
+    wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
+
+    gtk_widget_set_sensitive( m_menuItem, enable );
+    m_isEnabled = enable;
 }
 
 bool wxMenuItem::IsChecked() const
 {
-  wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
+    wxCHECK_MSG( m_menuItem, FALSE, wxT("invalid menu item") );
 
-  bool bIsChecked = ((GtkCheckMenuItem*)m_menuItem)->active != 0;
+    wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
 
-  wxASSERT( bIsChecked == m_isChecked ); // consistency check
+    bool bIsChecked = ((GtkCheckMenuItem*)m_menuItem)->active != 0;
 
-  return bIsChecked;
+    return bIsChecked;
 }
 
+//-----------------------------------------------------------------------------
+// wxMenu
+//-----------------------------------------------------------------------------
+
 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_menu = gtk_menu_new();  // Do not show!
-  m_callback = func;
-  m_eventHandler = this;
-  if (m_title.IsNull()) m_title = "";
-  if (m_title != "")
-  {
-    Append(-2, m_title);
-    AppendSeparator();
-  }
+    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
+    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 = wxT("");
+    if (m_title != wxT(""))
+    {
+        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()
+{
+    wxNode *node = m_items.First();
+    while (node)
+    {
+        wxMenuItem *item = (wxMenuItem*)node->Data();
+	wxMenu *submenu = item->GetSubMenu();
+	if (submenu)
+	   delete submenu;
+        node = node->Next();
+    }
+
+   gtk_widget_destroy( m_menu );
+   
+   gtk_object_unref( GTK_OBJECT(m_factory) );
 }
 
 void wxMenu::SetTitle( const wxString& title )
 {
-  // Waiting for something better.
-  m_title = title;
+    // TODO Waiting for something better
+    m_title = title;
 }
 
 const wxString wxMenu::GetTitle() const
 {
-  return m_title;
+    return m_title;
 }
 
 void wxMenu::AppendSeparator()
 {
-  wxMenuItem *mitem = new wxMenuItem();
-  mitem->SetId(ID_SEPARATOR);
+    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
 
-  GtkWidget *menuItem = gtk_menu_item_new();
-  gtk_menu_append( GTK_MENU(m_menu), menuItem );
-  gtk_widget_show( menuItem );
-  mitem->SetMenuItem(menuItem);
-  m_items.Append( mitem );
+    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 wxT('a'):   /* Alt */
+        case wxT('A'):
+        case wxT('m'):   /* Meta */
+        case wxT('M'):
+        {
+            strcpy( hotbuf, "<alt>" );
+            wxString last = hotkey.Right(1);
+            strcat( hotbuf, last.mb_str() );
+            return hotbuf;
+        }
+        case wxT('c'):    /* Ctrl */
+        case wxT('C'):
+        case wxT('s'):    /* Strg, yeah man, I'm German */
+        case wxT('S'):
+        {
+            strcpy( hotbuf, "<control>" );
+            wxString last = hotkey.Right(1);
+            strcat( hotbuf, last.mb_str() );
+            return hotbuf;
+        }
+        case wxT('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();
-  mitem->SetId(id);
-  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);
+    wxMenuItem *mitem = new wxMenuItem();
+    mitem->SetId(id);
+    mitem->SetText(item);
+    mitem->SetHelp(helpStr);
+    mitem->SetCheckable(checkable);
+
+#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 = wxT("<main>/");
+    for ( const wxChar *pc = text; *pc != wxT('\0'); pc++ )
+    {
+        while (*pc == wxT('_')) 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",
+                        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 );
 
-  gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
-                      GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
-                      (gpointer*)this );
+    mitem->SetMenuItem(menuItem);
 
-  gtk_menu_append( GTK_MENU(m_menu), menuItem );
-  gtk_widget_show( menuItem );
-  m_items.Append( mitem );
+    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);
+    wxMenuItem *mitem = new wxMenuItem();
+    mitem->SetId(id);
+    mitem->SetText(item);
+    mitem->SetHelp(helpStr);
 
-  GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText());
-  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() );
 
-  gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
-  gtk_menu_append( GTK_MENU(m_menu), menuItem );
-  gtk_widget_show( menuItem );
-  m_items.Append( mitem );
+    /* 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 = wxT("<main>/");
+    for ( const wxChar *pc = text; *pc != wxT('\0'); pc++ )
+    {
+        if (*pc == wxT('_')) 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),
+                        (gpointer*)this );
+
+    gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
+                        GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
+                        (gpointer*)this );
+
+    gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
+
+    mitem->SetMenuItem(menuItem);
+    mitem->SetSubMenu(subMenu);
+
+    m_items.Append( mitem );
 }
 
-int wxMenu::FindItem( const wxString itemString ) const
+void wxMenu::Append( wxMenuItem *item )
 {
-  wxString s( itemString );
-
-  int pos;
-  do {
-    pos = s.First( '&' );
-    if (pos != -1) s.Remove( pos, 1 );
-  } while (pos != -1);
+    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 );
+    item->SetMenuItem(menuItem);
+}
 
-  wxNode *node = m_items.First();
-  while (node)
-  {
-    wxMenuItem *item = (wxMenuItem*)node->Data();
-    if (item->GetText() == s)
-      return item->GetId();
-    node = node->Next();
-  }
+void wxMenu::Delete( int id )
+{
+    wxNode *node = m_items.First();
+    while (node)
+    {
+        wxMenuItem *item = (wxMenuItem*)node->Data();
+        if (item->GetId() == id)
+        {
+	    gtk_widget_destroy( item->GetMenuItem() );
+	    m_items.DeleteNode( node );
+            return;
+        }
+        node = node->Next();
+    }
+}
 
-  return -1;
+int wxMenu::FindItem( const wxString itemString ) const
+{
+    wxString s = wxT("");
+    for ( const wxChar *pc = itemString; *pc != wxT('\0'); pc++ )
+    {
+        if (*pc == wxT('&'))
+        {
+            pc++; /* skip it */
+#if (GTK_MINOR_VERSION > 0)
+            s << wxT('_');
+#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 wxNOT_FOUND;
 }
 
 void wxMenu::Enable( int id, bool enable )
 {
-  wxMenuItem *item = FindItem(id);
-  if ( item )
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_RET( item, wxT("wxMenu::Enable: no such item") );
+
     item->Enable(enable);
 }
 
 bool wxMenu::IsEnabled( int id ) const
 {
-  wxMenuItem *item = FindItem(id);
-  if ( item )
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsEnabled: no such item") );
+
     return item->IsEnabled();
-  else
-    return FALSE;
 }
 
 void wxMenu::Check( int id, bool enable )
 {
-  wxMenuItem *item = FindItem(id);
-  if ( item )
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_RET( item, wxT("wxMenu::Check: no such item") );
+
     item->Check(enable);
 }
 
 bool wxMenu::IsChecked( int id ) const
 {
-  wxMenuItem *item = FindItem(id);
-  if ( item )
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsChecked: no such item") );
+
     return item->IsChecked();
-  else
-    return FALSE;
 }
 
 void wxMenu::SetLabel( int id, const wxString &label )
 {
-  wxMenuItem *item = FindItem(id);
-  if (item)
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_RET( item, wxT("wxMenu::SetLabel: no such item") );
+
     item->SetText(label);
 }
 
 wxString wxMenu::GetLabel( int id ) const
 {
-  wxMenuItem *item = FindItem(id);
-  if (item) return item->GetText();
-  return "";
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_MSG( item, wxT(""), wxT("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 );
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_RET( item, wxT("wxMenu::SetHelpString: no such item") );
+
+    item->SetHelp( helpString );
 }
 
 wxString wxMenu::GetHelpString( int id ) const
 {
-  wxMenuItem *item = FindItem(id);
-  if (item) return item->GetHelp();
-  return "";
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetHelpString: no such item") );
+
+    return item->GetHelp();
 }
 
 int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
 {
-  wxNode *node = m_items.First();
-  while (node)
-  {
-    wxMenuItem *item = (wxMenuItem*)node->Data();
-    if (item->GetMenuItem() == menuItem)
-      return item->GetId();
-    node = node->Next();
-  }
-
-  return -1;
+    wxNode *node = m_items.First();
+    while (node)
+    {
+        wxMenuItem *item = (wxMenuItem*)node->Data();
+        if (item->GetMenuItem() == menuItem)
+           return item->GetId();
+        node = node->Next();
+    }
+
+    return wxNOT_FOUND;
 }
 
 wxMenuItem *wxMenu::FindItem(int id) const
 {
-  wxNode *node = m_items.First();
-  while (node) {
-    wxMenuItem *item = (wxMenuItem*)node->Data();
-    if ( item->GetId() == id )
-      return item;
-    node = node->Next();
-  }
-
-  wxLogDebug( "wxMenu::FindItem: item %d not found.", id);
-
-  return (wxMenuItem *) NULL;
+    wxNode *node = m_items.First();
+    while (node)
+    {
+        wxMenuItem *item = (wxMenuItem*)node->Data();
+        if (item->GetId() == id)
+        {
+            return item;
+        }
+        node = node->Next();
+    }
+
+    /* Not finding anything here can be correct
+     * when search the entire menu system for
+     * an entry -> no error message. */
+
+    return (wxMenuItem *) NULL;
 }
 
 void wxMenu::SetInvokingWindow( wxWindow *win )
 {
-  m_invokingWindow = win;
+    m_invokingWindow = win;
 }
 
 wxWindow *wxMenu::GetInvokingWindow()
 {
-  return m_invokingWindow;
+    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.
+void wxMenu::UpdateUI(wxEvtHandler* source)
+{
+  if (!source && GetInvokingWindow())
+    source = GetInvokingWindow()->GetEventHandler();
+  if (!source)
+    source = GetEventHandler();
+  if (!source)
+    source = this;
+
+  wxNode* node = GetItems().First();
+  while (node)
+  {
+    wxMenuItem* item = (wxMenuItem*) node->Data();
+    if ( !item->IsSeparator() )
+    {
+      wxWindowID id = item->GetId();
+      wxUpdateUIEvent event(id);
+      event.SetEventObject( source );
+
+      if (source->ProcessEvent(event))
+      {
+        if (event.GetSetText())
+          SetLabel(id, event.GetText());
+        if (event.GetSetChecked())
+          Check(id, event.GetChecked());
+        if (event.GetSetEnabled())
+          Enable(id, event.GetEnabled());
+      }
+
+      if (item->GetSubMenu())
+        item->GetSubMenu()->UpdateUI(source);
+    }
+    node = node->Next();
+  }
+}