X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f430439851ee7893cdf3d375106cd58390ba18a..211cc8dc907ee50ca6d383b8df16bba9a4d3ce2d:/src/msw/tbar95.cpp diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index 2a1a5e7ce1..f1ed7ca012 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -50,10 +50,10 @@ #ifndef __TWIN32__ -#ifdef __GNUWIN32_OLD__ - #include "wx/msw/gnuwin32/extra.h" -#else +#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #include +#else + #include "wx/msw/gnuwin32/extra.h" #endif #endif // __TWIN32__ @@ -109,13 +109,13 @@ // ---------------------------------------------------------------------------- // adjust toolbar bitmap colours -static void wxMapBitmap(HBITMAP hBitmap, int width, int height); +// static void wxMapBitmap(HBITMAP hBitmap, int width, int height); // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent) @@ -214,6 +214,9 @@ bool wxToolBar::Create(wxWindow *parent, if (style & wxBORDER) msflags |= WS_BORDER; + if ( style & wxCLIP_SIBLINGS ) + msflags |= WS_CLIPSIBLINGS; + #ifdef TBSTYLE_TOOLTIPS msflags |= TBSTYLE_TOOLTIPS; #endif @@ -313,7 +316,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool) if ( tool2->IsControl() ) { - pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount(); + pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount() - 1; } } @@ -474,7 +477,7 @@ bool wxToolBar::Realize() #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS // Map to system colours - wxMapBitmap(hBitmap, totalBitmapWidth, totalBitmapHeight); + MapBitmap((WXHBITMAP) hBitmap, totalBitmapWidth, totalBitmapHeight); int bitmapId = 0; @@ -518,7 +521,7 @@ bool wxToolBar::Realize() { if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, 0, 0) ) { - wxLogLastError(wxT("TB_DELETEBUTTON")); + wxLogDebug(wxT("TB_DELETEBUTTON failed")); } } @@ -717,7 +720,7 @@ bool wxToolBar::Realize() // message handlers // ---------------------------------------------------------------------------- -bool wxToolBar::MSWCommand(WXUINT cmd, WXWORD id) +bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id) { wxToolBarToolBase *tool = FindById((int)id); if ( !tool ) @@ -747,7 +750,7 @@ bool wxToolBar::MSWCommand(WXUINT cmd, WXWORD id) bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, - WXLPARAM *result) + WXLPARAM *WXUNUSED(result)) { // First check if this applies to us NMHDR *hdr = (NMHDR *)lParam; @@ -783,7 +786,7 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl), ttText->lpszText = (wxChar *)help.c_str(); #else // VZ: I don't know why it happens, but the versions of - // comctl32.dll starting from 4.70 sometimes send TTN_NEEDTEXTW + // comctl32.dll starting from 4.70 sometimes send TTN_NEEDTEXTW // even to ANSI programs (normally, this message is supposed // to be sent to Unicode programs only) - hence we need to // handle it as well, otherwise no tooltips will be shown in @@ -853,7 +856,8 @@ void wxToolBar::SetRows(int nRows) wxSize wxToolBar::GetToolSize() const { // TB_GETBUTTONSIZE is supported from version 4.70 -#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) +#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \ + && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) if ( wxTheApp->GetComCtl32Version() >= 470 ) { DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0); @@ -912,7 +916,7 @@ void wxToolBar::DoToggleTool(wxToolBarToolBase *tool, bool toggle) (WPARAM)tool->GetId(), (LPARAM)MAKELONG(toggle, 0)); } -void wxToolBar::DoSetToggle(wxToolBarToolBase *tool, bool toggle) +void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle)) { // VZ: AFAIK, the button has to be created either with TBSTYLE_CHECK or // without, so we really need to delete the button and recreate it here @@ -926,16 +930,20 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase *tool, bool toggle) // Responds to colour changes, and passes event on to children. void wxToolBar::OnSysColourChanged(wxSysColourChangedEvent& event) { - m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)), - GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE))); + wxRGBToColour(m_backgroundColour, ::GetSysColor(COLOR_BTNFACE)); // Remap the buttons Realize(); + // Relayout the toolbar + int nrows = m_maxRows; + m_maxRows = 0; // otherwise SetRows() wouldn't do anything + SetRows(nrows); + Refresh(); - // Propagate the event to the non-top-level children - wxWindow::OnSysColourChanged(event); + // let the event propagate further + event.Skip(); } void wxToolBar::OnMouseEvent(wxMouseEvent& event) @@ -1002,102 +1010,122 @@ long wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) // private functions // ---------------------------------------------------------------------------- -// These are the default colors used to map the bitmap colors to the current -// system colors. Note that they are in BGR format because this is what Windows -// wants (and not RGB) - -#define BGR_BUTTONTEXT (RGB(000,000,000)) // black -#define BGR_BUTTONSHADOW (RGB(128,128,128)) // dark grey -#define BGR_BUTTONFACE (RGB(192,192,192)) // bright grey -#define BGR_BUTTONHILIGHT (RGB(255,255,255)) // white -#define BGR_BACKGROUNDSEL (RGB(000,000,255)) // blue -#define BGR_BACKGROUND (RGB(255,000,255)) // magenta +bool wxToolBar::sm_coloursInit = FALSE; +long wxToolBar::sm_stdColours[6]; -void wxMapBitmap(HBITMAP hBitmap, int width, int height) +void wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height) { - COLORMAP ColorMap[] = - { - {BGR_BUTTONTEXT, COLOR_BTNTEXT}, // black - {BGR_BUTTONSHADOW, COLOR_BTNSHADOW}, // dark grey - {BGR_BUTTONFACE, COLOR_BTNFACE}, // bright grey - {BGR_BUTTONHILIGHT, COLOR_BTNHIGHLIGHT},// white -/* {BGR_BACKGROUNDSEL, COLOR_HIGHLIGHT}, // blue */ - {BGR_BACKGROUND, COLOR_WINDOW} // magenta - }; - - int NUM_MAPS = (sizeof(ColorMap)/sizeof(COLORMAP)); - int n; - for ( n = 0; n < NUM_MAPS; n++) - { - ColorMap[n].to = ::GetSysColor(ColorMap[n].to); - } - - HBITMAP hbmOld; - HDC hdcMem = CreateCompatibleDC(NULL); - - if (hdcMem) - { - hbmOld = (HBITMAP) SelectObject(hdcMem, hBitmap); - - int i, j, k; - for ( i = 0; i < width; i++) + if (!sm_coloursInit) { - for ( j = 0; j < height; j++) + // 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()) { - COLORREF pixel = ::GetPixel(hdcMem, i, j); -/* - BYTE red = GetRValue(pixel); - BYTE green = GetGValue(pixel); - BYTE blue = GetBValue(pixel); -*/ - - for ( k = 0; k < NUM_MAPS; k ++) + wxMemoryDC memDC; + memDC.SelectObject(stdColourBitmap); + + int i = 0; + wxColour colour; + for (i = 0; i < 6; i++) { - if ( ColorMap[k].from == pixel ) - { - /* COLORREF actualPixel = */ ::SetPixel(hdcMem, i, j, ColorMap[k].to); - break; - } + memDC.GetPixel(i, 0, & colour); + sm_stdColours[i] = RGB(colour.Red(), colour.Green(), colour.Blue()); } + 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; - SelectObject(hdcMem, hbmOld); - DeleteObject(hdcMem); - } + COLORMAP ColorMap[5]; + + 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) + + for ( size_t n = 0; n < WXSIZEOF(ColorMap); n++) + { + ColorMap[n].to = ::GetSysColor(ColorMap[n].to); + } + HBITMAP hbmOld; + HDC hdcMem = CreateCompatibleDC(NULL); + + if (hdcMem) + { + hbmOld = (HBITMAP) SelectObject(hdcMem, hBitmap); + + for ( int i = 0; i < width; i++ ) + { + for ( int j = 0; j < height; j++ ) + { + COLORREF pixel = ::GetPixel(hdcMem, i, j); + + 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; + } + } + } + } + + + SelectObject(hdcMem, hbmOld); + DeleteObject(hdcMem); + } } // 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); +// 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(); +int result = ::SetDIBits(dc, newBitmap, 0, lpbmi->biHeight, FindDIBBits((LPSTR)lpbmi), (LPBITMAPINFO)lpbmi, + DIB_PAL_COLORS); +DWORD err = GetLastError(); - ::ReleaseDC(NULL, dc); +::ReleaseDC(NULL, dc); - // Delete the DIB - GlobalUnlock (newDIB); - GlobalFree (newDIB); +// 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; +// Substitute our new bitmap for the old one +::DeleteObject((HBITMAP) m_hBitmap); +m_hBitmap = (WXHBITMAP) newBitmap; #endif #endif // wxUSE_TOOLBAR && Win95 +