fix for infinite recursion in UpdateFontIfNeeded

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index ba3c070bb9b9b529a734bfdccd8d52210d65bd92..596ab3c6b30e20c7bb8c3c555e1521fabef26a6e 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -1077,10 +1077,10 @@ void wxTextCtrl::ChangeFontGlobally()
     wxString value = GetValue();
     if ( !value.IsEmpty() )
     {
     wxString value = GetValue();
     if ( !value.IsEmpty() )
     {

+        m_updateFont = FALSE;
+

         Clear();
         AppendText(value);
         Clear();
         AppendText(value);

-
-        m_updateFont = FALSE;

     }
 }
 
     }
 }
 

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index ba3c070bb9b9b529a734bfdccd8d52210d65bd92..596ab3c6b30e20c7bb8c3c555e1521fabef26a6e 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -1077,10 +1077,10 @@ void wxTextCtrl::ChangeFontGlobally()
     wxString value = GetValue();
     if ( !value.IsEmpty() )
     {
     wxString value = GetValue();
     if ( !value.IsEmpty() )
     {

+        m_updateFont = FALSE;
+

         Clear();
         AppendText(value);
         Clear();
         AppendText(value);

-
-        m_updateFont = FALSE;

     }
 }
 
     }
 }