let's not forget that \& has lower priority than == in C

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

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index d3ebf032d7694008b305eaf5ec52e88bef42940d..8827eb6e8b3d757c51323689806ca12bcdfca7c7 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -41,9 +41,9 @@ wxMenuBar::wxMenuBar( long style )
     m_invokingWindow = (wxWindow*) NULL;
 
     if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
     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;
     }
 
         return;
     }
 


@@ -80,9 +80,9 @@ wxMenuBar::wxMenuBar()
     m_invokingWindow = (wxWindow*) NULL;
 
     if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
     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;
     }
     
         return;
     }
     


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


@@ -202,22 +202,22 @@ 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('_');
+            str << wxT('_');

         }
         }

-        else if (*pc == T('/'))
+        else if (*pc == wxT('/'))

         {
         {

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

 #endif
         }
         else
         {
 #if __WXGTK12__
 #endif
         }
         else
         {
 #if __WXGTK12__

-            if ( *pc == T('_') )
+            if ( *pc == wxT('_') )

             {
                 // underscores must be doubled to prevent them from being
                 // interpreted as accelerator character prefix by GTK
             {
                 // underscores must be doubled to prevent them from being
                 // interpreted as accelerator character prefix by GTK


@@ -237,7 +237,7 @@ 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()+1];
     strcpy(cbuf, buf.mbc_str());
 
     char *cbuf = new char[buf.Length()+1];
     strcpy(cbuf, buf.mbc_str());


@@ -251,13 +251,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 */
 
     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) 
     {
        // 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('_'))
+       while (*pc == wxT('_'))

            pc++;
        tmp << *pc;
     }
            pc++;
        tmp << *pc;
     }


@@ -364,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);
 }


@@ -373,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();
 }


@@ -382,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);
 }


@@ -391,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();
 }


@@ -400,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();
 }


@@ -409,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 );
 }


@@ -418,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();
 


@@ -430,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();
 


@@ -441,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();
 


@@ -452,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 );
 }


@@ -461,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();
 }


@@ -483,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())
     {


@@ -584,26 +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('_');
+            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
 #endif
         }
         else


@@ -611,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;


@@ -629,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;
 


@@ -641,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;


@@ -649,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!
 


@@ -688,8 +693,8 @@ wxMenu::Init( const wxString& title,
     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();


@@ -717,9 +722,19 @@ wxMenu::Init( const wxString& title,
 
 wxMenu::~wxMenu()
 {
 
 wxMenu::~wxMenu()
 {

-   /* how do we delete an item-factory ? */
-   gtk_widget_destroy( m_menu );
+    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 )


@@ -767,27 +782,27 @@ static char* GetHotKey( const wxString &hotkey, char *hotbuf )
 
     switch (hotkey[0])
     {
 
     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;


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

     {
     {

-        while (*pc == T('_')) pc++; /* skip it */
+        while (*pc == wxT('_')) pc++; /* skip it */

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


@@ -893,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;
     }
 


@@ -964,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;


@@ -997,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);
 }


@@ -1006,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();
 }


@@ -1015,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);
 }


@@ -1024,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();
 }


@@ -1033,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);
 }


@@ -1042,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();
 }


@@ -1051,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 );
 }


@@ -1060,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();
 }