Added size hints to dialog,

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

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 10656f39f4c671699a439a46fbc168cc3cb0f90c..8827eb6e8b3d757c51323689806ca12bcdfca7c7 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -38,8 +38,14 @@ wxMenuBar::wxMenuBar( long style )
     /* the parent window is known after wxFrame::SetMenu() */
     m_needParent = FALSE;
     m_style = style;
     /* the parent window is known after wxFrame::SetMenu() */
     m_needParent = FALSE;
     m_style = style;

+    m_invokingWindow = (wxWindow*) NULL;

 
 

-    PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, style, "menu" );
+    if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
+        !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") ))
+    {
+        wxFAIL_MSG( wxT("wxMenuBar creation failed") );
+        return;
+    }

 
     m_menus.DeleteContents( TRUE );
 
 
     m_menus.DeleteContents( TRUE );
 


@@ -71,9 +77,15 @@ 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;

+    m_invokingWindow = (wxWindow*) NULL;

 
 

-    PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
-
+    if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
+        !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, 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. */
     m_menus.DeleteContents( TRUE );
 
     /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */


@@ -92,7 +104,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 )


@@ -142,6 +154,7 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
 
 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;
     while (top_frame->GetParent())
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
     wxWindow *top_frame = win;
     while (top_frame->GetParent())


@@ -162,6 +175,7 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win )
 
 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;
     while (top_frame->GetParent())
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
     wxWindow *top_frame = win;
     while (top_frame->GetParent())


@@ -188,20 +202,31 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 
     /* 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 << wxT('_');
+        }
+        else if (*pc == wxT('/'))

         {
         {

-            str << _T('\\');
+            str << wxT('\\');

 #endif
         }
         else
 #endif
         }
         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 */
     }
 
     /* this doesn't have much effect right now */


@@ -212,9 +237,9 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 
     /* local buffer in multibyte form */
     wxString buf;
 
     /* local buffer in multibyte form */
     wxString buf;

-    buf << _T('/') << str.c_str();
+    buf << wxT('/') << str.c_str();

 
 

-    char *cbuf = new char[buf.Length()];
+    char *cbuf = new char[buf.Length()+1];

     strcpy(cbuf, buf.mbc_str());
 
     GtkItemFactoryEntry entry;
     strcpy(cbuf, buf.mbc_str());
 
     GtkItemFactoryEntry entry;


@@ -226,10 +251,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() );


@@ -244,6 +273,11 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
     gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner );
 
 #endif
     gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner );
 
 #endif

+
+    // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
+    // adding menu later on.
+    if (m_invokingWindow)
+        wxMenubarSetInvokingWindow( menu, m_invokingWindow );

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


@@ -330,7 +364,7 @@ void wxMenuBar::Check( int id, bool check )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
 {
     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);
 }
 
     item->Check(check);
 }


@@ -339,7 +373,7 @@ bool wxMenuBar::IsChecked( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
 {
     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();
 }
 
     return item->IsChecked();
 }


@@ -348,7 +382,7 @@ void wxMenuBar::Enable( int id, bool enable )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
 {
     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);
 }
 
     item->Enable(enable);
 }


@@ -357,7 +391,7 @@ bool wxMenuBar::IsEnabled( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
 {
     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();
 }
 
     return item->IsEnabled();
 }


@@ -366,7 +400,7 @@ wxString wxMenuBar::GetLabel( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
 {
     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();
 }
 
     return item->GetText();
 }


@@ -375,7 +409,7 @@ void wxMenuBar::SetLabel( int id, const wxString &label )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
 {
     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 );
 }
 
     item->SetText( label );
 }


@@ -384,7 +418,7 @@ void wxMenuBar::EnableTop( int pos, bool flag )
 {
     wxNode *node = m_menus.Nth( pos );
 
 {
     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();
 
 
     wxMenu* menu = (wxMenu*)node->Data();
 


@@ -396,7 +430,7 @@ wxString wxMenuBar::GetLabelTop( int pos ) const
 {
     wxNode *node = m_menus.Nth( pos );
 
 {
     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();
 
 
     wxMenu* menu = (wxMenu*)node->Data();
 


@@ -407,7 +441,7 @@ void wxMenuBar::SetLabelTop( int pos, const wxString& label )
 {
     wxNode *node = m_menus.Nth( pos );
 
 {
     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();
 
 
     wxMenu* menu = (wxMenu*)node->Data();
 


@@ -418,7 +452,7 @@ void wxMenuBar::SetHelpString( int id, const wxString& helpString )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
 {
     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 );
 }
 
     item->SetHelp( helpString );
 }


@@ -427,7 +461,7 @@ wxString wxMenuBar::GetHelpString( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
 {
     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();
 }
 
     return item->GetHelp();
 }


@@ -449,7 +483,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
         return;
 
     wxMenuItem* item = menu->FindItem( id );
         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->IsCheckable())
     {


@@ -550,22 +584,31 @@ wxMenuItem::wxMenuItem()
     m_menuItem = (GtkWidget *) NULL;
 }
 
     m_menuItem = (GtkWidget *) NULL;
 }
 

+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 )
 {
     /* '\t' is the deliminator indicating a hot key */
 // 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 = _T("");
+    m_text = wxT("");

     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 << wxT('_');
+        }
+        else if ( *pc == wxT('_') )    // escape underscores

         {
         {

-            m_text << _T('\\');  /* ... and replace them with back slashes */
+            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


@@ -573,9 +616,9 @@ void wxMenuItem::SetName( const wxString& str )
     }
 
     /* 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;
     {
        pc++;
        m_hotKey = pc;


@@ -591,9 +634,9 @@ void wxMenuItem::SetName( const wxString& str )
 
 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;
 


@@ -603,7 +646,7 @@ void wxMenuItem::Check( bool check )
 
 void wxMenuItem::Enable( bool enable )
 {
 
 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;
 
     gtk_widget_set_sensitive( m_menuItem, enable );
     m_isEnabled = enable;


@@ -611,7 +654,7 @@ void wxMenuItem::Enable( bool 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( IsCheckable(), FALSE ); // can't get state of uncheckable item!
 
 
     wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
 


@@ -628,11 +671,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 void
 wxMenu::Init( const wxString& title,
 
 void
 wxMenu::Init( const wxString& title,

-              long style
-#ifdef WXWIN_COMPATIBILITY
-              , const wxFunction func
-#endif
-              )
+              long style,
+              const wxFunction func
+            )

 {
     m_title = title;
     m_items.DeleteContents( TRUE );
 {
     m_title = title;
     m_items.DeleteContents( TRUE );


@@ -647,15 +688,13 @@ wxMenu::Init( const wxString& title,
     m_menu = gtk_menu_new();  // Do not show!
 #endif
 
     m_menu = gtk_menu_new();  // Do not show!
 #endif
 

-#ifdef WXWIN_COMPATIBILITY

     m_callback = func;
     m_callback = func;

-#endif

 
     m_eventHandler = this;
     m_clientData = (void*) NULL;
 
 
     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();
     {
         Append(-2, m_title);
         AppendSeparator();


@@ -683,7 +722,19 @@ wxMenu::Init( const wxString& title,
 
 wxMenu::~wxMenu()
 {
 
 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 )
 }
 
 void wxMenu::SetTitle( const wxString& title )


@@ -724,33 +775,34 @@ void wxMenu::AppendSeparator()
     m_items.Append( mitem );
 }
 
     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])
     {
 static char* GetHotKey( const wxString &hotkey, char *hotbuf )
 {
     if (hotkey.IsEmpty()) return (char*) NULL;
 
     switch (hotkey[0])
     {

-        case _T('a'):   /* Alt */
-        case _T('A'):
-        case _T('m'):   /* Meta */
-        case _T('M'):
+        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;
         }
         {
             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'):
+        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;
         }
         {
             strcpy( hotbuf, "<control>" );
             wxString last = hotkey.Right(1);
             strcat( hotbuf, last.mb_str() );
             return hotbuf;
         }

-        case _T('F'):   /* function keys */
+        case wxT('F'):   /* function keys */

         {
             strcpy( hotbuf, hotkey.mb_str() );
             return hotbuf;
         {
             strcpy( hotbuf, hotkey.mb_str() );
             return hotbuf;


@@ -761,6 +813,7 @@ static char* GetHotKey( const wxString &hotkey, char *hotbuf )
     }
     return (char*) NULL;
 }
     }
     return (char*) NULL;
 }

+#endif

 
 void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
 {
 
 void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
 {


@@ -794,10 +847,10 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
     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 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 */
+        while (*pc == wxT('_')) pc++; /* skip it */

         s << *pc;
     }
 
         s << *pc;
     }
 


@@ -855,10 +908,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 */
     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;
     }
 
         s << *pc;
     }
 


@@ -926,16 +979,32 @@ void wxMenu::Append( wxMenuItem *item )
     item->SetMenuItem(menuItem);
 }
 
     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
 {
 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)
         {
             pc++; /* skip it */
 #if (GTK_MINOR_VERSION > 0)

-            s << _T('_');
+            s << wxT('_');

 #endif
         }
         s << *pc;
 #endif
         }
         s << *pc;


@@ -959,7 +1028,7 @@ void wxMenu::Enable( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
 
 {
     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);
 }
 
     item->Enable(enable);
 }


@@ -968,7 +1037,7 @@ bool wxMenu::IsEnabled( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
 {
     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();
 }
 
     return item->IsEnabled();
 }


@@ -977,7 +1046,7 @@ void wxMenu::Check( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
 
 {
     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);
 }
 
     item->Check(enable);
 }


@@ -986,7 +1055,7 @@ bool wxMenu::IsChecked( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
 {
     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();
 }
 
     return item->IsChecked();
 }


@@ -995,7 +1064,7 @@ void wxMenu::SetLabel( int id, const wxString &label )
 {
     wxMenuItem *item = FindItem(id);
 
 {
     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);
 }
 
     item->SetText(label);
 }


@@ -1004,7 +1073,7 @@ wxString wxMenu::GetLabel( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
 {
     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();
 }
 
     return item->GetText();
 }


@@ -1013,7 +1082,7 @@ void wxMenu::SetHelpString( int id, const wxString& helpString )
 {
     wxMenuItem *item = FindItem(id);
 
 {
     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 );
 }
 
     item->SetHelp( helpString );
 }


@@ -1022,7 +1091,7 @@ wxString wxMenu::GetHelpString( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
 {
     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();
 }
 
     return item->GetHelp();
 }