From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 28 Nov 2009 02:29:08 +0000 (+0000)
Subject: Don't override msw.remap system option value in wxToolbook.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ad42f414c8b417af309d25f149e32ea20d0d6c54

Don't override msw.remap system option value in wxToolbook.

Introducing a system option for all toolbars and then ignoring it inside wx
itself is ridiculous and just goes to prove that this option itself was a
mistake. But as we have it, we should respect whatever value it's set to
(which should hopefully be 0 anyhow for most modern systems) instead of
overriding it forcefully making the mockery of the whole "option" concept.

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

diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp
index 944147a970..20b36fb462 100644
--- a/src/generic/toolbkg.cpp
+++ b/src/generic/toolbkg.cpp
@@ -272,10 +272,7 @@ void wxToolbook::Realize()
 
         GetToolBar()->SetToolBitmapSize(m_maxBitmapSize);
 
-        int remap = wxSystemOptions::GetOptionInt(wxT("msw.remap"));
-        wxSystemOptions::SetOption(wxT("msw.remap"), 0);
         GetToolBar()->Realize();
-        wxSystemOptions::SetOption(wxT("msw.remap"), remap);
     }
 
     if (m_selection == -1)