#include "wx/settings.h"
#include "wx/bitmap.h"
#include "wx/dcmemory.h"
+ #include "wx/control.h"
#endif
#if wxUSE_TOOLBAR && defined(__WIN95__) && wxUSE_TOOLBAR_NATIVE
#ifndef TBSTYLE_FLAT
#define TBSTYLE_LIST 0x1000
#define TBSTYLE_FLAT 0x0800
+#endif
+
+#ifndef TBSTYLE_TRANSPARENT
#define TBSTYLE_TRANSPARENT 0x8000
#endif
- // use TBSTYLE_TRANSPARENT if you use TBSTYLE_FLAT
// Messages
#ifndef TB_GETSTYLE
#define DEFAULTBUTTONY 24
#define DEFAULTBARHEIGHT 27
-// ----------------------------------------------------------------------------
-// private function prototypes
-// ----------------------------------------------------------------------------
-
-// adjust toolbar bitmap colours
-// static void wxMapBitmap(HBITMAP hBitmap, int width, int height);
-
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
if (style & wxTB_FLAT)
{
- if (wxTheApp->GetComCtl32Version() > 400)
- msflags |= TBSTYLE_FLAT;
+ // static as it doesn't change during the program lifetime
+ static int s_verComCtl = wxTheApp->GetComCtl32Version();
+
+ // comctl32.dll 4.00 doesn't support the flat toolbars and using this
+ // style with 6.00 (part of Windows XP) leads to the toolbar with
+ // incorrect background colour - and not using it still results in the
+ // correct (flat) toolbar, so don't use it there
+ if ( s_verComCtl > 400 && s_verComCtl < 600 )
+ {
+ msflags |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
+ }
}
// MSW-specific initialisation
::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
// set up the colors and fonts
- wxRGBToColour(m_backgroundColour, GetSysColor(COLOR_BTNFACE));
- m_foregroundColour = *wxBLACK;
-
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
// position it
int x = pos.x;
wxToolBarToolBase *tool = node->GetData();
if ( tool->IsButton() )
{
- const wxBitmap& bmp = tool->GetBitmap1();
+ const wxBitmap& bmp = tool->GetNormalBitmap();
if ( bmp.Ok() )
{
#if USE_BITMAP_MASKS
// notice the last parameter: do use mask
- dcAllButtons.DrawBitmap(tool->GetBitmap1(), x, 0, TRUE);
+ dcAllButtons.DrawBitmap(bmp, x, 0, TRUE);
#else // !USE_BITMAP_MASKS
HBITMAP hbmp = GetHbitmapOf(bmp);
HBITMAP oldBitmap2 = (HBITMAP)::SelectObject(memoryDC2, hbmp);
#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
// Map to system colours
- MapBitmap((WXHBITMAP) hBitmap, totalBitmapWidth, totalBitmapHeight);
+ hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+ totalBitmapWidth, totalBitmapHeight);
int bitmapId = 0;
// private functions
// ----------------------------------------------------------------------------
-bool wxToolBar::sm_coloursInit = FALSE;
-long wxToolBar::sm_stdColours[6];
-
-void wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
+WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
{
- if (!sm_coloursInit)
+ MemoryHDC hdcMem;
+
+ if ( !hdcMem )
+ {
+ wxLogLastError(_T("CreateCompatibleDC"));
+
+ return bitmap;
+ }
+
+ SelectInHDC bmpInHDC(hdcMem, (HBITMAP)bitmap);
+
+ if ( !bmpInHDC )
+ {
+ wxLogLastError(_T("SelectObject"));
+
+ return bitmap;
+ }
+
+ wxCOLORMAP *cmap = wxGetStdColourMap();
+
+ for ( int i = 0; i < width; i++ )
{
- // When a bitmap is loaded, the RGB values can change. So we need to have a
- // reference bitmap which can tell us what the RGB values change to.
- wxBitmap stdColourBitmap("wxBITMAP_STD_COLOURS", wxBITMAP_TYPE_RESOURCE);
- if (stdColourBitmap.Ok())
+ for ( int j = 0; j < height; j++ )
{
- wxMemoryDC memDC;
- memDC.SelectObject(stdColourBitmap);
+ COLORREF pixel = ::GetPixel(hdcMem, i, j);
- int i = 0;
- wxColour colour;
- for (i = 0; i < 6; i++)
+ for ( size_t k = 0; k < wxSTD_COL_MAX; k++ )
{
- memDC.GetPixel(i, 0, & colour);
- sm_stdColours[i] = RGB(colour.Red(), colour.Green(), colour.Blue());
+ COLORREF col = cmap[k].from;
+ if ( abs(GetRValue(pixel) - GetRValue(col)) < 10 &&
+ abs(GetGValue(pixel) - GetGValue(col)) < 10 &&
+ abs(GetBValue(pixel) - GetBValue(col)) < 10 )
+ {
+ ::SetPixel(hdcMem, i, j, cmap[k].to);
+ break;
+ }
}
- sm_coloursInit = TRUE;
- memDC.SelectObject(wxNullBitmap);
- }
- else
- {
- sm_stdColours[0] = RGB(000,000,000) ;
- sm_stdColours[1] = RGB(128,128,128) ;
- sm_stdColours[2] = RGB(192,192,192) ;
- sm_stdColours[3] = RGB(255,255,255) ;
- sm_stdColours[4] = RGB(000,000,255) ;
- sm_stdColours[5] = RGB(255,000,255) ;
- sm_coloursInit = TRUE;
}
}
- HBITMAP hBitmap = (HBITMAP) bitmap;
+ return bitmap;
- COLORMAP ColorMap[5];
+ // VZ: I leave here my attempts to map the bitmap to the system colours
+ // faster by using BitBlt() even though it's broken currently - but
+ // maybe someone else can finish it? It should be faster than iterating
+ // over all pixels...
+#if 0
+ MemoryHDC hdcMask, hdcDst;
+ if ( !hdcMask || !hdcDst )
+ {
+ wxLogLastError(_T("CreateCompatibleDC"));
- ColorMap[0].from = sm_stdColours[0]; ColorMap[0].to = COLOR_BTNTEXT; // black (0, 0 0)
- ColorMap[1].from = sm_stdColours[1]; ColorMap[1].to = COLOR_BTNSHADOW; // dark grey (128, 128, 128)
- ColorMap[2].from = sm_stdColours[2]; ColorMap[2].to = COLOR_BTNFACE; // bright grey (192, 192, 192)
- ColorMap[3].from = sm_stdColours[3]; ColorMap[3].to = COLOR_BTNHIGHLIGHT; // white (255, 255, 255)
- // ColorMap[4].from = sm_stdColours[4]; ColorMap[4].to = COLOR_HIGHLIGHT; // blue (0, 0, 255)
- ColorMap[4].from = sm_stdColours[5]; ColorMap[4].to = COLOR_WINDOW; // magenta (255, 0, 255)
+ return bitmap;
+ }
- for ( size_t n = 0; n < WXSIZEOF(ColorMap); n++)
+ // create the target bitmap
+ HBITMAP hbmpDst = ::CreateCompatibleBitmap(hdcDst, width, height);
+ if ( !hbmpDst )
{
- ColorMap[n].to = ::GetSysColor(ColorMap[n].to);
- }
+ wxLogLastError(_T("CreateCompatibleBitmap"));
- HBITMAP hbmOld;
- HDC hdcMem = CreateCompatibleDC(NULL);
+ return bitmap;
+ }
- if (hdcMem)
+ // create the monochrome mask bitmap
+ HBITMAP hbmpMask = ::CreateBitmap(width, height, 1, 1, 0);
+ if ( !hbmpMask )
{
- hbmOld = (HBITMAP) SelectObject(hdcMem, hBitmap);
+ wxLogLastError(_T("CreateBitmap(mono)"));
- for ( int i = 0; i < width; i++ )
- {
- for ( int j = 0; j < height; j++ )
- {
- COLORREF pixel = ::GetPixel(hdcMem, i, j);
+ ::DeleteObject(hbmpDst);
- for ( size_t k = 0; k < WXSIZEOF(ColorMap); k++ )
- {
- int distance = abs( GetRValue( pixel ) - GetRValue( ColorMap[k].from )) ;
- distance = max( distance , abs(GetGValue(pixel ) - GetGValue( ColorMap[k].from ))) ;
- distance = max( distance , abs(GetBValue(pixel ) - GetBValue( ColorMap[k].from ))) ;
- if ( distance < 0x10 )
- {
- ::SetPixel(hdcMem, i, j, ColorMap[k].to);
- break;
- }
- }
- }
- }
+ return bitmap;
+ }
+
+ SelectInHDC bmpInDst(hdcDst, hbmpDst),
+ bmpInMask(hdcMask, hbmpMask);
+
+ // for each colour:
+ for ( n = 0; n < NUM_OF_MAPPED_COLOURS; n++ )
+ {
+ // create the mask for this colour
+ ::SetBkColor(hdcMem, ColorMap[n].from);
+ ::BitBlt(hdcMask, 0, 0, width, height, hdcMem, 0, 0, SRCCOPY);
+ // replace this colour with the target one in the dst bitmap
+ HBRUSH hbr = ::CreateSolidBrush(ColorMap[n].to);
+ HGDIOBJ hbrOld = ::SelectObject(hdcDst, hbr);
- SelectObject(hdcMem, hbmOld);
- DeleteObject(hdcMem);
+ ::MaskBlt(hdcDst, 0, 0, width, height,
+ hdcMem, 0, 0,
+ hbmpMask, 0, 0,
+ MAKEROP4(PATCOPY, SRCCOPY));
+
+ (void)::SelectObject(hdcDst, hbrOld);
+ ::DeleteObject(hbr);
}
-}
-// Some experiments...
-#if 0
-// What we want to do is create another bitmap which has a depth of 4,
-// and set the bits. So probably we want to convert this HBITMAP into a
-// DIB, then call SetDIBits.
-// AAAGH. The stupid thing is that if newBitmap has a depth of 4 (less than that of
-// the screen), then SetDIBits fails.
-HBITMAP newBitmap = ::CreateBitmap(totalBitmapWidth, totalBitmapHeight, 1, 4, NULL);
-HANDLE newDIB = ::BitmapToDIB((HBITMAP) m_hBitmap, NULL);
-LPBITMAPINFOHEADER lpbmi = (LPBITMAPINFOHEADER) GlobalLock(newDIB);
-
-dc = ::GetDC(NULL);
-// LPBITMAPINFOHEADER lpbmi = (LPBITMAPINFOHEADER) newDIB;
-
-int result = ::SetDIBits(dc, newBitmap, 0, lpbmi->biHeight, FindDIBBits((LPSTR)lpbmi), (LPBITMAPINFO)lpbmi,
- DIB_PAL_COLORS);
-DWORD err = GetLastError();
-
-::ReleaseDC(NULL, dc);
-
-// Delete the DIB
-GlobalUnlock (newDIB);
-GlobalFree (newDIB);
-
-// WXHBITMAP hBitmap2 = wxCreateMappedBitmap((WXHINSTANCE) wxGetInstance(), (WXHBITMAP) m_hBitmap);
-// Substitute our new bitmap for the old one
-::DeleteObject((HBITMAP) m_hBitmap);
-m_hBitmap = (WXHBITMAP) newBitmap;
-#endif
+ ::DeleteObject((HBITMAP)bitmap);
+ return (WXHBITMAP)hbmpDst;
+#endif // 0
+}
#endif // wxUSE_TOOLBAR && Win95
projects / wxWidgets.git / blobdiff