X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/572d746108ab763e593e2f49f256da63d5928228..505928852c16c8ec68c8c3657fc0b8210c782261:/src/gtk/menu.cpp?ds=inline

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 3520e227ec..bc156417a7 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -17,6 +17,10 @@
 #include "wx/intl.h"
 #include "wx/app.h"
 
+#if wxUSE_ACCEL
+    #include "wx/accel.h"
+#endif // wxUSE_ACCEL
+
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
@@ -41,9 +45,9 @@ wxMenuBar::wxMenuBar( long style )
     m_invokingWindow = (wxWindow*) NULL;
 
     if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
-        !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, _T("menubar") ))
+        !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") ))
     {
-        wxFAIL_MSG( _T("wxMenuBar creation failed") );
+        wxFAIL_MSG( wxT("wxMenuBar creation failed") );
         return;
     }
 
@@ -80,12 +84,12 @@ wxMenuBar::wxMenuBar()
     m_invokingWindow = (wxWindow*) NULL;
 
     if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
-        !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("menubar") ))
+        !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("menubar") ))
     {
-        wxFAIL_MSG( _T("wxMenuBar creation failed") );
+        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. */
@@ -104,7 +108,7 @@ 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 )
@@ -113,7 +117,8 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *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->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) );
@@ -135,8 +140,8 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *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->GetParent()->m_isFrame))
+        top_frame = top_frame->GetParent();
 
     /* support for native hot keys  */
     gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
@@ -157,8 +162,8 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win )
     m_invokingWindow = win;
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
     wxWindow *top_frame = win;
-    while (top_frame->GetParent())
-       top_frame = top_frame->GetParent();
+    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) );
@@ -178,8 +183,8 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
     m_invokingWindow = (wxWindow*) NULL;
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
     wxWindow *top_frame = win;
-    while (top_frame->GetParent())
-       top_frame = top_frame->GetParent();
+    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) );
@@ -202,26 +207,28 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 
     /* 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)
-            str << _T('_');
+            str << wxT('_');
         }
-        else if (*pc == _T('/'))
+        else if (*pc == wxT('/'))
         {
-            str << _T('\\');
+            str << wxT('\\');
 #endif
         }
         else
         {
-            if ( *pc == _T('_') )
+#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;
         }
@@ -235,7 +242,7 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 
     /* local buffer in multibyte form */
     wxString buf;
-    buf << _T('/') << str.c_str();
+    buf << wxT('/') << str.c_str();
 
     char *cbuf = new char[buf.Length()+1];
     strcpy(cbuf, buf.mbc_str());
@@ -249,13 +256,13 @@ 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 */
-    wxString tmp = _T("<main>/");
-    for ( pc = str; *pc != _T('\0'); pc++ )
+    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 == _T('_'))
+       // might naively think). IMHO it's a bug in GTK+ (VZ)
+       while (*pc == wxT('_'))
            pc++;
        tmp << *pc;
     }
@@ -362,7 +369,7 @@ void wxMenuBar::Check( int id, bool check )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") );
+    wxCHECK_RET( item, wxT("wxMenuBar::Check: no such item") );
 
     item->Check(check);
 }
@@ -371,7 +378,7 @@ bool wxMenuBar::IsChecked( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked: no such item") );
+    wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsChecked: no such item") );
 
     return item->IsChecked();
 }
@@ -380,7 +387,7 @@ void wxMenuBar::Enable( int id, bool enable )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") );
+    wxCHECK_RET( item, wxT("wxMenuBar::Enable: no such item") );
 
     item->Enable(enable);
 }
@@ -389,7 +396,7 @@ bool wxMenuBar::IsEnabled( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled: no such item") );
+    wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsEnabled: no such item") );
 
     return item->IsEnabled();
 }
@@ -398,7 +405,7 @@ wxString wxMenuBar::GetLabel( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel: no such item") );
+    wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetLabel: no such item") );
 
     return item->GetText();
 }
@@ -407,7 +414,7 @@ void wxMenuBar::SetLabel( int id, const wxString &label )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_RET( item, _T("wxMenuBar::SetLabel: no such item") );
+    wxCHECK_RET( item, wxT("wxMenuBar::SetLabel: no such item") );
 
     item->SetText( label );
 }
@@ -416,7 +423,7 @@ void wxMenuBar::EnableTop( int pos, bool flag )
 {
     wxNode *node = m_menus.Nth( pos );
 
-    wxCHECK_RET( node, _T("menu not found") );
+    wxCHECK_RET( node, wxT("menu not found") );
 
     wxMenu* menu = (wxMenu*)node->Data();
 
@@ -428,7 +435,7 @@ wxString wxMenuBar::GetLabelTop( int pos ) const
 {
     wxNode *node = m_menus.Nth( pos );
 
-    wxCHECK_MSG( node, _T("invalid"), _T("menu not found") );
+    wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") );
 
     wxMenu* menu = (wxMenu*)node->Data();
 
@@ -439,7 +446,7 @@ void wxMenuBar::SetLabelTop( int pos, const wxString& label )
 {
     wxNode *node = m_menus.Nth( pos );
 
-    wxCHECK_RET( node, _T("menu not found") );
+    wxCHECK_RET( node, wxT("menu not found") );
 
     wxMenu* menu = (wxMenu*)node->Data();
 
@@ -450,7 +457,7 @@ void wxMenuBar::SetHelpString( int id, const wxString& helpString )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_RET( item, _T("wxMenuBar::SetHelpString: no such item") );
+    wxCHECK_RET( item, wxT("wxMenuBar::SetHelpString: no such item") );
 
     item->SetHelp( helpString );
 }
@@ -459,7 +466,7 @@ wxString wxMenuBar::GetHelpString( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString: no such item") );
+    wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetHelpString: no such item") );
 
     return item->GetHelp();
 }
@@ -481,19 +488,21 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
         return;
 
     wxMenuItem* item = menu->FindItem( id );
-    wxCHECK_RET( item, _T("error in menu item callback") );
+    wxCHECK_RET( item, wxT("error in menu item callback") );
 
     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 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);
         }
     }
 
@@ -570,38 +579,64 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
 // wxMenuItem
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)
+
+wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
+                                int id,
+                                const wxString& name,
+                                const wxString& help,
+                                bool isCheckable,
+                                wxMenu *subMenu)
+{
+    return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
+}
 
-wxMenuItem::wxMenuItem()
+wxMenuItem::wxMenuItem(wxMenu *parentMenu,
+                       int id,
+                       const wxString& text,
+                       const wxString& help,
+                       bool isCheckable,
+                       wxMenu *subMenu)
 {
-    m_id = ID_SEPARATOR;
-    m_isCheckMenu = FALSE;
+    m_id = id;
+    m_isCheckable = isCheckable;
     m_isChecked = FALSE;
     m_isEnabled = TRUE;
-    m_subMenu = (wxMenu *) NULL;
+    m_subMenu = subMenu;
+    m_parentMenu = parentMenu;
+    m_help = help;
+
     m_menuItem = (GtkWidget *) NULL;
+
+    // call it after initializing m_menuItem to NULL
+    DoSetText(text);
+}
+
+wxMenuItem::~wxMenuItem()
+{
+   // don't delete menu items, the menus take care of that
 }
 
 // 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 */
-    m_text = _T("");
+    m_text.Empty();
     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)
-            m_text << _T('_');
+            m_text << wxT('_');
         }
-        else if ( *pc == _T('_') )    // escape underscores
+        else if ( *pc == wxT('_') )    // escape underscores
         {
-            m_text << _T("__");
+            m_text << wxT("__");
         }
-        else if (*pc == _T('/'))      /* we have to filter out slashes ... */
+        else if (*pc == wxT('/'))      /* we have to filter out slashes ... */
         {
-            m_text << _T('\\');  /* ... and replace them with back slashes */
+            m_text << wxT('\\');  /* ... and replace them with back slashes */
 #endif
         }
         else
@@ -609,9 +644,9 @@ void wxMenuItem::SetName( const wxString& str )
     }
 
     /* only GTK 1.2 knows about hot keys */
-    m_hotKey = _T("");
+    m_hotKey = wxT("");
 #if (GTK_MINOR_VERSION > 0)
-    if(*pc == _T('\t'))
+    if(*pc == wxT('\t'))
     {
        pc++;
        m_hotKey = pc;
@@ -627,33 +662,33 @@ void wxMenuItem::SetName( const wxString& str )
 
 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 )
 {
-    wxCHECK_RET( m_menuItem, _T("invalid menu item") );
+    wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
 
     gtk_widget_set_sensitive( m_menuItem, enable );
-    m_isEnabled = enable;
+    wxMenuItemBase::Enable( enable );
 }
 
 bool wxMenuItem::IsChecked() const
 {
-    wxCHECK_MSG( m_menuItem, FALSE, _T("invalid menu item") );
-
-    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_MSG( IsCheckable(), FALSE,
+                 wxT("can't get state of uncheckable item!") );
 
-    return bIsChecked;
+    return ((GtkCheckMenuItem*)m_menuItem)->active != 0;
 }
 
 //-----------------------------------------------------------------------------
@@ -686,8 +721,8 @@ wxMenu::Init( const wxString& title,
     m_eventHandler = this;
     m_clientData = (void*) NULL;
 
-    if (m_title.IsNull()) m_title = _T("");
-    if (m_title != _T(""))
+    if (m_title.IsNull()) m_title = wxT("");
+    if (m_title != wxT(""))
     {
         Append(-2, m_title);
         AppendSeparator();
@@ -715,9 +750,19 @@ wxMenu::Init( const wxString& title,
 
 wxMenu::~wxMenu()
 {
-   /* how do we delete an item-factory ? */
+    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 )
@@ -733,8 +778,7 @@ const wxString wxMenu::GetTitle() const
 
 void wxMenu::AppendSeparator()
 {
-    wxMenuItem *mitem = new wxMenuItem();
-    mitem->SetId(ID_SEPARATOR);
+    wxMenuItem *mitem = new wxMenuItem(this, wxID_SEPARATOR);
 
 #if (GTK_MINOR_VERSION > 0)
     GtkItemFactoryEntry entry;
@@ -758,53 +802,72 @@ void wxMenu::AppendSeparator()
     m_items.Append( mitem );
 }
 
-#if (GTK_MINOR_VERSION > 0)
-static char* GetHotKey( const wxString &hotkey, char *hotbuf )
+#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL
+static wxString GetHotKey( const wxMenuItem& item )
 {
-    if (hotkey.IsEmpty()) return (char*) NULL;
+    wxString hotkey;
+
+    // as wxGetAccelFromString() looks for TAB, insert a dummy one here
+    wxString label;
+    label << wxT('\t') << item.GetHotKey();
 
-    switch (hotkey[0])
+    // but if the hotkey is empty don't do anything
+    if ( label.length() > 1 )
     {
-        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:
+        wxAcceleratorEntry *accel = wxGetAccelFromString(label);
+        if ( accel )
         {
+            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 )
+            {
+                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") );
+            }
+
+            delete accel;
         }
     }
-    return (char*) NULL;
+
+    return hotkey;
 }
-#endif
+#endif // wxUSE_ACCEL
 
 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);
+    wxMenuItem *mitem = new wxMenuItem(this, id, item, helpStr, checkable);
 
 #if (GTK_MINOR_VERSION > 0)
     /* text has "_" instead of "&" after mitem->SetText() */
@@ -824,16 +887,24 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
     else
         entry.item_type = "<Item>";
 
-    char hotbuf[50];
-    entry.accelerator = GetHotKey( mitem->GetHotKey(), hotbuf );
+#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
+    entry.accelerator = NULL;
+#endif
 
     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
 
     /* in order to get the pointer to the item we need the item text _without_ underscores */
-    wxString s = _T("<main>/");
-    for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
+    wxString s = wxT("<main>/");
+    for ( const wxChar *pc = text; *pc != wxT('\0'); pc++ )
     {
-        while (*pc == _T('_')) pc++; /* skip it */
+        while (*pc == wxT('_')) pc++; /* skip it */
         s << *pc;
     }
 
@@ -868,10 +939,7 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
 
 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);
+    wxMenuItem *mitem = new wxMenuItem(this, id, item, helpStr, FALSE, subMenu);
 
 #if (GTK_MINOR_VERSION > 0)
     /* text has "_" instead of "&" after mitem->SetText() */
@@ -891,10 +959,10 @@ void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxStri
     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
 
     /* in order to get the pointer to the item we need the item text _without_ underscores */
-    wxString s = _T("<main>/");
-    for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
+    wxString s = wxT("<main>/");
+    for ( const wxChar *pc = text; *pc != wxT('\0'); pc++ )
     {
-        if (*pc == _T('_')) pc++; /* skip it */
+        if (*pc == wxT('_')) pc++; /* skip it */
         s << *pc;
     }
 
@@ -920,7 +988,6 @@ void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxStri
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
 
     mitem->SetMenuItem(menuItem);
-    mitem->SetSubMenu(subMenu);
 
     m_items.Append( mitem );
 }
@@ -962,16 +1029,32 @@ void wxMenu::Append( wxMenuItem *item )
     item->SetMenuItem(menuItem);
 }
 
+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();
+    }
+}
+
 int wxMenu::FindItem( const wxString itemString ) const
 {
-    wxString s = _T("");
-    for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ )
+    wxString s = wxT("");
+    for ( const wxChar *pc = itemString; *pc != wxT('\0'); pc++ )
     {
-        if (*pc == _T('&'))
+        if (*pc == wxT('&'))
         {
             pc++; /* skip it */
 #if (GTK_MINOR_VERSION > 0)
-            s << _T('_');
+            s << wxT('_');
 #endif
         }
         s << *pc;
@@ -995,7 +1078,7 @@ void wxMenu::Enable( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_RET( item, _T("wxMenu::Enable: no such item") );
+    wxCHECK_RET( item, wxT("wxMenu::Enable: no such item") );
 
     item->Enable(enable);
 }
@@ -1004,7 +1087,7 @@ bool wxMenu::IsEnabled( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, FALSE, _T("wxMenu::IsEnabled: no such item") );
+    wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsEnabled: no such item") );
 
     return item->IsEnabled();
 }
@@ -1013,7 +1096,7 @@ void wxMenu::Check( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_RET( item, _T("wxMenu::Check: no such item") );
+    wxCHECK_RET( item, wxT("wxMenu::Check: no such item") );
 
     item->Check(enable);
 }
@@ -1022,7 +1105,7 @@ bool wxMenu::IsChecked( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, FALSE, _T("wxMenu::IsChecked: no such item") );
+    wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsChecked: no such item") );
 
     return item->IsChecked();
 }
@@ -1031,7 +1114,7 @@ void wxMenu::SetLabel( int id, const wxString &label )
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") );
+    wxCHECK_RET( item, wxT("wxMenu::SetLabel: no such item") );
 
     item->SetText(label);
 }
@@ -1040,7 +1123,7 @@ wxString wxMenu::GetLabel( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, _T(""), _T("wxMenu::GetLabel: no such item") );
+    wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetLabel: no such item") );
 
     return item->GetText();
 }
@@ -1049,7 +1132,7 @@ void wxMenu::SetHelpString( int id, const wxString& helpString )
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_RET( item, _T("wxMenu::SetHelpString: no such item") );
+    wxCHECK_RET( item, wxT("wxMenu::SetHelpString: no such item") );
 
     item->SetHelp( helpString );
 }
@@ -1058,7 +1141,7 @@ wxString wxMenu::GetHelpString( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, _T(""), _T("wxMenu::GetHelpString: no such item") );
+    wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetHelpString: no such item") );
 
     return item->GetHelp();
 }