Applied patch [ 681893 ] Combobox in toolbar

This patch adds controls (i.e. combobox) to toolbars.
It also changes the toolbar sample so the combobox is
actually shown.

Otto Wyss


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-02-18 09:38:02 +00:00
parent 8586126c7b
commit a8f4cabe1e
5 changed files with 99 additions and 22 deletions

View File

@@ -239,7 +239,8 @@ public:
const wxString& label,
const wxBitmap& bitmap,
const wxRect& rect,
int flags);
int flags = 0,
long style = 0);
virtual void DrawTextLine(wxDC& dc,
const wxString& text,
const wxRect& rect,
@@ -2407,9 +2408,10 @@ void wxWin32Renderer::DrawToolBarButton(wxDC& dc,
const wxString& label,
const wxBitmap& bitmap,
const wxRect& rectOrig,
int flags)
int flags,
long style)
{
if ( !label.empty() || bitmap.Ok() )
if (style == wxTOOL_STYLE_BUTTON)
{
wxRect rect = rectOrig;
rect.Deflate(BORDER_THICKNESS);
@@ -2425,7 +2427,7 @@ void wxWin32Renderer::DrawToolBarButton(wxDC& dc,
dc.DrawLabel(label, bitmap, rect, wxALIGN_CENTRE);
}
else // a separator
else if (style == wxTOOL_STYLE_SEPARATOR)
{
// leave a small gap aroudn the line, also account for the toolbar
// border itself
@@ -2433,6 +2435,7 @@ void wxWin32Renderer::DrawToolBarButton(wxDC& dc,
rectOrig.y + 2*BORDER_THICKNESS,
rectOrig.GetBottom() - BORDER_THICKNESS);
}
// don't draw wxTOOL_STYLE_CONTROL
}
// ----------------------------------------------------------------------------