X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d4737120776b48a1bb4e8e5575329e213a50810..052d2fc5818243dadbc1ec54b1120e295304fc55:/src/msw/tbar95.cpp?ds=sidebyside diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index ef132e7408..1d667c258d 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -46,23 +46,15 @@ #include "wx/msw/private.h" +#if wxUSE_UXTHEME +#include "wx/msw/uxtheme.h" +#endif + // include "properly" #include "wx/msw/wrapcctl.h" #include "wx/app.h" // for GetComCtl32Version -// ---------------------------------------------------------------------------- -// conditional compilation -// ---------------------------------------------------------------------------- - -// wxWidgets previously always considered that toolbar buttons have light grey -// (0xc0c0c0) background and so ignored any bitmap masks - however, this -// doesn't work with XPMs which then appear to have black background. To make -// this work, we must respect the bitmap masks - which we do now. This should -// be ok in any case, but to restore 100% compatible with the old version -// behaviour, you can set this to 0. -#define USE_BITMAP_MASKS 1 - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -107,22 +99,22 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) /* - TOOLBAR PROPERTIES - tool - bitmap - bitmap2 - tooltip - longhelp - radio (bool) - toggle (bool) - separator - style ( wxNO_BORDER | wxTB_HORIZONTAL) - bitmapsize - margins - packing - separation - - dontattachtoframe + TOOLBAR PROPERTIES + tool + bitmap + bitmap2 + tooltip + longhelp + radio (bool) + toggle (bool) + separator + style ( wxNO_BORDER | wxTB_HORIZONTAL) + bitmapsize + margins + packing + separation + + dontattachtoframe */ BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) @@ -234,11 +226,11 @@ bool wxToolBar::Create(wxWindow *parent, { // common initialisation if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) - return FALSE; + return false; // MSW-specific initialisation if ( !MSWCreateToolbar(pos, size) ) - return FALSE; + return false; wxSetCCUnicodeFormat(GetHwnd()); @@ -247,30 +239,37 @@ bool wxToolBar::Create(wxWindow *parent, SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); // workaround for flat toolbar on Windows XP classic style +#if wxUSE_UXTHEME if ( style & wxTB_FLAT ) { - DWORD dwToolbarStyle; - - dwToolbarStyle = (DWORD)::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L ); - - if ((dwToolbarStyle & TBSTYLE_FLAT) == 0) + wxUxThemeEngine *p = wxUxThemeEngine::Get(); + if ( !p || !p->IsThemeActive() ) { - dwToolbarStyle |= TBSTYLE_FLAT; - ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, (LPARAM)dwToolbarStyle ); + DWORD dwToolbarStyle; + + dwToolbarStyle = (DWORD)::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L ); + + if ((dwToolbarStyle & TBSTYLE_FLAT) == 0) + { + dwToolbarStyle |= TBSTYLE_FLAT; + ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, (LPARAM)dwToolbarStyle ); + } } } - return TRUE; +#endif + + return true; } bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size) { if ( !MSWCreateControl(TOOLBARCLASSNAME, wxEmptyString, pos, size) ) - return FALSE; + return false; // toolbar-specific post initialisation ::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - - return TRUE; + + return true; } void wxToolBar::Recreate() @@ -402,7 +401,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool) tool->Attach(this); InvalidateBestSize(); - return TRUE; + return true; } bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool) @@ -459,7 +458,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool) { wxLogLastError(wxT("TB_DELETEBUTTON")); - return FALSE; + return false; } } @@ -475,12 +474,12 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool) int x; wxControl *control = tool2->GetControl(); control->GetPosition(&x, NULL); - control->Move(x - width, -1); + control->Move(x - width, wxDefaultCoord); } } InvalidateBestSize(); - return TRUE; + return true; } bool wxToolBar::Realize() @@ -489,7 +488,7 @@ bool wxToolBar::Realize() if ( nTools == 0 ) { // nothing to do - return TRUE; + return true; } const bool isVertical = HasFlag(wxTB_VERTICAL); @@ -498,7 +497,7 @@ bool wxToolBar::Realize() if (wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 2) { doRemapBg = doRemap = false; - doTransparent = true; + doTransparent = true; } else { doRemap = !wxSystemOptions::HasOption(wxT("msw.remap")) @@ -542,7 +541,6 @@ bool wxToolBar::Realize() totalBitmapHeight = m_defaultHeight; // Create a bitmap and copy all the tool bitmaps to it -#if USE_BITMAP_MASKS wxMemoryDC dcAllButtons; wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight); dcAllButtons.SelectObject(bitmap); @@ -554,39 +552,17 @@ bool wxToolBar::Realize() m_hBitmap = bitmap.GetHBITMAP(); HBITMAP hBitmap = (HBITMAP)m_hBitmap; -#else // !USE_BITMAP_MASKS - HBITMAP hBitmap = ::CreateCompatibleBitmap(ScreenHDC(), - totalBitmapWidth, - totalBitmapHeight); - if ( !hBitmap ) - { - wxLogLastError(_T("CreateCompatibleBitmap")); - - return FALSE; - } - - m_hBitmap = (WXHBITMAP)hBitmap; - - MemoryHDC memoryDC; - SelectInHDC hdcSelector(memoryDC, hBitmap); - - MemoryHDC memoryDC2; -#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS if (doRemapBg) { -#if USE_BITMAP_MASKS dcAllButtons.SelectObject(wxNullBitmap); -#endif // Even if we're not remapping the bitmap // content, we still have to remap the background. hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap, totalBitmapWidth, totalBitmapHeight); -#if USE_BITMAP_MASKS dcAllButtons.SelectObject(bitmap); -#endif } // the button position @@ -605,19 +581,8 @@ bool wxToolBar::Realize() { int xOffset = wxMax(0, (m_defaultWidth - bmp.GetWidth())/2); int yOffset = wxMax(0, (m_defaultHeight - bmp.GetHeight())/2); -#if USE_BITMAP_MASKS // notice the last parameter: do use mask - dcAllButtons.DrawBitmap(bmp, x+xOffset, yOffset, TRUE); -#else // !USE_BITMAP_MASKS - SelectInHDC hdcSelector2(memoryDC2, GetHbitmapOf(bmp)); - if ( !BitBlt(memoryDC, - x+xOffset, yOffset, m_defaultWidth, m_defaultHeight, - memoryDC2, - 0, 0, SRCCOPY) ) - { - wxLogLastError(wxT("BitBlt")); - } -#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS + dcAllButtons.DrawBitmap(bmp, x+xOffset, yOffset, true); } else { @@ -632,12 +597,10 @@ bool wxToolBar::Realize() } } -#if USE_BITMAP_MASKS dcAllButtons.SelectObject(wxNullBitmap); // don't delete this HBITMAP! bitmap.SetHBITMAP(0); -#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS if (doRemap) { @@ -646,7 +609,7 @@ bool wxToolBar::Realize() totalBitmapWidth, totalBitmapHeight); } - bool addBitmap = TRUE; + bool addBitmap = true; if ( oldToolBarBitmap ) { @@ -668,7 +631,7 @@ bool wxToolBar::Realize() ::DeleteObject(oldToolBarBitmap); // already done - addBitmap = FALSE; + addBitmap = false; } else #endif // TB_REPLACEBITMAP @@ -676,7 +639,7 @@ bool wxToolBar::Realize() // we can't replace the old bitmap, so we will add another one // (awfully inefficient, but what else to do?) and shift the bitmap // indices accordingly - addBitmap = TRUE; + addBitmap = true; bitmapId = m_nButtons; } @@ -711,7 +674,7 @@ bool wxToolBar::Realize() // this array will hold the indices of all controls in the toolbar wxArrayInt controlIds; - bool lastWasRadio = FALSE; + bool lastWasRadio = false; int i = 0; for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) { @@ -730,7 +693,7 @@ bool wxToolBar::Realize() wxZeroMemory(button); - bool isRadio = FALSE; + bool isRadio = false; switch ( tool->GetStyle() ) { case wxTOOL_STYLE_CONTROL: @@ -774,10 +737,10 @@ bool wxToolBar::Realize() // radio items button.fsState |= TBSTATE_CHECKED; - tool->Toggle(TRUE); + tool->Toggle(true); } - isRadio = TRUE; + isRadio = true; break; case wxITEM_CHECK: @@ -828,8 +791,8 @@ bool wxToolBar::Realize() // note that we use TB_GETITEMRECT and not TB_GETRECT because the // latter only appeared in v4.70 of comctl32.dll RECT r; - if ( !SendMessage(GetHwnd(), TB_GETITEMRECT, - index, (LPARAM)(LPRECT)&r) ) + if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT, + index, (LPARAM)(LPRECT)&r) ) { wxLogLastError(wxT("TB_GETITEMRECT")); } @@ -847,7 +810,7 @@ bool wxToolBar::Realize() wxSize size = control->GetSize(); // the position of the leftmost controls corner - int left = -1; + int left = wxDefaultCoord; // TB_SETBUTTONINFO message is only supported by comctl32.dll 4.71+ #ifdef TB_SETBUTTONINFO @@ -860,9 +823,9 @@ bool wxToolBar::Realize() TBBUTTONINFO tbbi; tbbi.cbSize = sizeof(tbbi); tbbi.dwMask = TBIF_SIZE; - tbbi.cx = size.x; - if ( !SendMessage(GetHwnd(), TB_SETBUTTONINFO, - tool->GetId(), (LPARAM)&tbbi) ) + tbbi.cx = (WORD)size.x; + if ( !::SendMessage(GetHwnd(), TB_SETBUTTONINFO, + tool->GetId(), (LPARAM)&tbbi) ) { // the id is probably invalid? wxLogLastError(wxT("TB_SETBUTTONINFO")); @@ -885,8 +848,8 @@ bool wxToolBar::Realize() 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")); } @@ -899,7 +862,7 @@ bool wxToolBar::Realize() ((wxToolBarTool *)tool)->SetSeparatorsCount(nSeparators); // adjust the controls width to exactly cover the separators - control->SetSize((nSeparators + 1)*widthSep, -1); + control->SetSize((nSeparators + 1)*widthSep, wxDefaultCoord); } // position the control itself correctly vertically @@ -908,7 +871,7 @@ bool wxToolBar::Realize() if ( diff < 0 ) { // the control is too high, resize to fit - control->SetSize(-1, height - 2); + control->SetSize(wxDefaultCoord, height - 2); diff = 2; } @@ -923,7 +886,7 @@ bool wxToolBar::Realize() } else // horizontal toolbar { - if ( left == -1 ) + if ( left == wxDefaultCoord ) left = r.left; top = r.top; @@ -954,7 +917,7 @@ bool wxToolBar::Realize() } InvalidateBestSize(); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -965,7 +928,7 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id) { wxToolBarToolBase *tool = FindById((int)id); if ( !tool ) - return FALSE; + return false; bool toggled = false; // just to suppress warnings @@ -977,7 +940,7 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id) // ignore the event when a radio button is released, as this doesn't seem to // happen at all, and is handled otherwise if ( tool->GetKind() == wxITEM_RADIO && !toggled ) - return TRUE; + return true; tool->Toggle(toggled); UnToggleRadioGroup(tool); @@ -993,7 +956,7 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id) ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(toggled, 0)); } - return TRUE; + return true; } bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl), @@ -1008,22 +971,22 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl), // in an ANSI application - this seems to be a bug in comctl32.dll v5 UINT code = hdr->code; if ( (code != (UINT) TTN_NEEDTEXTA) && (code != (UINT) TTN_NEEDTEXTW) ) - return FALSE; + return false; HWND toolTipWnd = (HWND)::SendMessage((HWND)GetHWND(), TB_GETTOOLTIPS, 0, 0); if ( toolTipWnd != hdr->hwndFrom ) - return FALSE; + return false; LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam; int id = (int)ttText->hdr.idFrom; wxToolBarToolBase *tool = FindById(id); if ( !tool ) - return FALSE; + return false; return HandleTooltipNotify(code, lParam, tool->GetShortHelp()); #else - return FALSE; + return false; #endif } @@ -1132,7 +1095,7 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const void wxToolBar::UpdateSize() { // the toolbar size changed - SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0); + ::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0); // we must also refresh the frame after the toolbar size (possibly) changed wxFrame *frame = wxDynamicCast(GetParent(), wxFrame); @@ -1275,10 +1238,10 @@ bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam) } // message processed - return TRUE; + return true; } - return FALSE; + return false; } bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam) @@ -1297,7 +1260,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam) if ( !node ) { // no controls, nothing to erase - return FALSE; + return false; } // prepare the DC on which we'll be drawing @@ -1306,10 +1269,10 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam) dc.SetPen(*wxTRANSPARENT_PEN); RECT r; - if ( !GetUpdateRect(GetHwnd(), &r, FALSE) ) + if ( !::GetUpdateRect(GetHwnd(), &r, FALSE) ) { // nothing to redraw anyhow - return FALSE; + return false; } wxRect rectUpdate; @@ -1369,16 +1332,16 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam) { // yes, do erase it! dc.DrawRectangle(rectItem); - + // Necessary in case we use a no-paint-on-size // style in the parent: the controls can disappear - control->Refresh(FALSE); + control->Refresh(false); } } } } - return TRUE; + return true; } void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)