]> git.saurik.com Git - wxWidgets.git/commitdiff
Avoid infinite recursion in wxToolbook::OnSize() under wxMSW.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 28 Nov 2009 02:29:02 +0000 (02:29 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 28 Nov 2009 02:29:02 +0000 (02:29 +0000)
Reset m_needsRealizing flag before calling wxToolBar::Realize() as doing this
can result in another call to wxToolbook::OnSize() itself.

Closes #11942.

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

src/generic/toolbkg.cpp

index cfe93d59fb20e31e3e48e26884b7d2ff89f0fb71..944147a970b7b0d956db7e6ffd8362ae7c95347b 100644 (file)
@@ -268,6 +268,8 @@ void wxToolbook::Realize()
 {
     if (m_needsRealizing)
     {
+        m_needsRealizing = false;
+
         GetToolBar()->SetToolBitmapSize(m_maxBitmapSize);
 
         int remap = wxSystemOptions::GetOptionInt(wxT("msw.remap"));
@@ -276,8 +278,6 @@ void wxToolbook::Realize()
         wxSystemOptions::SetOption(wxT("msw.remap"), remap);
     }
 
-    m_needsRealizing = false;
-
     if (m_selection == -1)
         m_selection = 0;