Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed no-remap to msw.remap

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-02-09 21:44:57 +00:00
parent d85c53a5cc
commit c36f1fc7c9
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changes.txt
View File

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

4
docs/latex/wx/toolbar.tex
View File

@@ -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. {\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 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 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: before creating the toolbar:
\begin{verbatim} \begin{verbatim}
wxSystemOptions::SetOption(wxT("no-remap"), 1); wxSystemOptions::SetOption(wxT("msw.remap"), 0);
\end{verbatim} \end{verbatim}
\wxheading{Window styles} \wxheading{Window styles}

4
src/msw/tbar95.cpp
View File

@@ -540,7 +540,7 @@ bool wxToolBar::Realize()
MemoryHDC memoryDC2; MemoryHDC memoryDC2;
#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS #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 #if USE_BITMAP_MASKS
dcAllButtons.SelectObject(wxNullBitmap); dcAllButtons.SelectObject(wxNullBitmap);
@@ -606,7 +606,7 @@ bool wxToolBar::Realize()
bitmap.SetHBITMAP(0); bitmap.SetHBITMAP(0);
#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS #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 // Map to system colours
hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap, hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,