X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5438a5665e35ee6286c5af73747873df9daed252..697c5f51487087e8113176d83a0d44e5a1c2f042:/src/msw/tbar95.cpp diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index 7d024387b6..758426c5a5 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -61,6 +61,17 @@ #include "wx/msw/dib.h" #include "wx/app.h" // for GetComCtl32Version +#if defined(__MWERKS__) && defined(__WXMSW__) +// including for max definition doesn't seem +// to work using CodeWarrior 6 Windows. So we define it +// here. (Otherwise we get a undefined identifier 'max' +// later on in this file.) (Added by dimitri@shortcut.nl) +# ifndef max +# define max(a,b) (((a) > (b)) ? (a) : (b)) +# endif + +#endif + // ---------------------------------------------------------------------------- // conditional compilation // ---------------------------------------------------------------------------- @@ -104,13 +115,6 @@ #define DEFAULTBUTTONY 24 #define DEFAULTBARHEIGHT 27 -// ---------------------------------------------------------------------------- -// private function prototypes -// ---------------------------------------------------------------------------- - -// adjust toolbar bitmap colours -// static void wxMapBitmap(HBITMAP hBitmap, int width, int height); - // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -196,6 +200,8 @@ void wxToolBar::Init() m_defaultWidth = DEFAULTBITMAPX; m_defaultHeight = DEFAULTBITMAPY; + + m_pInTool = 0; } bool wxToolBar::Create(wxWindow *parent, @@ -205,14 +211,17 @@ bool wxToolBar::Create(wxWindow *parent, long style, const wxString& name) { + // toolbars never have border, giving one to them results in broken + // appearance + style &= ~wxBORDER_MASK; + style |= wxBORDER_NONE; + // common initialisation if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) return FALSE; // prepare flags DWORD msflags = 0; // WS_VISIBLE | WS_CHILD always included - if (style & wxBORDER) - msflags |= WS_BORDER; if ( style & wxCLIP_SIBLINGS ) msflags |= WS_CLIPSIBLINGS; @@ -238,7 +247,7 @@ bool wxToolBar::Create(wxWindow *parent, wxRGBToColour(m_backgroundColour, GetSysColor(COLOR_BTNFACE)); m_foregroundColour = *wxBLACK; - SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); + SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); // position it int x = pos.x; @@ -264,11 +273,8 @@ wxToolBar::~wxToolBar() { // we must refresh the frame size when the toolbar is deleted but the frame // is not - otherwise toolbar leaves a hole in the place it used to occupy - // - // NB: a frame is being deleted only if it is not any longer in - // wxTopLevelWindows list wxFrame *frame = wxDynamicCast(GetParent(), wxFrame); - if ( frame && wxTopLevelWindows.Find(frame) ) + if ( frame && !frame->IsBeingDeleted() ) { frame->SendSizeEvent(); } @@ -477,7 +483,8 @@ bool wxToolBar::Realize() #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; @@ -602,19 +609,18 @@ bool wxToolBar::Realize() // ------------------------------ // adjust the controls size to fit nicely in the toolbar + int y = 0; size_t index = 0; for ( node = m_tools.GetFirst(); node; node = node->GetNext(), index++ ) { wxToolBarToolBase *tool = node->GetData(); - if ( !tool->IsControl() ) - continue; - - wxControl *control = tool->GetControl(); - - wxSize size = control->GetSize(); - // the position of the leftmost controls corner - int left = -1; + // we calculate the running y coord for vertical toolbars so we need to + // get the items size for all items but for the horizontal ones we + // don't need to deal with the non controls + bool isControl = tool->IsControl(); + if ( !isControl && !isVertical ) + continue; // note that we use TB_GETITEMRECT and not TB_GETRECT because the // latter only appeared in v4.70 of comctl32.dll @@ -625,60 +631,75 @@ bool wxToolBar::Realize() wxLogLastError(wxT("TB_GETITEMRECT")); } + if ( !isControl ) + { + // can only be control if isVertical + y += r.bottom - r.top; + + continue; + } + + wxControl *control = tool->GetControl(); + + wxSize size = control->GetSize(); + + // the position of the leftmost controls corner + int left = -1; + // TB_SETBUTTONINFO message is only supported by comctl32.dll 4.71+ - #if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 ) - // available in headers, now check whether it is available now - // (during run-time) - if ( wxTheApp->GetComCtl32Version() >= 471 ) +#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 ) + // available in headers, now check whether it is available now + // (during run-time) + if ( wxTheApp->GetComCtl32Version() >= 471 ) + { + // set the (underlying) separators width to be that of the + // control + TBBUTTONINFO tbbi; + tbbi.cbSize = sizeof(tbbi); + tbbi.dwMask = TBIF_SIZE; + tbbi.cx = size.x; + if ( !SendMessage(GetHwnd(), TB_SETBUTTONINFO, + tool->GetId(), (LPARAM)&tbbi) ) { - // set the (underlying) separators width to be that of the - // control - TBBUTTONINFO tbbi; - tbbi.cbSize = sizeof(tbbi); - tbbi.dwMask = TBIF_SIZE; - tbbi.cx = size.x; - if ( !SendMessage(GetHwnd(), TB_SETBUTTONINFO, - tool->GetId(), (LPARAM)&tbbi) ) - { - // the id is probably invalid? - wxLogLastError(wxT("TB_SETBUTTONINFO")); - } + // the id is probably invalid? + wxLogLastError(wxT("TB_SETBUTTONINFO")); } - else - #endif // comctl32.dll 4.71 - // TB_SETBUTTONINFO unavailable + } + else +#endif // comctl32.dll 4.71 + // TB_SETBUTTONINFO unavailable + { + // try adding several separators to fit the controls width + int widthSep = r.right - r.left; + left = r.left; + + TBBUTTON tbb; + wxZeroMemory(tbb); + tbb.idCommand = 0; + tbb.fsState = TBSTATE_ENABLED; + tbb.fsStyle = TBSTYLE_SEP; + + size_t nSeparators = size.x / widthSep; + for ( size_t nSep = 0; nSep < nSeparators; nSep++ ) { - // try adding several separators to fit the controls width - int widthSep = r.right - r.left; - left = r.left; - - TBBUTTON tbb; - wxZeroMemory(tbb); - tbb.idCommand = 0; - tbb.fsState = TBSTATE_ENABLED; - tbb.fsStyle = TBSTYLE_SEP; - - size_t nSeparators = size.x / widthSep; - for ( size_t nSep = 0; nSep < nSeparators; nSep++ ) + if ( !SendMessage(GetHwnd(), TB_INSERTBUTTON, + index, (LPARAM)&tbb) ) { - if ( !SendMessage(GetHwnd(), TB_INSERTBUTTON, - index, (LPARAM)&tbb) ) - { - wxLogLastError(wxT("TB_INSERTBUTTON")); - } - - index++; + wxLogLastError(wxT("TB_INSERTBUTTON")); } - // remember the number of separators we used - we'd have to - // delete all of them later - ((wxToolBarTool *)tool)->SetSeparatorsCount(nSeparators); - - // adjust the controls width to exactly cover the separators - control->SetSize((nSeparators + 1)*widthSep, -1); + index++; } - // and position the control itself correctly vertically + // remember the number of separators we used - we'd have to + // delete all of them later + ((wxToolBarTool *)tool)->SetSeparatorsCount(nSeparators); + + // adjust the controls width to exactly cover the separators + control->SetSize((nSeparators + 1)*widthSep, -1); + } + + // position the control itself correctly vertically int height = r.bottom - r.top; int diff = height - size.y; if ( diff < 0 ) @@ -689,7 +710,23 @@ bool wxToolBar::Realize() diff = 2; } - control->Move(left == -1 ? r.left : left, r.top + (diff + 1) / 2); + int top; + if ( isVertical ) + { + left = 0; + top = y; + + y += height + 2*GetMargins().y; + } + else // horizontal toolbar + { + if ( left == -1 ) + left = r.left; + + top = r.top; + } + + control->Move(left, top + (diff + 1) / 2); } // the max index is the "real" number of buttons - i.e. counting even the @@ -793,8 +830,9 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl), // this case size_t lenAnsi = help.Len(); - #ifdef __MWERKS__ + #if defined( __MWERKS__ ) || defined( __CYGWIN__ ) // MetroWerks doesn't like calling mbstowcs with NULL argument + // neither Cygwin does size_t lenUnicode = 2*lenAnsi; #else size_t lenUnicode = mbstowcs(NULL, help, lenAnsi); @@ -815,9 +853,6 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl), } } - // For backward compatibility... - OnMouseEnter(tool->GetId()); - return TRUE; } @@ -872,19 +907,54 @@ wxSize wxToolBar::GetToolSize() const } } +static +wxToolBarToolBase *GetItemSkippingDummySpacers(const wxToolBarToolsList& tools, + size_t index ) +{ + wxToolBarToolsList::Node* current = tools.GetFirst(); + + for ( ; current != 0; current = current->GetNext() ) + { + if ( index == 0 ) + return current->GetData(); + + wxToolBarTool *tool = (wxToolBarTool *)current->GetData(); + size_t separators = tool->GetSeparatorsCount(); + + // if it is a normal button, sepcount == 0, so skip 1 item (the button) + // otherwise, skip as many items as the separator count, plus the + // control itself + index -= separators ? separators + 1 : 1; + } + + return 0; +} + wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const { POINT pt; pt.x = x; pt.y = y; int index = (int)::SendMessage(GetHwnd(), TB_HITTEST, 0, (LPARAM)&pt); - if ( index < 0 ) + // MBN: when the point ( x, y ) is close to the toolbar border + // TB_HITTEST returns m_nButtons ( not -1 ) + if ( index < 0 || (size_t)index >= m_nButtons ) { // it's a separator or there is no tool at all there return (wxToolBarToolBase *)NULL; } - return m_tools.Item((size_t)index)->GetData(); + // if comctl32 version < 4.71 wxToolBar95 adds dummy spacers +#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 ) + if ( wxTheApp->GetComCtl32Version() >= 471 ) + { + return m_tools.Item((size_t)index)->GetData(); + } + else +#endif + { + return GetItemSkippingDummySpacers( m_tools, (size_t) index ); + } } void wxToolBar::UpdateSize() @@ -930,9 +1000,7 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(tog // 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(); @@ -1004,6 +1072,28 @@ long wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) return 0; } } + else if ( nMsg == WM_MOUSEMOVE ) + { + wxCoord x = GET_X_LPARAM(lParam), y = GET_Y_LPARAM(lParam); + wxToolBarToolBase* tool = FindToolForPosition( x, y ); + + // cursor left current tool + if( tool != m_pInTool && !tool ) + { + m_pInTool = 0; + OnMouseEnter( -1 ); + } + + // cursor entered a tool + if( tool != m_pInTool && tool ) + { + m_pInTool = tool; + OnMouseEnter( tool->GetId() ); + } + + // we don't handle mouse moves, so fall through + // to wxControl::MSWWindowProc + } return wxControl::MSWWindowProc(nMsg, wParam, lParam); } @@ -1012,151 +1102,111 @@ 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) +WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height) +{ + MemoryHDC hdcMem; -/* -#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 -*/ + if ( !hdcMem ) + { + wxLogLastError(_T("CreateCompatibleDC")); -bool wxToolBar::sm_coloursInit = FALSE; -long wxToolBar::sm_stdColours[6]; + return bitmap; + } -void wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height) -{ - if (!sm_coloursInit) + 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; + } -#if 0 + // create the target bitmap + HBITMAP hbmpDst = ::CreateCompatibleBitmap(hdcDst, width, height); + if ( !hbmpDst ) { - {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 - }; -#endif + wxLogLastError(_T("CreateCompatibleBitmap")); - int NUM_MAPS = (sizeof(ColorMap)/sizeof(COLORMAP)); - int n; - for ( n = 0; n < NUM_MAPS; n++) + return bitmap; + } + + // create the monochrome mask bitmap + HBITMAP hbmpMask = ::CreateBitmap(width, height, 1, 1, 0); + if ( !hbmpMask ) { - ColorMap[n].to = ::GetSysColor(ColorMap[n].to); + wxLogLastError(_T("CreateBitmap(mono)")); + + ::DeleteObject(hbmpDst); + + return bitmap; } - HBITMAP hbmOld; - HDC hdcMem = CreateCompatibleDC(NULL); + SelectInHDC bmpInDst(hdcDst, hbmpDst), + bmpInMask(hdcMask, hbmpMask); - if (hdcMem) + // for each colour: + for ( n = 0; n < NUM_OF_MAPPED_COLOURS; n++ ) { - hbmOld = (HBITMAP) SelectObject(hdcMem, hBitmap); + // create the mask for this colour + ::SetBkColor(hdcMem, ColorMap[n].from); + ::BitBlt(hdcMask, 0, 0, width, height, hdcMem, 0, 0, SRCCOPY); - int i, j, k; - for ( i = 0; i < width; i++) - { - for ( j = 0; j < height; j++) - { - 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 ++) - { - if ( ColorMap[k].from == pixel ) - { - /* COLORREF actualPixel = */ ::SetPixel(hdcMem, i, j, ColorMap[k].to); - break; - } - } - } - } + // replace this colour with the target one in the dst bitmap + HBRUSH hbr = ::CreateSolidBrush(ColorMap[n].to); + HGDIOBJ hbrOld = ::SelectObject(hdcDst, hbr); + ::MaskBlt(hdcDst, 0, 0, width, height, + hdcMem, 0, 0, + hbmpMask, 0, 0, + MAKEROP4(PATCOPY, SRCCOPY)); - SelectObject(hdcMem, hbmOld); - DeleteObject(hdcMem); + (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