VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 170ae14a9c9b7f803e7b570f41dd691f462c7c25..750593b5339ced30c42ec57504e8c4986248b9ca 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -12,10 +12,14 @@
 #pragma implementation "menuitem.h"
 #endif
 
 #pragma implementation "menuitem.h"
 #endif
 

-#include "wx/menu.h"

 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/app.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/app.h"

+#include "wx/menu.h"
+
+#if wxUSE_ACCEL
+    #include "wx/accel.h"
+#endif // wxUSE_ACCEL

 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"


@@ -27,6 +31,10 @@
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 

+#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL
+static wxString GetHotKey( const wxMenuItem& item );
+#endif
+

 //-----------------------------------------------------------------------------
 // wxMenuBar
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxMenuBar
 //-----------------------------------------------------------------------------


@@ -36,10 +44,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 wxMenuBar::wxMenuBar( long style )
 {
     /* the parent window is known after wxFrame::SetMenu() */
 wxMenuBar::wxMenuBar( long style )
 {
     /* the parent window is known after wxFrame::SetMenu() */

-    m_needParent = FALSE; 
+    m_needParent = FALSE;

     m_style = style;
     m_style = style;

-    
-    PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, style, "menu" );
+    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 );
 
 
     m_menus.DeleteContents( TRUE );
 


@@ -48,7 +62,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>" );
     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_menubar = gtk_menu_bar_new();
 #endif
 


@@ -71,8 +85,14 @@ wxMenuBar::wxMenuBar()
     /* the parent window is known after wxFrame::SetMenu() */
     m_needParent = FALSE;
     m_style = 0;
     /* the parent window is known after wxFrame::SetMenu() */
     m_needParent = FALSE;
     m_style = 0;

-    
-    PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
+    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 );
 
 
     m_menus.DeleteContents( TRUE );
 


@@ -81,7 +101,7 @@ 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>" );
     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_menubar = gtk_menu_bar_new();
 #endif
 


@@ -92,7 +112,7 @@ wxMenuBar::wxMenuBar()
 
 wxMenuBar::~wxMenuBar()
 {
 
 wxMenuBar::~wxMenuBar()
 {

-   // how to destroy a GtkItemFactory ?
+//    gtk_object_unref( GTK_OBJECT(m_factory) );  why not ?

 }
 
 static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
 }
 
 static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )


@@ -101,19 +121,20 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
 
 #if (GTK_MINOR_VERSION > 0)
     wxWindow *top_frame = win;
 
 #if (GTK_MINOR_VERSION > 0)
     wxWindow *top_frame = win;

-    while (top_frame->GetParent()) top_frame = top_frame->GetParent();
+    while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
+        top_frame = top_frame->GetParent();

 
     /* support for native hot keys  */
     gtk_accel_group_detach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
 #endif
 
 
     /* support for native hot keys  */
     gtk_accel_group_detach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
 #endif
 

-    wxNode *node = menu->GetItems().First();
+    wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+        wxMenuItem *menuitem = node->GetData();

         if (menuitem->IsSubMenu())
             wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win );
         if (menuitem->IsSubMenu())
             wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win );

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
     }
 }
 


@@ -123,99 +144,115 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
 
 #if (GTK_MINOR_VERSION > 0)
     wxWindow *top_frame = win;
 
 #if (GTK_MINOR_VERSION > 0)
     wxWindow *top_frame = win;

-    while (top_frame->GetParent())
-       top_frame = top_frame->GetParent();
+    while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
+        top_frame = top_frame->GetParent();

 
     /* support for native hot keys  */
     gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
 #endif
 
 
     /* support for native hot keys  */
     gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
 #endif
 

-    wxNode *node = menu->GetItems().First();
+    wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+        wxMenuItem *menuitem = node->GetData();

         if (menuitem->IsSubMenu())
             wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win );
         if (menuitem->IsSubMenu())
             wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win );

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
 void wxMenuBar::SetInvokingWindow( wxWindow *win )
 {
     }
 }
 
 void wxMenuBar::SetInvokingWindow( wxWindow *win )
 {

+    m_invokingWindow = win;

 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
     wxWindow *top_frame = win;
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
     wxWindow *top_frame = win;

-    while (top_frame->GetParent())
-       top_frame = top_frame->GetParent();
+    while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
+        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
 
 
     /* 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();
+    wxMenuList::Node *node = m_menus.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxMenu *menu = (wxMenu*)node->Data();
+        wxMenu *menu = node->GetData();

         wxMenubarSetInvokingWindow( menu, win );
         wxMenubarSetInvokingWindow( menu, win );

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
 void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 {
     }
 }
 
 void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 {

+    m_invokingWindow = (wxWindow*) NULL;

 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
     wxWindow *top_frame = win;
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
     wxWindow *top_frame = win;

-    while (top_frame->GetParent())
-       top_frame = top_frame->GetParent();
+    while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
+        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
 
 
     /* 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();
+    wxMenuList::Node *node = m_menus.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxMenu *menu = (wxMenu*)node->Data();
+        wxMenu *menu = node->GetData();

         wxMenubarUnsetInvokingWindow( menu, win );
         wxMenubarUnsetInvokingWindow( menu, win );

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
     }
 }
 

-void wxMenuBar::Append( wxMenu *menu, const wxString &title )
+bool wxMenuBar::Append( wxMenu *menu, const wxString &title )

 {
     m_menus.Append( menu );
 {
     m_menus.Append( menu );

-    
+

     const wxChar *pc;
     const wxChar *pc;

-    
+

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

-    for ( pc = title; *pc != _T('\0'); pc++ )
+    for ( pc = title; *pc != wxT('\0'); pc++ )

     {
     {

-        if (*pc == _T('&'))
-       {
+        if (*pc == wxT('&'))
+        {

 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)

-            str << _T('_');
-        } else 
-       if (*pc == _T('/'))
-       {
-            str << _T('\\');
+            str << wxT('_');
+        }
+        else if (*pc == wxT('/'))
+        {
+            str << wxT('\\');

 #endif
 #endif

-       }
+        }

         else
         else

-           str << *pc;
+        {
+#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 );
     }
 
     /* 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;
     /* 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 << '/' << str.mb_str();
-    char *cbuf = new char[buf.Length()];
+    buf << wxT('/') << str.c_str();
+
+    char *cbuf = new char[buf.Length()+1];
+    strcpy(cbuf, buf.mbc_str());
+

     GtkItemFactoryEntry entry;
     GtkItemFactoryEntry entry;

-    entry.path = buf.c_str();
+    entry.path = (gchar *)cbuf;  // const_cast

     entry.accelerator = (gchar*) NULL;
     entry.callback = (GtkItemFactoryCallback) NULL;
     entry.callback_action = 0;
     entry.accelerator = (gchar*) NULL;
     entry.callback = (GtkItemFactoryCallback) NULL;
     entry.callback_action = 0;


@@ -223,10 +260,14 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 
     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 */
 
     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
     /* in order to get the pointer to the item we need the item text _without_ underscores */

-    wxString tmp = _T("<main>/");
-    for ( pc = str; *pc != _T('\0'); pc++ )
+    wxString tmp = wxT("<main>/");
+    for ( pc = str; *pc != wxT('\0'); pc++ )

     {
     {

-       if (*pc == _T('_')) pc++; /* skip it */
+       // 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() );
        tmp << *pc;
     }
     menu->m_owner = gtk_item_factory_get_item( m_factory, tmp.mb_str() );


@@ -239,8 +280,45 @@ 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 );
     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
 #endif

+
+    // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
+    // adding menu later on.
+    if (m_invokingWindow)
+        wxMenubarSetInvokingWindow( menu, m_invokingWindow );
+
+    return TRUE;
+}
+
+bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
+{
+    if ( !wxMenuBarBase::Insert(pos, menu, title) )
+        return FALSE;
+
+    wxFAIL_MSG(wxT("TODO"));
+
+    return FALSE;
+}
+
+wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
+{
+    if ( !wxMenuBarBase::Replace(pos, menu, title) )
+        return FALSE;
+
+    wxFAIL_MSG(wxT("TODO"));
+
+    return NULL;
+}
+
+wxMenu *wxMenuBar::Remove(size_t pos)
+{
+    if ( !wxMenuBarBase::Remove(pos) )
+        return FALSE;
+
+    wxFAIL_MSG(wxT("TODO"));
+
+    return NULL;

 }
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
 }
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )


@@ -252,183 +330,106 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString
             return res;
     }
 
             return res;
     }
 

-    wxNode *node = ((wxMenu *)menu)->GetItems().First();    // const_cast
+    wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxMenuItem *item = (wxMenuItem*)node->Data();
+        wxMenuItem *item = node->GetData();

         if (item->IsSubMenu())
             return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
 
         if (item->IsSubMenu())
             return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
 

-        node = node->Next();
+        node = node->GetNext();

     }
 
     return wxNOT_FOUND;
 }
 
     }
 
     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
 {
 int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
 {

-    wxNode *node = m_menus.First();
+    wxMenuList::Node *node = m_menus.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxMenu *menu = (wxMenu*)node->Data();
+        wxMenu *menu = node->GetData();

         int res = FindMenuItemRecursive( menu, menuString, itemString);
         int res = FindMenuItemRecursive( menu, menuString, itemString);

-        if (res != -1) return res;
-        node = node->Next();
+        if (res != -1)
+            return res;
+        node = node->GetNext();

     }
     }

-    return -1;
+
+    return wxNOT_FOUND;

 }
 
 // Find a wxMenuItem using its id. Recurses down into sub-menus
 static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
 {
 }
 
 // Find a wxMenuItem using its id. Recurses down into sub-menus
 static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
 {

-    wxMenuItem* result = menu->FindItem(id);
+    wxMenuItem* result = menu->FindChildItem(id);

 
 

-    wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast
+    wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();

     while ( node && result == NULL )
     {
     while ( node && result == NULL )
     {

-        wxMenuItem *item = (wxMenuItem*)node->Data();
+        wxMenuItem *item = node->GetData();

         if (item->IsSubMenu())
         {
             result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
         }
         if (item->IsSubMenu())
         {
             result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
         }

-        node = node->Next();
+        node = node->GetNext();

     }
 
     return result;
 }
 
     }
 
     return result;
 }
 

-wxMenuItem* wxMenuBar::FindItem( int id ) const
+wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const

 {
     wxMenuItem* result = 0;
 {
     wxMenuItem* result = 0;

-    wxNode *node = m_menus.First();
+    wxMenuList::Node *node = m_menus.GetFirst();

     while (node && result == 0)
     {
     while (node && result == 0)
     {

-        wxMenu *menu = (wxMenu*)node->Data();
+        wxMenu *menu = node->GetData();

         result = FindMenuItemByIdRecursive( menu, id );
         result = FindMenuItemByIdRecursive( menu, id );

-        node = node->Next();
+        node = node->GetNext();

     }
 
     }
 

-    return result;
-}
-
-void wxMenuBar::Check( int id, bool check )
-{
-    wxMenuItem* item = FindMenuItemById( id );
-
-    wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") );
-
-    item->Check(check);
-}
-
-bool wxMenuBar::IsChecked( int id ) const
-{
-    wxMenuItem* item = FindMenuItemById( id );
-
-    wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked: no such item") );
-
-    return item->IsChecked();
-}
-
-void wxMenuBar::Enable( int id, bool enable )
-{
-    wxMenuItem* item = FindMenuItemById( id );
-
-    wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") );
-
-    item->Enable(enable);
-}
-
-bool wxMenuBar::IsEnabled( int id ) const
-{
-    wxMenuItem* item = FindMenuItemById( id );
-
-    wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled: no such item") );
-
-    return item->IsEnabled();
-}
-
-wxString wxMenuBar::GetLabel( int id ) const
-{
-    wxMenuItem* item = FindMenuItemById( id );
-
-    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 );
-
-    wxCHECK_RET( item, _T("wxMenuBar::SetLabel: no such item") );
+    if ( menuForItem )
+    {
+        *menuForItem = result ? result->GetMenu() : (wxMenu *)NULL;
+    }

 
 

-    item->SetText( label );
+    return result;

 }
 
 }
 

-void wxMenuBar::EnableTop( int pos, bool flag )
+void wxMenuBar::EnableTop( size_t pos, bool flag )

 {
 {

-    wxNode *node = m_menus.Nth( pos );
+    wxMenuList::Node *node = m_menus.Item( pos );

 
 

-    wxCHECK_RET( node, _T("menu not found") );
+    wxCHECK_RET( node, wxT("menu not found") );

 
 

-    wxMenu* menu = (wxMenu*)node->Data();
+    wxMenu* menu = node->GetData();

 
     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
+wxString wxMenuBar::GetLabelTop( size_t pos ) const

 {
 {

-    wxNode *node = m_menus.Nth( pos );
+    wxMenuList::Node *node = m_menus.Item( pos );

 
 

-    wxCHECK_MSG( node, _T("invalid"), _T("menu not found") );
+    wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") );

 
 

-    wxMenu* menu = (wxMenu*)node->Data();
+    wxMenu* menu = node->GetData();

 
     return menu->GetTitle();
 }
 
 
     return menu->GetTitle();
 }
 

-void wxMenuBar::SetLabelTop( int pos, const wxString& label )
+void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )

 {
 {

-    wxNode *node = m_menus.Nth( pos );
+    wxMenuList::Node *node = m_menus.Item( pos );

 
 

-    wxCHECK_RET( node, _T("menu not found") );
+    wxCHECK_RET( node, wxT("menu not found") );

 
 

-    wxMenu* menu = (wxMenu*)node->Data();
+    wxMenu* menu = node->GetData();

 
     menu->SetTitle( label );
 }
 
 
     menu->SetTitle( label );
 }
 

-void wxMenuBar::SetHelpString( int id, const wxString& helpString )
-{
-    wxMenuItem* item = FindMenuItemById( id );
-
-    wxCHECK_RET( item, _T("wxMenuBar::SetHelpString: no such item") );
-
-    item->SetHelp( helpString );
-}
-
-wxString wxMenuBar::GetHelpString( int id ) const
-{
-    wxMenuItem* item = FindMenuItemById( id );
-
-    wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString: no such item") );
-
-    return item->GetHelp();
-}
-

 //-----------------------------------------------------------------------------
 // "activate"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "activate"
 //-----------------------------------------------------------------------------


@@ -445,20 +446,22 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
     if (!menu->IsEnabled(id))
         return;
 
     if (!menu->IsEnabled(id))
         return;
 

-    wxMenuItem* item = menu->FindItem( id );
-    wxCHECK_RET( item, _T("error in menu item callback") );
+    wxMenuItem* item = menu->FindChildItem( id );
+    wxCHECK_RET( item, wxT("error in menu item callback") );

 
     if (item->IsCheckable())
     {
 
     if (item->IsCheckable())
     {

-        if (item->GetCheckedFlag() == item->IsChecked())
+        bool isReallyChecked = item->IsChecked();
+        if ( item->wxMenuItemBase::IsChecked() == isReallyChecked )

         {
             /* the menu item has been checked by calling wxMenuItem->Check() */
             return;
         }
         else
         {
         {
             /* 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 */
+            /* the user pressed on the menu item -> report and make consistent
+             * again */
+            item->wxMenuItemBase::Check(isReallyChecked);

         }
     }
 
         }
     }
 


@@ -466,11 +469,13 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
     event.SetEventObject( menu );
     event.SetInt(id );
 
     event.SetEventObject( menu );
     event.SetInt(id );
 

+#if wxUSE_MENU_CALLBACK

     if (menu->GetCallback())
     {
         (void) (*(menu->GetCallback())) (*menu, event);
         return;
     }
     if (menu->GetCallback())
     {
         (void) (*(menu->GetCallback())) (*menu, event);
         return;
     }

+#endif // wxUSE_MENU_CALLBACK

 
     if (menu->GetEventHandler()->ProcessEvent(event))
         return;
 
     if (menu->GetEventHandler()->ProcessEvent(event))
         return;


@@ -498,15 +503,6 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
     wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
     event.SetEventObject( 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;
 
     if (menu->GetEventHandler()->ProcessEvent(event))
         return;
 


@@ -544,86 +540,176 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
 // wxMenuItem
 //-----------------------------------------------------------------------------
 
 // wxMenuItem
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)

 
 

-wxMenuItem::wxMenuItem()
+wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
+                                int id,
+                                const wxString& name,
+                                const wxString& help,
+                                bool isCheckable,
+                                wxMenu *subMenu)

 {
 {

-    m_id = ID_SEPARATOR;
-    m_isCheckMenu = FALSE;
+    return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
+}
+
+wxMenuItem::wxMenuItem(wxMenu *parentMenu,
+                       int id,
+                       const wxString& text,
+                       const wxString& help,
+                       bool isCheckable,
+                       wxMenu *subMenu)
+{
+    m_id = id;
+    m_isCheckable = isCheckable;

     m_isChecked = FALSE;
     m_isEnabled = TRUE;
     m_isChecked = FALSE;
     m_isEnabled = TRUE;

-    m_subMenu = (wxMenu *) NULL;
+    m_subMenu = subMenu;
+    m_parentMenu = parentMenu;
+    m_help = help;
+

     m_menuItem = (GtkWidget *) NULL;
     m_menuItem = (GtkWidget *) NULL;

+
+    DoSetText(text);
+}
+
+wxMenuItem::~wxMenuItem()
+{
+   // don't delete menu items, the menus take care of that
+}
+
+// return the menu item text without any menu accels
+wxString wxMenuItem::GetLabel() const
+{
+    wxString label;
+#if (GTK_MINOR_VERSION > 0)
+    for ( const wxChar *pc = m_text.c_str(); *pc; pc++ )
+    {
+        if ( *pc == wxT('_') )
+        {
+            // this is the escape character for GTK+ - skip it
+            continue;
+        }
+
+        label += *pc;
+    }
+#else // GTK+ 1.0
+    label = m_text;
+#endif // GTK+ 1.2/1.0
+
+    return label;
+}
+
+void wxMenuItem::SetText( const wxString& str )
+{
+    DoSetText(str);
+
+    if (m_menuItem)
+    {
+        GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
+
+        /* set new text */
+        gtk_label_set( label, m_text.mb_str());
+
+        /* reparse key accel */
+        (void)gtk_label_parse_uline (GTK_LABEL(label), m_text.mb_str() );
+        gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );
+    }

 }
 
 // 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 )
+void wxMenuItem::DoSetText( const wxString& str )

 {
     /* '\t' is the deliminator indicating a hot key */
 {
     /* '\t' is the deliminator indicating a hot key */

-    m_text = _T("");
+    m_text.Empty();

     const wxChar *pc = str;
     const wxChar *pc = str;

-    for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ )
+    for (; (*pc != wxT('\0')) && (*pc != wxT('\t')); pc++ )

     {
     {

-        if (*pc == _T('&'))
-       {
+        if (*pc == wxT('&'))
+        {

 #if (GTK_MINOR_VERSION > 0)
 #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 */
+            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
 #endif
         }
         else

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

     }
     }

-    
+

     /* only GTK 1.2 knows about hot keys */
     /* only GTK 1.2 knows about hot keys */

-    m_hotKey = _T("");
+    m_hotKey = wxT("");

 #if (GTK_MINOR_VERSION > 0)
 #if (GTK_MINOR_VERSION > 0)

-    if(*pc == _T('\t'))
+    if(*pc == wxT('\t'))

     {
        pc++;
        m_hotKey = pc;
     }
 #endif
     {
        pc++;
        m_hotKey = pc;
     }
 #endif

+}

 
 

-    if (m_menuItem)
+#if wxUSE_ACCEL
+
+wxAcceleratorEntry *wxMenuItem::GetAccel() const
+{
+    if ( !GetHotKey() )

     {
     {

-        GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
-        gtk_label_set( label, m_text.mb_str());
+        // nothing
+        return (wxAcceleratorEntry *)NULL;

     }
     }

+
+    // as wxGetAccelFromString() looks for TAB, insert a dummy one here
+    wxString label;
+    label << wxT('\t') << GetHotKey();
+
+    return wxGetAccelFromString(label);

 }
 
 }
 

+#endif // wxUSE_ACCEL
+

 void wxMenuItem::Check( bool check )
 {
 void wxMenuItem::Check( bool check )
 {

-    wxCHECK_RET( m_menuItem, _T("invalid menu item") );
+    wxCHECK_RET( m_menuItem, wxT("invalid menu item") );

 
 

-    wxCHECK_RET( IsCheckable(), _T("Can't check uncheckable item!") )
+    wxCHECK_RET( IsCheckable(), wxT("Can't check uncheckable item!") )

 
 

-    if (check == m_isChecked) return;
+    if (check == m_isChecked)
+        return;

 
 

-    m_isChecked = check;
+    wxMenuItemBase::Check( check );

     gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
 }
 
 void wxMenuItem::Enable( bool enable )
 {
     gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
 }
 
 void wxMenuItem::Enable( bool enable )
 {

-    wxCHECK_RET( m_menuItem, _T("invalid menu item") );
+    wxCHECK_RET( m_menuItem, wxT("invalid menu item") );

 
     gtk_widget_set_sensitive( m_menuItem, enable );
 
     gtk_widget_set_sensitive( m_menuItem, enable );

-    m_isEnabled = enable;
+    wxMenuItemBase::Enable( enable );

 }
 
 bool wxMenuItem::IsChecked() const
 {
 }
 
 bool wxMenuItem::IsChecked() const
 {

-    wxCHECK_MSG( m_menuItem, FALSE, _T("invalid menu item") );
+    wxCHECK_MSG( m_menuItem, FALSE, wxT("invalid menu item") );
+
+    wxCHECK_MSG( IsCheckable(), FALSE,
+                 wxT("can't get state of uncheckable item!") );

 
 

-    wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
+    return ((GtkCheckMenuItem*)m_menuItem)->active != 0;
+}

 
 

-    bool bIsChecked = ((GtkCheckMenuItem*)m_menuItem)->active != 0;
+wxString wxMenuItem::GetFactoryPath() const
+{
+    /* in order to get the pointer to the item we need the item text _without_ underscores */
+    wxString path( wxT("<main>/") );
+    path += GetLabel();

 
 

-    return bIsChecked;
+    return path;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -632,43 +718,16 @@ bool wxMenuItem::IsChecked() const
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 

-wxMenu::wxMenu( const wxString& title, const wxFunction func, long style )
-{
-   Init(title, func, style);
-}
-
-wxMenu::wxMenu(long style)
-{
-   Init(wxEmptyString, (wxFunction) NULL, style);
-}
-
-void
-wxMenu::Init( const wxString& title, const wxFunction func, long style )
+void wxMenu::Init()

 {
 {

-    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>" );
 #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_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(""))
-    {
-        Append(-2, m_title);
-        AppendSeparator();
-    }
-

     m_owner = (GtkWidget*) NULL;
 
 #if (GTK_MINOR_VERSION > 0)
     m_owner = (GtkWidget*) NULL;
 
 #if (GTK_MINOR_VERSION > 0)


@@ -684,223 +743,150 @@ wxMenu::Init( const wxString& title, const wxFunction func, long style )
        entry.item_type = "<Tearoff>";
        entry.accelerator = (gchar*) NULL;
        gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
        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" );
+       //GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/tearoff" );

     }
 #endif
     }
 #endif

-}

 
 

-wxMenu::~wxMenu()
-{
-    /* how do we delete an item-factory ? */
+    // append the title as the very first entry if we have it
+    if ( !!m_title )
+    {
+        Append(-2, m_title);
+        AppendSeparator();
+    }

 }
 
 }
 

-void wxMenu::SetTitle( const wxString& title )
+wxMenu::~wxMenu()

 {
 {

-    // TODO Waiting for something better
-    m_title = title;
-}
+   m_items.Clear();
+ 
+   gtk_widget_destroy( m_menu );

 
 

-const wxString wxMenu::GetTitle() const
-{
-    return m_title;
+   gtk_object_unref( GTK_OBJECT(m_factory) );

 }
 
 }
 

-void wxMenu::AppendSeparator()
+bool wxMenu::DoAppend(wxMenuItem *mitem)

 {
 {

-    wxMenuItem *mitem = new wxMenuItem();
-    mitem->SetId(ID_SEPARATOR);
+    GtkWidget *menuItem;

 
 

-#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])
+    if ( mitem->IsSeparator() )

     {
     {

-        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:
-       {
-       }
+#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? */
+        menuItem = gtk_item_factory_get_widget( m_factory, "<main>/sep" );
+#else // GTK+ 1.0
+        menuItem = gtk_menu_item_new();
+#endif // GTK 1.2/1.0

     }
     }

-    return (char*) NULL;
-}
-
-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);
-    
+    else if ( mitem->IsSubMenu() )
+    {

 #if (GTK_MINOR_VERSION > 0)
 #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++ )
+        /* 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>";
+        entry.accelerator = (gchar*) NULL;
+
+        gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
+
+        wxString path( mitem->GetFactoryPath() );
+        menuItem = gtk_item_factory_get_item( m_factory, path.mb_str() );
+#else // GTK+ 1.0
+        menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str());
+#endif // GTK 1.2/1.0
+
+        gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
+    }
+    else // a normal item

     {
     {

-        if (*pc == _T('_')) pc++; /* skip it */
-        s << *pc;
+#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 ( mitem->IsCheckable() )
+            entry.item_type = "<CheckItem>";
+        else
+            entry.item_type = "<Item>";
+        entry.accelerator = (gchar*) NULL;
+
+#if wxUSE_ACCEL
+        // due to an apparent bug in GTK+, we have to use a static buffer here -
+        // otherwise GTK+ 1.2.2 manages to override the memory we pass to it
+        // somehow! (VZ)
+        static char s_accel[32]; // must be big enough for <control><alt><shift>F12
+        strncpy(s_accel, GetHotKey(*mitem).mb_str(), WXSIZEOF(s_accel));
+        entry.accelerator = s_accel;
+#else // !wxUSE_ACCEL
+        entry.accelerator = (char*) NULL;
+#endif // wxUSE_ACCEL/!wxUSE_ACCEL
+
+        gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
+
+        wxString path( mitem->GetFactoryPath() );
+        menuItem = gtk_item_factory_get_widget( m_factory, path.mb_str() );
+#else // GTK+ 1.0
+        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 );
+#endif // GTK+ 1.2/1.0

     }
     }

-    
-    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 );
-
-    mitem->SetMenuItem(menuItem);
-
-    m_items.Append( mitem );
-}
-
-void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr )
-{
-    wxMenuItem *mitem = new wxMenuItem();
-    mitem->SetId(id);
-    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 ( !mitem->IsSeparator() )

     {
     {

-        if (*pc == _T('_')) pc++; /* skip it */
-        s << *pc;
+        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 );

     }
     }

-    
-    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());
-    
+#if GTK_MINOR_VERSION == 0

     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
     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 );
+#endif // GTK+ 1.0

 
 

-    gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
-    

     mitem->SetMenuItem(menuItem);
     mitem->SetMenuItem(menuItem);

-    mitem->SetSubMenu(subMenu);

 
 

-    m_items.Append( mitem );
+    return wxMenuBase::DoAppend(mitem);

 }
 
 }
 

+// VZ: this seems to be GTK+ 1.0 only code, I don't understand why there were
+//     both specialized versions of Append() and this one before my changes,
+//     but it seems that the others are better...
+#if 0

 void wxMenu::Append( wxMenuItem *item )
 {
 void wxMenu::Append( wxMenuItem *item )
 {

-    m_items.Append( item );
-

     GtkWidget *menuItem = (GtkWidget*) NULL;
 
     if (item->IsSeparator())
     GtkWidget *menuItem = (GtkWidget*) NULL;
 
     if (item->IsSeparator())


@@ -931,108 +917,31 @@ void wxMenu::Append( wxMenuItem *item )
 
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
 
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );

-    item->SetMenuItem(menuItem);
-}
-
-int wxMenu::FindItem( const wxString itemString ) const
-{
-    wxString s = _T("");
-    for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ )
-    {
-        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 wxNOT_FOUND;
-}
-
-void wxMenu::Enable( int id, bool enable )
-{
-    wxMenuItem *item = FindItem(id);
-
-    wxCHECK_RET( item, _T("wxMenu::Enable: no such item") );
-
-    item->Enable(enable);
-}
-
-bool wxMenu::IsEnabled( int id ) const
-{
-    wxMenuItem *item = FindItem(id);
-
-    wxCHECK_MSG( item, FALSE, _T("wxMenu::IsEnabled: no such item") );
-
-    return item->IsEnabled();
-}

 
 

-void wxMenu::Check( int id, bool enable )
-{
-    wxMenuItem *item = FindItem(id);
-
-    wxCHECK_RET( item, _T("wxMenu::Check: no such item") );
-
-    item->Check(enable);
-}
-
-bool wxMenu::IsChecked( int id ) const
-{
-    wxMenuItem *item = FindItem(id);
-
-    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);
-
-    wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") );
-
-    item->SetText(label);
-}
-
-wxString wxMenu::GetLabel( int id ) const
-{
-    wxMenuItem *item = FindItem(id);
-
-    wxCHECK_MSG( item, _T(""), _T("wxMenu::GetLabel: no such item") );
-
-    return item->GetText();
+    item->SetMenuItem(menuItem);

 }
 }

+#endif // 0

 
 

-void wxMenu::SetHelpString( int id, const wxString& helpString )
+bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)

 {
 {

-    wxMenuItem *item = FindItem(id);
+    if ( !wxMenuBase::DoInsert(pos, item) )
+        return FALSE;

 
 

-    wxCHECK_RET( item, _T("wxMenu::SetHelpString: no such item") );
+    wxFAIL_MSG(wxT("not implemented"));

 
 

-    item->SetHelp( helpString );
+    return FALSE;

 }
 
 }
 

-wxString wxMenu::GetHelpString( int id ) const
+wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)

 {
 {

-    wxMenuItem *item = FindItem(id);
+    if ( !wxMenuBase::DoRemove(item) )
+        return (wxMenuItem *)NULL;

 
 

-    wxCHECK_MSG( item, _T(""), _T("wxMenu::GetHelpString: no such item") );
+    // TODO: this code doesn't delete the item factory item and this seems
+    //       impossible as of GTK 1.2.6.
+    gtk_widget_destroy( item->GetMenuItem() );

 
 

-    return item->GetHelp();
+    return item;

 }
 
 int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
 }
 
 int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const


@@ -1049,72 +958,62 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

-wxMenuItem *wxMenu::FindItem(int id) const
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
+
+#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL
+static wxString GetHotKey( const wxMenuItem& item )

 {
 {

-    wxNode *node = m_items.First();
-    while (node)
+    wxString hotkey;
+
+    wxAcceleratorEntry *accel = item.GetAccel();
+    if ( accel )

     {
     {

-        wxMenuItem *item = (wxMenuItem*)node->Data();
-        if (item->GetId() == id)
+        int flags = accel->GetFlags();
+        if ( flags & wxACCEL_ALT )
+            hotkey += wxT("<alt>");
+        if ( flags & wxACCEL_CTRL )
+            hotkey += wxT("<control>");
+        if ( flags & wxACCEL_SHIFT )
+            hotkey += wxT("<shift>");
+
+        int code = accel->GetKeyCode();
+        switch ( code )

         {
         {

-            return item;
+            case WXK_F1:
+            case WXK_F2:
+            case WXK_F3:
+            case WXK_F4:
+            case WXK_F5:
+            case WXK_F6:
+            case WXK_F7:
+            case WXK_F8:
+            case WXK_F9:
+            case WXK_F10:
+            case WXK_F11:
+            case WXK_F12:
+                hotkey << wxT('F') << code - WXK_F1 + 1;
+                break;
+
+                // if there are any other keys wxGetAccelFromString() may return,
+                // we should process them here
+
+            default:
+                if ( wxIsalnum(code) )
+                {
+                    hotkey << (wxChar)code;
+
+                    break;
+                }
+
+                wxFAIL_MSG( wxT("unknown keyboard accel") );

         }
         }

-        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;
-}
-
-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.
-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);
+        delete accel;

     }
     }

-    node = node->Next();
-  }
+
+    return hotkey;

 }
 }

+#endif // wxUSE_ACCEL