/////////////////////////////////////////////////////////////////////////////
-// Name: msw/tbar95.cpp
+// Name: src/msw/tbar95.cpp
// Purpose: wxToolBar
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "tbar95.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && !defined(__SMARTPHONE__)
+
+#include "wx/toolbar.h"
+
#ifndef WX_PRECOMP
+ #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+ #include "wx/dynarray.h"
#include "wx/frame.h"
#include "wx/log.h"
#include "wx/intl.h"
- #include "wx/dynarray.h"
#include "wx/settings.h"
#include "wx/bitmap.h"
#include "wx/dcmemory.h"
#include "wx/control.h"
+ #include "wx/app.h" // for GetComCtl32Version
+ #include "wx/image.h"
+ #include "wx/stattext.h"
#endif
-#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && !defined(__SMARTPHONE__)
-
-#include "wx/toolbar.h"
#include "wx/sysopt.h"
-#include "wx/image.h"
#include "wx/msw/private.h"
#include "wx/msw/uxtheme.h"
#endif
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
-#include "wx/app.h" // for GetComCtl32Version
+// this define controls whether the code for button colours remapping (only
+// useful for 16 or 256 colour images) is active at all, it's always turned off
+// for CE where it doesn't compile (and is probably not needed anyhow) and may
+// also be turned off for other systems if you always use 24bpp images and so
+// never need it
+#ifndef __WXWINCE__
+ #define wxREMAP_BUTTON_COLOURS
+#endif // !__WXWINCE__
// ----------------------------------------------------------------------------
// constants
// these values correspond to those used by comctl32.dll
#define DEFAULTBITMAPX 16
#define DEFAULTBITMAPY 15
-#define DEFAULTBUTTONX 24
-#define DEFAULTBUTTONY 24
-#define DEFAULTBARHEIGHT 27
// ----------------------------------------------------------------------------
// wxWin macros
clientData, shortHelp, longHelp)
{
m_nSepCount = 0;
+ m_staticText = 0;
}
- wxToolBarTool(wxToolBar *tbar, wxControl *control)
- : wxToolBarToolBase(tbar, control)
+ wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
+ : wxToolBarToolBase(tbar, control, label)
{
+ if ( IsControl() && !m_label.empty() )
+ {
+ // create a control to render the control's label
+ m_staticText = new wxStaticText
+ (
+ m_tbar,
+ wxID_ANY,
+ m_label,
+ wxDefaultPosition,
+ wxDefaultSize,
+ wxALIGN_CENTRE | wxST_NO_AUTORESIZE
+ );
+ }
+ else // no label
+ {
+ m_staticText = NULL;
+ }
+
m_nSepCount = 1;
}
+ virtual ~wxToolBarTool()
+ {
+ delete m_staticText;
+ }
+
virtual void SetLabel(const wxString& label)
{
if ( label == m_label )
wxToolBarToolBase::SetLabel(label);
+ if ( m_staticText )
+ m_staticText->SetLabel(label);
+
// we need to update the label shown in the toolbar because it has a
// pointer to the internal buffer of the old label
//
// TODO: use TB_SETBUTTONINFO
}
+ wxStaticText* GetStaticText()
+ {
+ wxASSERT_MSG( IsControl(),
+ _T("only makes sense for embedded control tools") );
+
+ return m_staticText;
+ }
+
// set/get the number of separators which we use to cover the space used by
// a control in the toolbar
void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
private:
size_t m_nSepCount;
+ wxStaticText *m_staticText;
DECLARE_NO_COPY_CLASS(wxToolBarTool)
};
-
// ============================================================================
// implementation
// ============================================================================
clientData, shortHelp, longHelp);
}
-wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
+wxToolBarToolBase *
+wxToolBar::CreateTool(wxControl *control, const wxString& label)
{
- return new wxToolBarTool(this, control);
+ return new wxToolBarTool(this, control, label);
}
// ----------------------------------------------------------------------------
m_defaultWidth = DEFAULTBITMAPX;
m_defaultHeight = DEFAULTBITMAPY;
- m_pInTool = 0;
+ m_pInTool = NULL;
}
bool wxToolBar::Create(wxWindow *parent,
if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
return false;
+ FixupStyle();
+
// MSW-specific initialisation
if ( !MSWCreateToolbar(pos, size) )
return false;
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
+ // 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
if ( style & wxTB_FLAT )
{
- // Testing for an active theme appears to be unnecessary (see comments in patch 1204217).
- // Disabling the test brings back separator lines.
-#if 0
- wxUxThemeEngine *p = wxUxThemeEngine::Get();
- if ( !p || !p->IsThemeActive() )
-#endif
- {
- DWORD dwToolbarStyle;
+ LRESULT style = GetMSWToolbarStyle();
- dwToolbarStyle = (DWORD)::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L );
-
- if ((dwToolbarStyle & TBSTYLE_FLAT) == 0)
- {
- dwToolbarStyle |= TBSTYLE_FLAT;
- ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, (LPARAM)dwToolbarStyle );
- }
- }
+ if ( !(style & TBSTYLE_FLAT) )
+ ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, style | TBSTYLE_FLAT);
}
-#endif
+#endif // wxUSE_UXTHEME
return true;
}
// toolbar-specific post initialisation
::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
+#ifdef TB_SETEXTENDEDSTYLE
+ if ( wxApp::GetComCtl32Version() >= 471 )
+ ::SendMessage(GetHwnd(), TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS);
+#endif
+
+ // Fix a bug on e.g. the Silver theme on WinXP where control backgrounds
+ // are incorrectly drawn, by forcing the background to a specific colour.
+ int majorVersion, minorVersion;
+ wxGetOsVersion(& majorVersion, & minorVersion);
+ if (majorVersion < 6)
+ SetBackgroundColour(GetBackgroundColour());
+
return true;
}
::SetParent(GetHwndOf(win), GetHwnd());
}
- // only destroy the old toolbar now -- after all the children had been
- // reparented
+ // only destroy the old toolbar now --
+ // after all the children had been reparented
::DestroyWindow(hwndOld);
// it is for the old bitmap control and can't be used with the new one
}
Realize();
- UpdateSize();
}
wxToolBar::~wxToolBar()
// is not - otherwise toolbar leaves a hole in the place it used to occupy
wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
if ( frame && !frame->IsBeingDeleted() )
- {
frame->SendSizeEvent();
- }
if ( m_hBitmap )
- {
::DeleteObject((HBITMAP) m_hBitmap);
- }
delete m_disabledImgList;
}
sizeBest.x *= GetToolsCount();
// reverse horz and vertical components if necessary
- if ( HasFlag(wxTB_VERTICAL) )
+ if ( IsVertical() )
{
int t = sizeBest.x;
sizeBest.x = sizeBest.y;
sizeBest.y = size.cy;
}
+ if (!IsVertical())
+ {
+ // Without the extra height, DoGetBestSize can report a size that's
+ // smaller than the actual window, causing windows to overlap slightly
+ // in some circumstances, leading to missing borders (especially noticeable
+ // in AUI layouts).
+ if (!(GetWindowStyle() & wxTB_NODIVIDER))
+ sizeBest.y += 2;
+ sizeBest.y ++;
+ }
+
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
- msStyle |= TBSTYLE_TOOLTIPS;
+ if ( !(style & wxTB_NO_TOOLTIPS) )
+ msStyle |= TBSTYLE_TOOLTIPS;
if ( style & (wxTB_FLAT | wxTB_HORZ_LAYOUT) )
{
// static as it doesn't change during the program lifetime
- static int s_verComCtl = wxApp::GetComCtl32Version();
+ static const int s_verComCtl = wxApp::GetComCtl32Version();
// comctl32.dll 4.00 doesn't support the flat toolbars and using this
// style with 6.00 (part of Windows XP) leads to the toolbar with
// incorrect background colour - and not using it still results in the
// correct (flat) toolbar, so don't use it there
if ( s_verComCtl > 400 && s_verComCtl < 600 )
- {
msStyle |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
- }
if ( s_verComCtl >= 470 && style & wxTB_HORZ_LAYOUT )
- {
msStyle |= TBSTYLE_LIST;
- }
}
if ( style & wxTB_NODIVIDER )
if ( style & wxTB_VERTICAL )
msStyle |= CCS_VERT;
+ if( style & wxTB_BOTTOM )
+ msStyle |= CCS_BOTTOM;
+
+ if ( style & wxTB_RIGHT )
+ msStyle |= CCS_RIGHT;
+
return msStyle;
}
}
if ( tool2->IsControl() )
- {
pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount() - 1;
- }
}
// now determine the number of buttons to delete and the area taken by them
if ( tool->IsControl() )
{
nButtonsToDelete = ((wxToolBarTool *)tool)->GetSeparatorsCount();
-
width *= nButtonsToDelete;
+ tool->GetControl()->Destroy();
}
// do delete all buttons
// takes care of all normal items)
for ( /* node -> first after deleted */ ; node; node = node->GetNext() )
{
- wxToolBarToolBase *tool2 = node->GetData();
+ wxToolBarTool *tool2 = (wxToolBarTool*)node->GetData();
if ( tool2->IsControl() )
{
int x;
wxControl *control = tool2->GetControl();
control->GetPosition(&x, NULL);
control->Move(x - width, wxDefaultCoord);
+
+ wxStaticText* staticText = tool2->GetStaticText();
+ staticText->Move(x - width, wxDefaultCoord);
}
}
InvalidateBestSize();
+
return true;
}
void wxToolBar::CreateDisabledImageList()
{
+ if (m_disabledImgList != NULL)
+ {
+ delete m_disabledImgList;
+ m_disabledImgList = NULL;
+ }
+
// as we can't use disabled image list with older versions of comctl32.dll,
// don't even bother creating it
- if ( wxTheApp->GetComCtl32Version() >= 470 )
+ if ( wxApp::GetComCtl32Version() >= 470 )
{
// search for the first disabled button img in the toolbar, if any
for ( wxToolBarToolsList::compatibility_iterator
bmpDisabled.GetMask() != NULL,
GetToolsCount()
);
- return;
+ break;
}
}
// we don't have any disabled bitmaps
}
-
- m_disabledImgList = NULL;
}
bool wxToolBar::Realize()
{
const size_t nTools = GetToolsCount();
if ( nTools == 0 )
- {
// nothing to do
return true;
- }
-
- const bool isVertical = HasFlag(wxTB_VERTICAL);
- bool doRemap, doRemapBg, doTransparent;
-#ifdef __WXWINCE__
- doRemapBg = false;
- doRemap = false;
- doTransparent = false;
-#else
- if (wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 2)
+#ifdef wxREMAP_BUTTON_COLOURS
+ // don't change the values of these constants, they can be set from the
+ // user code via wxSystemOptions
+ enum
{
- doRemapBg = doRemap = false;
- doTransparent = true;
- }
- else
- { doRemap = !wxSystemOptions::HasOption(wxT("msw.remap"))
- || wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 1;
- doRemapBg = !doRemap;
- doTransparent = false;
- }
-#endif
+ Remap_None = -1,
+ Remap_Bg,
+ Remap_Buttons,
+ Remap_TransparentBg
+ };
+
+ // the user-specified option overrides anything, but if it wasn't set, only
+ // remap the buttons on 8bpp displays as otherwise the bitmaps usually look
+ // much worse after remapping
+ static const wxChar *remapOption = wxT("msw.remap");
+ const int remapValue = wxSystemOptions::HasOption(remapOption)
+ ? wxSystemOptions::GetOptionInt(remapOption)
+ : wxDisplayDepth() <= 8 ? Remap_Buttons
+ : Remap_None;
+
+#endif // wxREMAP_BUTTON_COLOURS
// delete all old buttons, if any
for ( size_t pos = 0; pos < m_nButtons; pos++ )
sizeBmp.x = m_defaultWidth;
sizeBmp.y = m_defaultHeight;
- const wxCoord totalBitmapWidth = m_defaultWidth * nTools,
+ const wxCoord totalBitmapWidth = m_defaultWidth *
+ 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);
+
+#ifdef wxREMAP_BUTTON_COLOURS
+ if ( remapValue != Remap_TransparentBg )
+#endif // wxREMAP_BUTTON_COLOURS
+ {
+ // VZ: why do we hardcode grey colour for CE?
+ dcAllButtons.SetBackground(wxBrush(
#ifdef __WXWINCE__
- dcAllButtons.SetBackground(wxBrush(wxColour(192,192,192)));
-#else
- if (doTransparent)
- dcAllButtons.SetBackground(*wxTRANSPARENT_BRUSH);
- else
- dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH);
-#endif
- dcAllButtons.Clear();
+ wxColour(0xc0, 0xc0, 0xc0)
+#else // !__WXWINCE__
+ GetBackgroundColour()
+#endif // __WXWINCE__/!__WXWINCE__
+ ));
+ dcAllButtons.Clear();
+ }
m_hBitmap = bitmap.GetHBITMAP();
HBITMAP hBitmap = (HBITMAP)m_hBitmap;
-#ifndef __WXWINCE__
- if (doRemapBg)
+#ifdef wxREMAP_BUTTON_COLOURS
+ if ( remapValue == Remap_Bg )
{
dcAllButtons.SelectObject(wxNullBitmap);
totalBitmapWidth, totalBitmapHeight);
dcAllButtons.SelectObject(bitmap);
-
-
}
-#endif // !__WXWINCE__
+#endif // wxREMAP_BUTTON_COLOURS
// the button position
wxCoord x = 0;
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
// fill the space in the image list with something, so
// we grey out the normal bitmap
- wxImage imgGreyed;
- wxCreateGreyedImage(bmp.ConvertToImage(), imgGreyed);
+ wxImage
+ imgGreyed = bmp.ConvertToImage().ConvertToGreyscale();
- // we need to have light grey background colour for
- // MapBitmap() to work correctly
- for ( int y = 0; y < h; y++ )
+#ifdef wxREMAP_BUTTON_COLOURS
+ if ( remapValue == Remap_Buttons )
{
- for ( int x = 0; x < w; x++ )
+ // we need to have light grey background colour for
+ // MapBitmap() to work correctly
+ for ( int y = 0; y < h; y++ )
{
- if ( imgGreyed.IsTransparent(x, y) )
- imgGreyed.SetRGB(x, y,
- wxLIGHT_GREY->Red(),
- wxLIGHT_GREY->Green(),
- wxLIGHT_GREY->Blue());
+ for ( int x = 0; x < w; x++ )
+ {
+ if ( imgGreyed.IsTransparent(x, y) )
+ imgGreyed.SetRGB(x, y,
+ wxLIGHT_GREY->Red(),
+ wxLIGHT_GREY->Green(),
+ wxLIGHT_GREY->Blue());
+ }
}
}
+#endif // wxREMAP_BUTTON_COLOURS
bmpDisabled = wxBitmap(imgGreyed);
}
#endif // wxUSE_IMAGE
- MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
+#ifdef wxREMAP_BUTTON_COLOURS
+ if ( remapValue == Remap_Buttons )
+ MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
+#endif // wxREMAP_BUTTON_COLOURS
m_disabledImgList->Add(bmpDisabled);
}
// don't delete this HBITMAP!
bitmap.SetHBITMAP(0);
- if (doRemap)
+#ifdef wxREMAP_BUTTON_COLOURS
+ if ( remapValue == Remap_Buttons )
{
// Map to system colours
hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
- totalBitmapWidth, totalBitmapHeight);
-
-
+ totalBitmapWidth, totalBitmapHeight);
}
+#endif // wxREMAP_BUTTON_COLOURS
bool addBitmap = true;
}
}
- if ( m_disabledImgList )
+ // disable image lists are only supported in comctl32.dll 4.70+
+ if ( wxApp::GetComCtl32Version() >= 470 )
{
+ HIMAGELIST hil = m_disabledImgList
+ ? GetHimagelistOf(m_disabledImgList)
+ : 0;
+
+ // notice that we set the image list even if don't have one right
+ // now as we could have it before and need to reset it in this case
HIMAGELIST oldImageList = (HIMAGELIST)
- ::SendMessage(GetHwnd(),
- TB_SETDISABLEDIMAGELIST,
- 0,
- (LPARAM)GetHimagelistOf(m_disabledImgList));
+ ::SendMessage(GetHwnd(), TB_SETDISABLEDIMAGELIST, 0, (LPARAM)hil);
// delete previous image list if any
if ( oldImageList )
- ::DeleteObject( oldImageList );
+ ::DeleteObject(oldImageList);
}
}
// don't add separators to the vertical toolbar with old comctl32.dll
// versions as they didn't handle this properly
- if ( isVertical && tool->IsSeparator() &&
+ if ( IsVertical() && tool->IsSeparator() &&
wxApp::GetComCtl32Version() <= 472 )
{
continue;
}
-
TBBUTTON& button = buttons[i];
wxZeroMemory(button);
{
const wxString& label = tool->GetLabel();
if ( !label.empty() )
- {
- button.iString = (int)label.c_str();
- }
+ button.iString = (int)label.wx_str();
}
button.idCommand = tool->GetId();
DoToggleTool(tool, true);
}
}
- else if (tool->IsToggled())
+ else if ( tool->IsToggled() )
{
wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
int prevIndex = i - 1;
wxToolBarToolBase *tool = nodePrev->GetData();
if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
break;
-
+
if ( tool->Toggle(false) )
- {
DoToggleTool(tool, false);
- }
- prevButton.fsState = TBSTATE_ENABLED;
+
+ prevButton.fsState &= ~TBSTATE_CHECKED;
nodePrev = nodePrev->GetPrevious();
prevIndex--;
- }
+ }
}
isRadio = true;
button.fsStyle = TBSTYLE_CHECK;
break;
+ case wxITEM_NORMAL:
+ button.fsStyle = TBSTYLE_BUTTON;
+ break;
+
+ case wxITEM_DROPDOWN:
+ button.fsStyle = TBSTYLE_DROPDOWN;
+ break;
+
default:
wxFAIL_MSG( _T("unexpected toolbar button kind") );
- // fall through
-
- case wxITEM_NORMAL:
button.fsStyle = TBSTYLE_BUTTON;
+ break;
}
bitmapId++;
size_t index = 0;
for ( node = m_tools.GetFirst(); node; node = node->GetNext(), index++ )
{
- wxToolBarToolBase *tool = node->GetData();
+ wxToolBarTool *tool = (wxToolBarTool*)node->GetData();
// 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 )
+ if ( !isControl && !IsVertical() )
continue;
// note that we use TB_GETITEMRECT and not TB_GETRECT because the
}
wxControl *control = tool->GetControl();
+ wxStaticText * const staticText = tool->GetStaticText();
wxSize size = control->GetSize();
+ wxSize staticTextSize;
+ if ( staticText )
+ {
+ staticTextSize = staticText->GetSize();
+ staticTextSize.y += 3; // margin between control and its label
+ }
// the position of the leftmost controls corner
int left = wxDefaultCoord;
((wxToolBarTool *)tool)->SetSeparatorsCount(nSeparators);
// adjust the controls width to exactly cover the separators
- control->SetSize((nSeparators + 1)*widthSep, wxDefaultCoord);
+ size.x = (nSeparators + 1)*widthSep;
+ control->SetSize(size.x, wxDefaultCoord);
}
- // position the control itself correctly vertically
- int height = r.bottom - r.top;
+ // position the control itself correctly vertically centering it on the
+ // icon area of the toolbar
+ int height = r.bottom - r.top - staticTextSize.y;
+
int diff = height - size.y;
- if ( diff < 0 )
+ if ( diff < 0 || !HasFlag(wxTB_TEXT) )
{
- // the control is too high, resize to fit
- control->SetSize(wxDefaultCoord, height - 2);
+ // not enough room for the static text
+ if ( staticText )
+ staticText->Hide();
+
+ // recalculate height & diff without the staticText control
+ height = r.bottom - r.top;
+ diff = height - size.y;
+ if ( diff < 0 )
+ {
+ // the control is too high, resize to fit
+ control->SetSize(wxDefaultCoord, height - 2);
- diff = 2;
+ diff = 2;
+ }
+ }
+ else // enough space for both the control and the label
+ {
+ if ( staticText )
+ staticText->Show();
}
int top;
- if ( isVertical )
+ if ( IsVertical() )
{
left = 0;
top = y;
- y += height + 2*GetMargins().y;
+ y += height + 2 * GetMargins().y;
}
else // horizontal toolbar
{
}
control->Move(left, top + (diff + 1) / 2);
+ if ( staticText )
+ {
+ staticText->Move(left + (size.x - staticTextSize.x)/2,
+ r.bottom - staticTextSize.y);
+ }
}
// the max index is the "real" number of buttons - i.e. counting even the
// separators which we added just for aligning the controls
m_nButtons = index;
- if ( !isVertical )
+ 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);
- }
+ // if not set yet, have one column
+ m_maxRows = 1;
+ SetRows(m_nButtons);
}
InvalidateBestSize();
+ UpdateSize();
+
return true;
}
// message handlers
// ----------------------------------------------------------------------------
-bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
+bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_)
{
- wxToolBarToolBase *tool = FindById((int)id);
+ // cast to signed is important as we compare this id with (signed) ints in
+ // FindById() and without the cast we'd get a positive int from a
+ // "negative" (i.e. > 32767) WORD
+ const int id = (signed short)id_;
+
+ wxToolBarToolBase *tool = FindById(id);
if ( !tool )
return false;
// OnLeftClick() can veto the button state change - for buttons which
// may be toggled only, of couse
- if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )
+ if ( !OnLeftClick(id, toggled) && tool->CanBeToggled() )
{
// revert back
tool->Toggle(!toggled);
WXLPARAM lParam,
WXLPARAM *WXUNUSED(result))
{
-#if wxUSE_TOOLTIPS
- // First check if this applies to us
- NMHDR *hdr = (NMHDR *)lParam;
+ LPNMHDR hdr = (LPNMHDR)lParam;
+ if ( hdr->code == TBN_DROPDOWN )
+ {
+ LPNMTOOLBAR tbhdr = (LPNMTOOLBAR)lParam;
- // the tooltips control created by the toolbar is sometimes Unicode, even
- // 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;
+ wxCommandEvent evt(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, tbhdr->iItem);
+ if ( GetEventHandler()->ProcessEvent(evt) )
+ {
+ // Event got handled, don't display default popup menu
+ return false;
+ }
- HWND toolTipWnd = (HWND)::SendMessage((HWND)GetHWND(), TB_GETTOOLTIPS, 0, 0);
- if ( toolTipWnd != hdr->hwndFrom )
- return false;
+ const wxToolBarToolBase * const tool = FindById(tbhdr->iItem);
+ wxCHECK_MSG( tool, false, _T("drop down message for unknown tool") );
- LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
- int id = (int)ttText->hdr.idFrom;
+ wxMenu * const menu = tool->GetDropdownMenu();
+ if ( !menu )
+ return false;
- wxToolBarToolBase *tool = FindById(id);
- if ( !tool )
- return false;
+ // Display popup menu below button
+ RECT r;
+ if (::SendMessage(GetHwnd(), TB_GETITEMRECT, GetToolPos(tbhdr->iItem), (LPARAM)&r))
+ PopupMenu(menu, r.left, r.bottom);
+
+ return true;
+ }
+
+
+ if( !HasFlag(wxTB_NO_TOOLTIPS) )
+ {
+#if wxUSE_TOOLTIPS
+ // First check if this applies to us
+
+ // the tooltips control created by the toolbar is sometimes Unicode, even
+ // 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;
+
+ HWND toolTipWnd = (HWND)::SendMessage(GetHwnd(), TB_GETTOOLTIPS, 0, 0);
+ if ( toolTipWnd != hdr->hwndFrom )
+ return false;
+
+ LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
+ int id = (int)ttText->hdr.idFrom;
- return HandleTooltipNotify(code, lParam, tool->GetShortHelp());
+ wxToolBarToolBase *tool = FindById(id);
+ if ( tool )
+ return HandleTooltipNotify(code, lParam, tool->GetShortHelp());
#else
- wxUnusedVar(lParam);
+ wxUnusedVar(lParam);
+#endif
+ }
return false;
-#endif
}
// ----------------------------------------------------------------------------
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;
- }
- // if comctl32 version < 4.71 wxToolBar95 adds dummy spacers
-#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 )
+ // when TB_SETBUTTONINFO is available (both during compile- and run-time),
+ // we don't use the dummy separators hack
+#ifdef TB_SETBUTTONINFO
if ( wxApp::GetComCtl32Version() >= 471 )
{
return m_tools.Item((size_t)index)->GetData();
}
else
-#endif
+#endif // TB_SETBUTTONINFO
{
return GetItemSkippingDummySpacers( m_tools, (size_t) index );
}
void wxToolBar::UpdateSize()
{
- // the toolbar size changed
+ wxPoint pos = GetPosition();
::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
-
- // we must also refresh the frame after the toolbar size (possibly) changed
+ if (pos != GetPosition())
+ Move(pos);
+
+ // 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();
}
// toolbar styles
// ---------------------------------------------------------------------------
+// get the TBSTYLE of the given toolbar window
+long wxToolBar::GetMSWToolbarStyle() const
+{
+ return ::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L);
+}
+
void wxToolBar::SetWindowStyleFlag(long style)
{
// the style bits whose changes force us to recreate the toolbar
wxFAIL_MSG( _T("not implemented") );
}
+void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
+{
+ wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+ if ( tool )
+ {
+ wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+ tool->SetNormalBitmap(bitmap);
+ Realize();
+ }
+}
+
+void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
+{
+ wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+ if ( tool )
+ {
+ wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+ tool->SetDisabledBitmap(bitmap);
+ Realize();
+ }
+}
+
// ----------------------------------------------------------------------------
// event handlers
// ----------------------------------------------------------------------------
void wxToolBar::OnMouseEvent(wxMouseEvent& event)
{
- if (event.Leaving() && m_pInTool)
+ if ( event.Leaving() )
{
- OnMouseEnter( -1 );
+ if ( m_pInTool )
+ {
+ OnMouseEnter(wxID_ANY);
+ m_pInTool = NULL;
+ }
+
event.Skip();
return;
}
if ( event.RightDown() )
{
// find the tool under the mouse
- wxCoord x,y;
+ wxCoord x = 0, y = 0;
event.GetPosition(&x, &y);
wxToolBarToolBase *tool = FindToolForPosition(x, y);
// colour: for example, when it must blend in with a notebook page.
void wxToolBar::OnEraseBackground(wxEraseEvent& event)
{
- wxColour bgCol = GetBackgroundColour();
- if (!bgCol.Ok())
+ RECT rect = wxGetClientRect(GetHwnd());
+ HDC hdc = GetHdcOf((*event.GetDC()));
+
+ int majorVersion, minorVersion;
+ wxGetOsVersion(& majorVersion, & minorVersion);
+
+#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 ( !UseBgCol() && !GetParent()->UseBgCol() )
{
- event.Skip();
- return;
+ wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
+ if ( theme )
+ {
+ HRESULT
+ hr = theme->DrawThemeParentBackground(GetHwnd(), hdc, &rect);
+ if ( hr == S_OK )
+ return;
+
+ // it can also return S_FALSE which seems to simply say that it
+ // didn't draw anything but no error really occurred
+ if ( FAILED(hr) )
+ wxLogApiError(_T("DrawThemeParentBackground(toolbar)"), hr);
+ }
}
- // 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
+ // Only draw a rebar theme on Vista, since it doesn't jive so well with XP
+ if ( !UseBgCol() && majorVersion >= 6 )
+ {
+ wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
+ if ( theme )
+ {
+ wxUxThemeHandle hTheme(this, L"REBAR");
- RECT rect;
- ::GetClientRect(GetHwnd(), &rect);
+ RECT r;
+ wxRect rect = GetClientRect();
+ wxCopyRectToRECT(rect, r);
- HBRUSH hBrush = ::CreateSolidBrush(wxColourToRGB(bgCol));
+ HRESULT hr = theme->DrawThemeBackground(hTheme, hdc, 0, 0, & r, NULL);
+ if ( hr == S_OK )
+ return;
- HDC hdc = GetHdcOf((*event.GetDC()));
+ // it can also return S_FALSE which seems to simply say that it
+ // didn't draw anything but no error really occurred
+ if ( FAILED(hr) )
+ wxLogApiError(_T("DrawThemeParentBackground(toolbar)"), hr);
+ }
+ }
-#ifndef __WXWINCE__
- int mode = ::SetMapMode(hdc, MM_TEXT);
-#endif
+#endif // wxUSE_UXTHEME
- ::FillRect(hdc, &rect, hBrush);
- ::DeleteObject(hBrush);
+ if ( UseBgCol() || (GetMSWToolbarStyle() & TBSTYLE_TRANSPARENT) )
+ {
+ // 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()));
-#ifndef __WXWINCE__
- ::SetMapMode(hdc, mode);
-#endif
+ wxCHANGE_HDC_MAP_MODE(hdc, MM_TEXT);
+ ::FillRect(hdc, &rect, hBrush);
+ }
+ else // we have no non default background colour
+ {
+ // let the system do it for us
+ event.Skip();
+ }
}
bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
{
int w, h;
- if ( GetWindowStyle() & wxTB_VERTICAL )
+ if ( IsVertical() )
{
w = r.right - r.left;
if ( m_maxRows )
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;
- }
+
+ wxSize clientSize = GetClientSize();
+ int majorVersion, minorVersion;
+ wxGetOsVersion(& majorVersion, & minorVersion);
// 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);
// otherwise
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
- wxToolBarToolBase *tool = node->GetData();
+ wxToolBarTool *tool = (wxToolBarTool*)node->GetData();
if ( tool->IsControl() )
{
// get the control rect in our client coords
wxControl *control = tool->GetControl();
+ wxStaticText *staticText = tool->GetStaticText();
wxRect rectCtrl = control->GetRect();
+ wxRect rectStaticText(0,0,0,0);
+ if ( staticText )
+ {
+ rectStaticText = staticText->GetRect();
+ }
// iterate over all buttons
TBBUTTON tbb;
// does it intersect the control?
wxRect rectItem;
wxCopyRECTToRect(r, rectItem);
- if ( rectCtrl.Intersects(rectItem) )
+ if ( rectCtrl.Intersects(rectItem) || (staticText && rectStaticText.Intersects(rectItem)))
{
// yes, do erase it!
- dc.DrawRectangle(rectItem);
+ bool haveRefreshed = false;
+
+#if wxUSE_UXTHEME
+ if ( !UseBgCol() && !GetParent()->UseBgCol() )
+ {
+ // Don't use DrawThemeBackground
+ }
+ else if ( !UseBgCol() && majorVersion >= 6 )
+ {
+ wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
+ if ( theme )
+ {
+ wxUxThemeHandle hTheme(this, L"REBAR");
+
+ RECT clipRect = r;
+
+ // Draw the whole background since the pattern may be position sensitive;
+ // but clip it to the area of interest.
+ r.left = 0;
+ r.right = clientSize.x;
+ r.top = 0;
+ r.bottom = clientSize.y;
+
+ HRESULT hr = theme->DrawThemeBackground(hTheme, (HDC) dc.GetHDC(), 0, 0, & r, & clipRect);
+ if ( hr == S_OK )
+ haveRefreshed = true;
+ }
+ }
+#endif
+
+ if (!haveRefreshed)
+ dc.DrawRectangle(rectItem);
+ }
+
+ if ( rectCtrl.Intersects(rectItem) )
+ {
// Necessary in case we use a no-paint-on-size
// style in the parent: the controls can disappear
control->Refresh(false);
}
+
+ if ( staticText && rectStaticText.Intersects(rectItem) )
+ {
+ // Necessary in case we use a no-paint-on-size
+ // style in the parent: the controls can disappear
+ staticText->Refresh(false);
+ }
}
}
}
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 )
+ // has the current tool changed?
+ if ( tool != m_pInTool )
{
m_pInTool = tool;
- OnMouseEnter( tool->GetId() );
+ OnMouseEnter(tool ? tool->GetId() : wxID_ANY);
}
}
if ( HandlePaint(wParam, lParam) )
return 0;
#endif
+
+ default:
+ break;
}
return wxControl::MSWWindowProc(nMsg, wParam, lParam);
// private functions
// ----------------------------------------------------------------------------
+#ifdef wxREMAP_BUTTON_COLOURS
+
WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
{
MemoryHDC hdcMem;
abs(GetGValue(pixel) - GetGValue(col)) < 10 &&
abs(GetBValue(pixel) - GetBValue(col)) < 10 )
{
- ::SetPixel(hdcMem, i, j, cmap[k].to);
+ if ( cmap[k].to != pixel )
+ ::SetPixel(hdcMem, i, j, cmap[k].to);
break;
}
}
}
return bitmap;
-
- // 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"));
-
- return bitmap;
- }
-
- // create the target bitmap
- HBITMAP hbmpDst = ::CreateCompatibleBitmap(hdcDst, width, height);
- if ( !hbmpDst )
- {
- wxLogLastError(_T("CreateCompatibleBitmap"));
-
- return bitmap;
- }
-
- // create the monochrome mask bitmap
- HBITMAP hbmpMask = ::CreateBitmap(width, height, 1, 1, 0);
- if ( !hbmpMask )
- {
- wxLogLastError(_T("CreateBitmap(mono)"));
-
- ::DeleteObject(hbmpDst);
-
- return bitmap;
- }
-
- SelectInHDC bmpInDst(hdcDst, hbmpDst),
- bmpInMask(hdcMask, hbmpMask);
-
- // for each colour:
- for ( n = 0; n < NUM_OF_MAPPED_COLOURS; n++ )
- {
- // create the mask for this colour
- ::SetBkColor(hdcMem, ColorMap[n].from);
- ::BitBlt(hdcMask, 0, 0, width, height, hdcMem, 0, 0, SRCCOPY);
-
- // 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));
-
- (void)::SelectObject(hdcDst, hbrOld);
- ::DeleteObject(hbr);
- }
-
- ::DeleteObject((HBITMAP)bitmap);
-
- return (WXHBITMAP)hbmpDst;
-#endif // 0
}
-#endif // wxUSE_TOOLBAR && Win95
+#endif // wxREMAP_BUTTON_COLOURS
+#endif // wxUSE_TOOLBAR
projects / wxWidgets.git / blobdiff