some fixes after global _T() => T() change

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

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index e1d680563e3e018ebd5246759ffa44695b94d34f..d3ebf032d7694008b305eaf5ec52e88bef42940d 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -38,12 +38,13 @@ wxMenuBar::wxMenuBar( long style )
     /* the parent window is known after wxFrame::SetMenu() */
     m_needParent = FALSE;
     m_style = style;
+    m_invokingWindow = (wxWindow*) NULL;
 
     if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
-        !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, _T("menubar") ))
+        !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, T("menubar") ))
     {
-        wxFAIL_MSG( _T("wxMenuBar creation failed") );
-       return;
+        wxFAIL_MSG( T("wxMenuBar creation failed") );
+        return;
     }
 
     m_menus.DeleteContents( TRUE );
@@ -76,12 +77,13 @@ wxMenuBar::wxMenuBar()
     /* the parent window is known after wxFrame::SetMenu() */
     m_needParent = FALSE;
     m_style = 0;
+    m_invokingWindow = (wxWindow*) NULL;
 
     if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
-        !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("menubar") ))
+        !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, T("menubar") ))
     {
-        wxFAIL_MSG( _T("wxMenuBar creation failed") );
-       return;
+        wxFAIL_MSG( T("wxMenuBar creation failed") );
+        return;
     }
     
     m_menus.DeleteContents( TRUE );
@@ -152,6 +154,7 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, 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())
@@ -172,6 +175,7 @@ void wxMenuBar::SetInvokingWindow( 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())
@@ -198,20 +202,31 @@ 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 != T('\0'); pc++ )
     {
-        if (*pc == _T('&'))
+        if (*pc == T('&'))
         {
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
-            str << _T('_');
-        } else
-        if (*pc == _T('/'))
+            str << T('_');
+        }
+        else if (*pc == T('/'))
         {
-            str << _T('\\');
+            str << T('\\');
 #endif
         }
         else
-           str << *pc;
+        {
+#if __WXGTK12__
+            if ( *pc == T('_') )
+            {
+                // 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 */
@@ -222,7 +237,7 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 
     /* local buffer in multibyte form */
     wxString buf;
-    buf << _T('/') << str.c_str();
+    buf << T('/') << str.c_str();
 
     char *cbuf = new char[buf.Length()+1];
     strcpy(cbuf, buf.mbc_str());
@@ -236,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 */
-    wxString tmp = _T("<main>/");
-    for ( pc = str; *pc != _T('\0'); pc++ )
+    wxString tmp = T("<main>/");
+    for ( pc = str; *pc != T('\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 == T('_'))
+           pc++;
        tmp << *pc;
     }
     menu->m_owner = gtk_item_factory_get_item( m_factory, tmp.mb_str() );
@@ -254,6 +273,11 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
     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 )
@@ -340,7 +364,7 @@ void wxMenuBar::Check( int id, bool check )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") );
+    wxCHECK_RET( item, T("wxMenuBar::Check: no such item") );
 
     item->Check(check);
 }
@@ -349,7 +373,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, T("wxMenuBar::IsChecked: no such item") );
 
     return item->IsChecked();
 }
@@ -358,7 +382,7 @@ void wxMenuBar::Enable( int id, bool enable )
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") );
+    wxCHECK_RET( item, T("wxMenuBar::Enable: no such item") );
 
     item->Enable(enable);
 }
@@ -367,7 +391,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, T("wxMenuBar::IsEnabled: no such item") );
 
     return item->IsEnabled();
 }
@@ -376,7 +400,7 @@ wxString wxMenuBar::GetLabel( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel: no such item") );
+    wxCHECK_MSG( item, T(""), T("wxMenuBar::GetLabel: no such item") );
 
     return item->GetText();
 }
@@ -385,7 +409,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, T("wxMenuBar::SetLabel: no such item") );
 
     item->SetText( label );
 }
@@ -394,7 +418,7 @@ void wxMenuBar::EnableTop( int pos, bool flag )
 {
     wxNode *node = m_menus.Nth( pos );
 
-    wxCHECK_RET( node, _T("menu not found") );
+    wxCHECK_RET( node, T("menu not found") );
 
     wxMenu* menu = (wxMenu*)node->Data();
 
@@ -406,7 +430,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, T("invalid"), T("menu not found") );
 
     wxMenu* menu = (wxMenu*)node->Data();
 
@@ -417,7 +441,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, T("menu not found") );
 
     wxMenu* menu = (wxMenu*)node->Data();
 
@@ -428,7 +452,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, T("wxMenuBar::SetHelpString: no such item") );
 
     item->SetHelp( helpString );
 }
@@ -437,7 +461,7 @@ wxString wxMenuBar::GetHelpString( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
 
-    wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString: no such item") );
+    wxCHECK_MSG( item, T(""), T("wxMenuBar::GetHelpString: no such item") );
 
     return item->GetHelp();
 }
@@ -459,7 +483,7 @@ 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, T("error in menu item callback") );
 
     if (item->IsCheckable())
     {
@@ -564,18 +588,22 @@ wxMenuItem::wxMenuItem()
 void wxMenuItem::SetName( const wxString& str )
 {
     /* '\t' is the deliminator indicating a hot key */
-    m_text = _T("");
+    m_text = T("");
     const wxChar *pc = str;
-    for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ )
+    for (; (*pc != T('\0')) && (*pc != T('\t')); pc++ )
     {
-        if (*pc == _T('&'))
+        if (*pc == T('&'))
         {
 #if (GTK_MINOR_VERSION > 0)
-            m_text << _T('_');
-        } else
-        if (*pc == _T('/'))      /* we have to filter out slashes ... */
+            m_text << T('_');
+        }
+        else if ( *pc == T('_') )    // escape underscores
+        {
+            m_text << T("__");
+        }
+        else if (*pc == T('/'))      /* we have to filter out slashes ... */
         {
-            m_text << _T('\\');  /* ... and replace them with back slashes */
+            m_text << T('\\');  /* ... and replace them with back slashes */
 #endif
         }
         else
@@ -583,9 +611,9 @@ void wxMenuItem::SetName( const wxString& str )
     }
 
     /* only GTK 1.2 knows about hot keys */
-    m_hotKey = _T("");
+    m_hotKey = T("");
 #if (GTK_MINOR_VERSION > 0)
-    if(*pc == _T('\t'))
+    if(*pc == T('\t'))
     {
        pc++;
        m_hotKey = pc;
@@ -601,9 +629,9 @@ void wxMenuItem::SetName( const wxString& str )
 
 void wxMenuItem::Check( bool check )
 {
-    wxCHECK_RET( m_menuItem, _T("invalid menu item") );
+    wxCHECK_RET( m_menuItem, T("invalid menu item") );
 
-    wxCHECK_RET( IsCheckable(), _T("Can't check uncheckable item!") )
+    wxCHECK_RET( IsCheckable(), T("Can't check uncheckable item!") )
 
     if (check == m_isChecked) return;
 
@@ -613,7 +641,7 @@ void wxMenuItem::Check( bool check )
 
 void wxMenuItem::Enable( bool enable )
 {
-    wxCHECK_RET( m_menuItem, _T("invalid menu item") );
+    wxCHECK_RET( m_menuItem, T("invalid menu item") );
 
     gtk_widget_set_sensitive( m_menuItem, enable );
     m_isEnabled = enable;
@@ -621,7 +649,7 @@ void wxMenuItem::Enable( bool enable )
 
 bool wxMenuItem::IsChecked() const
 {
-    wxCHECK_MSG( m_menuItem, FALSE, _T("invalid menu item") );
+    wxCHECK_MSG( m_menuItem, FALSE, T("invalid menu item") );
 
     wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
 
@@ -639,8 +667,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 void
 wxMenu::Init( const wxString& title,
               long style,
-             const wxFunction func
-             )
+              const wxFunction func
+            )
 {
     m_title = title;
     m_items.DeleteContents( TRUE );
@@ -660,8 +688,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 = T("");
+    if (m_title != T(""))
     {
         Append(-2, m_title);
         AppendSeparator();
@@ -739,27 +767,27 @@ static char* GetHotKey( const wxString &hotkey, char *hotbuf )
 
     switch (hotkey[0])
     {
-        case _T('a'):   /* Alt */
-        case _T('A'):
-        case _T('m'):   /* Meta */
-        case _T('M'):
+        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'):
+        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 */
+        case T('F'):   /* function keys */
         {
             strcpy( hotbuf, hotkey.mb_str() );
             return hotbuf;
@@ -804,10 +832,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 */
-    wxString s = _T("<main>/");
-    for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
+    wxString s = T("<main>/");
+    for ( const wxChar *pc = text; *pc != T('\0'); pc++ )
     {
-        if (*pc == _T('_')) pc++; /* skip it */
+        while (*pc == T('_')) pc++; /* skip it */
         s << *pc;
     }
 
@@ -865,10 +893,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 = T("<main>/");
+    for ( const wxChar *pc = text; *pc != T('\0'); pc++ )
     {
-        if (*pc == _T('_')) pc++; /* skip it */
+        if (*pc == T('_')) pc++; /* skip it */
         s << *pc;
     }
 
@@ -938,14 +966,14 @@ void wxMenu::Append( wxMenuItem *item )
 
 int wxMenu::FindItem( const wxString itemString ) const
 {
-    wxString s = _T("");
-    for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ )
+    wxString s = T("");
+    for ( const wxChar *pc = itemString; *pc != T('\0'); pc++ )
     {
-        if (*pc == _T('&'))
+        if (*pc == T('&'))
         {
             pc++; /* skip it */
 #if (GTK_MINOR_VERSION > 0)
-            s << _T('_');
+            s << T('_');
 #endif
         }
         s << *pc;
@@ -969,7 +997,7 @@ void wxMenu::Enable( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_RET( item, _T("wxMenu::Enable: no such item") );
+    wxCHECK_RET( item, T("wxMenu::Enable: no such item") );
 
     item->Enable(enable);
 }
@@ -978,7 +1006,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, T("wxMenu::IsEnabled: no such item") );
 
     return item->IsEnabled();
 }
@@ -987,7 +1015,7 @@ void wxMenu::Check( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_RET( item, _T("wxMenu::Check: no such item") );
+    wxCHECK_RET( item, T("wxMenu::Check: no such item") );
 
     item->Check(enable);
 }
@@ -996,7 +1024,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, T("wxMenu::IsChecked: no such item") );
 
     return item->IsChecked();
 }
@@ -1005,7 +1033,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, T("wxMenu::SetLabel: no such item") );
 
     item->SetText(label);
 }
@@ -1014,7 +1042,7 @@ wxString wxMenu::GetLabel( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, _T(""), _T("wxMenu::GetLabel: no such item") );
+    wxCHECK_MSG( item, T(""), T("wxMenu::GetLabel: no such item") );
 
     return item->GetText();
 }
@@ -1023,7 +1051,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, T("wxMenu::SetHelpString: no such item") );
 
     item->SetHelp( helpString );
 }
@@ -1032,7 +1060,7 @@ wxString wxMenu::GetHelpString( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, _T(""), _T("wxMenu::GetHelpString: no such item") );
+    wxCHECK_MSG( item, T(""), T("wxMenu::GetHelpString: no such item") );
 
     return item->GetHelp();
 }