wxSetCCUnicodeFormat(GetHwnd());
- // set up the colors and fonts
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
- SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-
// workaround for flat toolbar on Windows XP classic style: we have to set
// the style after creating the control; doing it at creation time doesn't work
#if wxUSE_UXTHEME
LRESULT style = ::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L);
if ( !(style & TBSTYLE_FLAT) )
- {
::SendMessage(GetHwnd(), TB_SETSTYLE, 0, style | TBSTYLE_FLAT);
- }
}
#endif // wxUSE_UXTHEME
}
Realize();
- UpdateSize();
}
wxToolBar::~wxToolBar()
}
CacheBestSize(sizeBest);
+
return sizeBest;
}
(style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
);
- // always include this one, it never hurts and setting it later only if we
- // do have tooltips wouldn't work
+ // always include this one, it never hurts and setting it later
+ // only if we do have tooltips wouldn't work
msStyle |= TBSTYLE_TOOLTIPS;
if ( style & (wxTB_FLAT | wxTB_HORZ_LAYOUT) )
if ( tool->IsControl() )
{
nButtonsToDelete = ((wxToolBarTool *)tool)->GetSeparatorsCount();
-
width *= nButtonsToDelete;
}
}
InvalidateBestSize();
+
return true;
}
{
const size_t nTools = GetToolsCount();
if ( nTools == 0 )
- {
// nothing to do
return true;
- }
const bool isVertical = HasFlag(wxTB_VERTICAL);
#ifndef __WXWINCE__
int remapValue = (-1);
- if (wxSystemOptions::HasOption(wxT("msw.remap")))
- remapValue = wxSystemOptions::GetOptionInt(wxT("msw.remap"));
+ const wxChar *remapOptionStr = wxT("msw.remap");
+ if (wxSystemOptions::HasOption( remapOptionStr ))
+ remapValue = wxSystemOptions::GetOptionInt( remapOptionStr );
doTransparent = (remapValue == 2);
if (!doTransparent)
wx_truncate_cast(wxCoord, nTools),
totalBitmapHeight = m_defaultHeight;
- // Create a bitmap and copy all the tool bitmaps to it
+ // Create a bitmap and copy all the tool bitmaps into it
wxMemoryDC dcAllButtons;
wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
dcAllButtons.SelectObject(bitmap);
if ( m_disabledImgList )
{
wxBitmap bmpDisabled = tool->GetDisabledBitmap();
-#if wxUSE_IMAGE
+#if wxUSE_IMAGE && wxUSE_WXDIB
if ( !bmpDisabled.Ok() )
{
// no disabled bitmap specified but we still need to
{
const wxString& label = tool->GetLabel();
if ( !label.empty() )
- {
button.iString = (int)label.c_str();
- }
}
button.idCommand = tool->GetId();
button.fsStyle = TBSTYLE_CHECK;
break;
+ case wxITEM_NORMAL:
+ button.fsStyle = TBSTYLE_BUTTON;
+ break;
+
default:
wxFAIL_MSG( _T("unexpected toolbar button kind") );
- // fall through
-
- case wxITEM_NORMAL:
button.fsStyle = TBSTYLE_BUTTON;
+ break;
}
bitmapId++;
left = 0;
top = y;
- y += height + 2*GetMargins().y;
+ y += height + 2 * GetMargins().y;
}
else // horizontal toolbar
{
if ( !isVertical )
{
if ( m_maxRows == 0 )
- {
// if not set yet, only one row
SetRows(1);
- }
}
else if ( m_nButtons > 0 ) // vertical non empty toolbar
{
if ( m_maxRows == 0 )
- {
// if not set yet, have one column
SetRows(m_nButtons);
- }
}
InvalidateBestSize();
- SetBestFittingSize();
+ UpdateSize();
return true;
}
pt.x = x;
pt.y = y;
int index = (int)::SendMessage(GetHwnd(), TB_HITTEST, 0, (LPARAM)&pt);
+
// 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;
- }
// when TB_SETBUTTONINFO is available (both during compile- and run-time),
// we don't use the dummy separators hack
void wxToolBar::UpdateSize()
{
- // the toolbar size changed
::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
- // we must also refresh the frame after the toolbar size (possibly) changed
+ // In case Realize is called after the initial display (IOW the programmer
+ // may have rebuilt the toolbar) give the frame the option of resizing the
+ // toolbar to full width again, but only if the parent is a frame and the
+ // toolbar is managed by the frame. Otherwise assume that some other
+ // layout mechanism is controlling the toolbar size and leave it alone.
wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
- if ( frame )
+ if ( frame && frame->GetToolBar() == this )
{
frame->SendSizeEvent();
}
// colour: for example, when it must blend in with a notebook page.
void wxToolBar::OnEraseBackground(wxEraseEvent& event)
{
- wxColour bgCol = GetBackgroundColour();
- if (!bgCol.Ok())
- {
- event.Skip();
- return;
- }
-
- // notice that this 'dumb' implementation may cause flicker for some of the
- // controls in which case they should intercept wxEraseEvent and process it
- // themselves somehow
-
- RECT rect;
- ::GetClientRect(GetHwnd(), &rect);
-
- HBRUSH hBrush = ::CreateSolidBrush(wxColourToRGB(bgCol));
-
+ RECT rect = wxGetClientRect(GetHwnd());
HDC hdc = GetHdcOf((*event.GetDC()));
-#ifndef __WXWINCE__
- int mode = ::SetMapMode(hdc, MM_TEXT);
-#endif
+ if ( UseBgCol() )
+ {
+ // do draw our background
+ //
+ // notice that this 'dumb' implementation may cause flicker for some of
+ // the controls in which case they should intercept wxEraseEvent and
+ // process it themselves somehow
+ AutoHBRUSH hBrush(wxColourToRGB(GetBackgroundColour()));
- ::FillRect(hdc, &rect, hBrush);
- ::DeleteObject(hBrush);
+ wxCHANGE_HDC_MAP_MODE(hdc, MM_TEXT);
+ ::FillRect(hdc, &rect, hBrush);
+ }
+ else // we have no non default background colour
+ {
+#if wxUSE_UXTHEME
+ // we may need to draw themed colour so that we appear correctly on
+ // e.g. notebook page under XP with themes but only do it if the parent
+ // draws themed background itself
+ if ( !GetParent()->UseBgCol() )
+ {
+ wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
+ if ( theme )
+ {
+ HRESULT
+ hr = theme->DrawThemeParentBackground(GetHwnd(), hdc, &rect);
+ if ( SUCCEEDED(hr) )
+ return;
-#ifndef __WXWINCE__
- ::SetMapMode(hdc, mode);
-#endif
+ wxLogApiError(_T("DrawThemeParentBackground(toolbar)"), hr);
+ }
+ }
+#endif // wxUSE_UXTHEME
+
+ event.Skip();
+ return;
+ }
}
bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
{
- // erase any dummy separators which we used for aligning the controls if
- // any here
+ // erase any dummy separators which were used
+ // for aligning the controls if any here
- // first of all, do we have any controls at all?
+ // first of all, are there any controls at all?
wxToolBarToolsList::compatibility_iterator node;
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
}
if ( !node )
- {
// no controls, nothing to erase
return false;
- }
// prepare the DC on which we'll be drawing
wxClientDC dc(this);
RECT r;
if ( !::GetUpdateRect(GetHwnd(), &r, FALSE) )
- {
// nothing to redraw anyhow
return false;
- }
wxRect rectUpdate;
wxCopyRECTToRect(r, rectUpdate);
wxToolBarToolBase* tool = FindToolForPosition( x, y );
// cursor left current tool
- if( tool != m_pInTool && !tool )
+ if ( tool != m_pInTool && !tool )
{
m_pInTool = 0;
OnMouseEnter( -1 );
}
// cursor entered a tool
- if( tool != m_pInTool && tool )
+ if ( tool != m_pInTool && tool )
{
m_pInTool = tool;
OnMouseEnter( tool->GetId() );
if ( HandlePaint(wParam, lParam) )
return 0;
#endif
+
+ default:
+ break;
}
return wxControl::MSWWindowProc(nMsg, wParam, lParam);
#endif // 0
}
-#endif // wxUSE_TOOLBAR && Win95
+#endif // wxUSE_TOOLBAR
projects / wxWidgets.git / blobdiff