Changed no-remap to msw.remap

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

diff --git a/docs/changes.txt b/docs/changes.txt
index b58f442fc035aa9b07e90d24a3a13f1f0f2ca8d1..c23a5bb5639cb406d6822b6abaabe064342f7934 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -157,8 +157,8 @@ wxMSW:
 - background colour of a wxComboBox may now be set
 - fixed wxListCtrl::GetItemText/BackgroundColour()
 - Esc can now be used to close menus in the dialogs (Hartmut Honisch)
-- Added no-remap system option so colourful toolbar buttons
-  aren't mangled
+- Added msw.remap system option so colourful toolbar buttons
+  aren't mangled if you set it to 0
 - Toolbar buttons are now centred if the bitmap size is smaller
   than the specified default size
 

diff --git a/docs/latex/wx/toolbar.tex b/docs/latex/wx/toolbar.tex
index 6c76dc6fb4ffdceaa4a079d2c46db2185d9515a3..26df69d8d7206ce2ea46dccc42b7750896c0fd69 100644 (file)
--- a/docs/latex/wx/toolbar.tex
+++ b/docs/latex/wx/toolbar.tex
@@ -44,11 +44,11 @@ of a "separator" is a vertical line under Windows95 vs. simple space under GTK e
 {\bf wxToolBar95:} Note that this toolbar paints tools to reflect system-wide colours.
 If you use more than 16 colours in your tool bitmaps, you may wish to suppress
 this behaviour, otherwise system colours in your bitmaps will inadvertently be
-mapped to system colours. To do this, set the {\tt no-remap} system option
+mapped to system colours. To do this, set the {\tt msw.remap} system option
 before creating the toolbar:
 
 \begin{verbatim}
-  wxSystemOptions::SetOption(wxT("no-remap"), 1);
+  wxSystemOptions::SetOption(wxT("msw.remap"), 0);
 \end{verbatim}
 
 \wxheading{Window styles}

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 172db4547d6e84b9c0be789da7fbabf3f981526e..425a9c80b4d232d9340844710a3d1c902749ffaf 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -540,7 +540,7 @@ bool wxToolBar::Realize()
         MemoryHDC memoryDC2;
 #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 
-        if (wxSystemOptions::GetOptionInt(wxT("no-remap")) == 1)
+        if (wxSystemOptions::HasOption(wxT("msw.remap")) && wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 0)
         {
 #if USE_BITMAP_MASKS
             dcAllButtons.SelectObject(wxNullBitmap);
@@ -606,7 +606,7 @@ bool wxToolBar::Realize()
         bitmap.SetHBITMAP(0);
 #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 
-        if (!wxSystemOptions::HasOption(wxT("no-remap")) || wxSystemOptions::GetOptionInt(wxT("no-remap")) == 0)
+        if (!wxSystemOptions::HasOption(wxT("msw.remap")) || wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 1)
         {
             // Map to system colours
             hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,