Moved flicker-removal to GTK+ code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/cmdproc.cpp b/src/common/cmdproc.cpp
index 4326cda8093744de433fed184961a292363e27ba..79456425653bcf8b2d2c7302fabceebaa8df0c98 100644 (file)
--- a/src/common/cmdproc.cpp
+++ b/src/common/cmdproc.cpp
@@ -220,17 +220,9 @@ void wxCommandProcessor::Initialize()
     SetMenuStrings();
 }
 
     SetMenuStrings();
 }
 

-// This reduces flicker in wxGTK+
-static void wxSetMenuLabelOptimally(wxMenu* menu, int id, const wxString& label)
+static void wxSetMenuLabel(wxMenu* menu, int id, const wxString& label)

 {
 {

-    wxString oldLabel = menu->GetLabel(id);
-    oldLabel = wxStripMenuCodes(oldLabel.BeforeFirst('\t'));
-#ifdef __WXGTK__
-    oldLabel.Replace(wxT("_"), wxT("")); // GTK+ only
-#endif
-    wxString label1 = wxStripMenuCodes(label.BeforeFirst('\t'));
-    if (oldLabel != label1)
-        menu->SetLabel(id, label);
+    menu->SetLabel(id, label);

 }
 
 void wxCommandProcessor::SetMenuStrings()
 }
 
 void wxCommandProcessor::SetMenuStrings()


@@ -250,8 +242,7 @@ void wxCommandProcessor::SetMenuStrings()
             else
                 buf = wxString(_("Can't &Undo ")) + commandName + m_undoAccelerator;
 
             else
                 buf = wxString(_("Can't &Undo ")) + commandName + m_undoAccelerator;
 

-            //m_commandEditMenu->SetLabel(wxID_UNDO, buf);
-            wxSetMenuLabelOptimally(m_commandEditMenu, wxID_UNDO, buf);
+            wxSetMenuLabel(m_commandEditMenu, wxID_UNDO, buf);

             
             m_commandEditMenu->Enable(wxID_UNDO, canUndo);
 
             
             m_commandEditMenu->Enable(wxID_UNDO, canUndo);
 


@@ -262,23 +253,23 @@ void wxCommandProcessor::SetMenuStrings()
                 wxString redoCommandName(redoCommand->GetName());
                 if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
                 buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
                 wxString redoCommandName(redoCommand->GetName());
                 if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
                 buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;

-                wxSetMenuLabelOptimally(m_commandEditMenu, wxID_REDO, buf);
+                wxSetMenuLabel(m_commandEditMenu, wxID_REDO, buf);

                 m_commandEditMenu->Enable(wxID_REDO, TRUE);
             }
             else
             {
                 m_commandEditMenu->Enable(wxID_REDO, TRUE);
             }
             else
             {

-                wxSetMenuLabelOptimally(m_commandEditMenu, wxID_REDO, _("&Redo") + m_redoAccelerator);
+                wxSetMenuLabel(m_commandEditMenu, wxID_REDO, _("&Redo") + m_redoAccelerator);

                 m_commandEditMenu->Enable(wxID_REDO, FALSE);
             }
         }
         else
         {
                 m_commandEditMenu->Enable(wxID_REDO, FALSE);
             }
         }
         else
         {

-            wxSetMenuLabelOptimally(m_commandEditMenu, wxID_UNDO, _("&Undo") + m_undoAccelerator);
+            wxSetMenuLabel(m_commandEditMenu, wxID_UNDO, _("&Undo") + m_undoAccelerator);

             m_commandEditMenu->Enable(wxID_UNDO, FALSE);
 
             if (m_commands.Number() == 0)
             {
             m_commandEditMenu->Enable(wxID_UNDO, FALSE);
 
             if (m_commands.Number() == 0)
             {

-                wxSetMenuLabelOptimally(m_commandEditMenu, wxID_REDO, _("&Redo") + m_redoAccelerator);
+                wxSetMenuLabel(m_commandEditMenu, wxID_REDO, _("&Redo") + m_redoAccelerator);

                 m_commandEditMenu->Enable(wxID_REDO, FALSE);
             }
             else
                 m_commandEditMenu->Enable(wxID_REDO, FALSE);
             }
             else


@@ -289,7 +280,7 @@ void wxCommandProcessor::SetMenuStrings()
                 wxString redoCommandName(redoCommand->GetName());
                 if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
                 buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
                 wxString redoCommandName(redoCommand->GetName());
                 if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
                 buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;

-                wxSetMenuLabelOptimally(m_commandEditMenu, wxID_REDO, buf);
+                wxSetMenuLabel(m_commandEditMenu, wxID_REDO, buf);

                 m_commandEditMenu->Enable(wxID_REDO, TRUE);
             }
         }
                 m_commandEditMenu->Enable(wxID_REDO, TRUE);
             }
         }

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 277353786ddc9b5a07cc1fd45ff7f91a50a199a3..586b2ea0340f6e4a080e6d388fc40865de8f0b74 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -775,6 +775,14 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 
 void wxMenuItem::SetText( const wxString& str )
 {
 
 void wxMenuItem::SetText( const wxString& str )
 {

+    // Some optimization to avoid flicker
+    wxString oldLabel = m_text;
+    oldLabel = wxStripMenuCodes(oldLabel.BeforeFirst('\t'));
+    oldLabel.Replace(wxT("_"), wxT(""));
+    wxString label1 = wxStripMenuCodes(str.BeforeFirst('\t'));
+    if (oldLabel == label1)
+        return;
+    

     DoSetText(str);
 
     if (m_menuItem)
     DoSetText(str);
 
     if (m_menuItem)

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 277353786ddc9b5a07cc1fd45ff7f91a50a199a3..586b2ea0340f6e4a080e6d388fc40865de8f0b74 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -775,6 +775,14 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 
 void wxMenuItem::SetText( const wxString& str )
 {
 
 void wxMenuItem::SetText( const wxString& str )
 {

+    // Some optimization to avoid flicker
+    wxString oldLabel = m_text;
+    oldLabel = wxStripMenuCodes(oldLabel.BeforeFirst('\t'));
+    oldLabel.Replace(wxT("_"), wxT(""));
+    wxString label1 = wxStripMenuCodes(str.BeforeFirst('\t'));
+    if (oldLabel == label1)
+        return;
+    

     DoSetText(str);
 
     if (m_menuItem)
     DoSetText(str);
 
     if (m_menuItem)