/////////////////////////////////////////////////////////////////////////////
-// Name: msw/tbar95.cpp
+// Name: src/msw/tbar95.cpp
// Purpose: wxToolBar
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #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 && defined(__WIN95__) && wxUSE_TOOLBAR_NATIVE
-
-#include "wx/toolbar.h"
-
-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
- #include "malloc.h"
-#endif
+#include "wx/sysopt.h"
+#include "wx/dcclient.h"
#include "wx/msw/private.h"
+#include "wx/msw/dc.h"
-#ifndef __TWIN32__
-
-#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
- #include <commctrl.h>
-#else
- #include "wx/msw/gnuwin32/extra.h"
+#if wxUSE_UXTHEME
+#include "wx/msw/uxtheme.h"
#endif
-#endif // __TWIN32__
-
-#include "wx/msw/dib.h"
-#include "wx/app.h" // for GetComCtl32Version
-
-#if defined(__MWERKS__) && defined(__WXMSW__)
-// including <windef.h> 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
-// ----------------------------------------------------------------------------
-
-// wxWindows 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
+// 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
#ifndef TBSTYLE_FLAT
#define TBSTYLE_LIST 0x1000
#define TBSTYLE_FLAT 0x0800
+#endif
+
+#ifndef TBSTYLE_TRANSPARENT
#define TBSTYLE_TRANSPARENT 0x8000
#endif
+#ifndef TBSTYLE_TOOLTIPS
+ #define TBSTYLE_TOOLTIPS 0x0100
+#endif
+
// Messages
#ifndef TB_GETSTYLE
#define TB_SETSTYLE (WM_USER + 56)
#define TB_HITTEST (WM_USER + 69)
#endif
+#ifndef TB_GETMAXSIZE
+ #define TB_GETMAXSIZE (WM_USER + 83)
+#endif
+
// 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
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
+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
+*/
BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
EVT_SYS_COLOUR_CHANGED(wxToolBar::OnSysColourChanged)
+ EVT_ERASE_BACKGROUND(wxToolBar::OnEraseBackground)
END_EVENT_TABLE()
// ----------------------------------------------------------------------------
public:
wxToolBarTool(wxToolBar *tbar,
int id,
- const wxBitmap& bitmap1,
- const wxBitmap& bitmap2,
- bool toggle,
+ const wxString& label,
+ const wxBitmap& bmpNormal,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
wxObject *clientData,
- const wxString& shortHelpString,
- const wxString& longHelpString)
- : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
- clientData, shortHelpString, longHelpString)
+ const wxString& shortHelp,
+ const wxString& longHelp)
+ : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
+ 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 )
+ return;
+
+ 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
// ----------------------------------------------------------------------------
wxToolBarToolBase *wxToolBar::CreateTool(int id,
- const wxBitmap& bitmap1,
- const wxBitmap& bitmap2,
- bool toggle,
+ const wxString& label,
+ const wxBitmap& bmpNormal,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
wxObject *clientData,
- const wxString& shortHelpString,
- const wxString& longHelpString)
+ const wxString& shortHelp,
+ const wxString& longHelp)
{
- return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle,
- clientData, shortHelpString, longHelpString);
+ return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
+ 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);
}
// ----------------------------------------------------------------------------
void wxToolBar::Init()
{
m_hBitmap = 0;
+ m_disabledImgList = NULL;
m_nButtons = 0;
m_defaultWidth = DEFAULTBITMAPX;
m_defaultHeight = DEFAULTBITMAPY;
- m_pInTool = 0;
+ m_pInTool = NULL;
}
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;
+ return false;
- // prepare flags
- DWORD msflags = 0; // WS_VISIBLE | WS_CHILD always included
+ FixupStyle();
- if ( style & wxCLIP_SIBLINGS )
- msflags |= WS_CLIPSIBLINGS;
+ // MSW-specific initialisation
+ if ( !MSWCreateToolbar(pos, size) )
+ return false;
-#ifdef TBSTYLE_TOOLTIPS
- msflags |= TBSTYLE_TOOLTIPS;
-#endif
+ wxSetCCUnicodeFormat(GetHwnd());
- if (style & wxTB_FLAT)
+ // 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 )
{
- // static as it doesn't change during the program lifetime
- static int s_verComCtl = wxTheApp->GetComCtl32Version();
+ LRESULT style = GetMSWToolbarStyle();
- // 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 )
- {
- msflags |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
- }
+ if ( !(style & TBSTYLE_FLAT) )
+ ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, style | TBSTYLE_FLAT);
}
+#endif // wxUSE_UXTHEME
- // MSW-specific initialisation
- if ( !wxControl::MSWCreateControl(TOOLBARCLASSNAME, msflags) )
- return FALSE;
+ return true;
+}
+
+bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size)
+{
+ if ( !MSWCreateControl(TOOLBARCLASSNAME, wxEmptyString, pos, size) )
+ return false;
// toolbar-specific post initialisation
::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
- // set up the colors and fonts
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
- SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+#ifdef TB_SETEXTENDEDSTYLE
+ if ( wxApp::GetComCtl32Version() >= 471 )
+ ::SendMessage(GetHwnd(), TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS);
+#endif
- // position it
- int x = pos.x;
- int y = pos.y;
- int width = size.x;
- int height = size.y;
+ return true;
+}
- if (width <= 0)
- width = 100;
- if (height <= 0)
- height = m_defaultHeight;
- if (x < 0)
- x = 0;
- if (y < 0)
- y = 0;
+void wxToolBar::Recreate()
+{
+ const HWND hwndOld = GetHwnd();
+ if ( !hwndOld )
+ {
+ // we haven't been created yet, no need to recreate
+ return;
+ }
+
+ // get the position and size before unsubclassing the old toolbar
+ const wxPoint pos = GetPosition();
+ const wxSize size = GetSize();
+
+ UnsubclassWin();
+
+ if ( !MSWCreateToolbar(pos, size) )
+ {
+ // what can we do?
+ wxFAIL_MSG( _T("recreating the toolbar failed") );
+
+ return;
+ }
+
+ // reparent all our children under the new toolbar
+ for ( wxWindowList::compatibility_iterator node = m_children.GetFirst();
+ node;
+ node = node->GetNext() )
+ {
+ wxWindow *win = node->GetData();
+ if ( !win->IsTopLevel() )
+ ::SetParent(GetHwndOf(win), GetHwnd());
+ }
- SetSize(x, y, width, height);
+ // only destroy the old toolbar now --
+ // after all the children had been reparented
+ ::DestroyWindow(hwndOld);
- return TRUE;
+ // it is for the old bitmap control and can't be used with the new one
+ if ( m_hBitmap )
+ {
+ ::DeleteObject((HBITMAP) m_hBitmap);
+ m_hBitmap = 0;
+ }
+
+ if ( m_disabledImgList )
+ {
+ delete m_disabledImgList;
+ m_disabledImgList = NULL;
+ }
+
+ Realize();
}
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;
+}
+
+wxSize wxToolBar::DoGetBestSize() const
+{
+ wxSize sizeBest;
+
+ SIZE size;
+ if ( !::SendMessage(GetHwnd(), TB_GETMAXSIZE, 0, (LPARAM)&size) )
+ {
+ // maybe an old (< 0x400) Windows version? try to approximate the
+ // toolbar size ourselves
+ sizeBest = GetToolSize();
+ sizeBest.y += 2 * ::GetSystemMetrics(SM_CYBORDER); // Add borders
+ sizeBest.x *= GetToolsCount();
+
+ // reverse horz and vertical components if necessary
+ if ( IsVertical() )
+ {
+ int t = sizeBest.x;
+ sizeBest.x = sizeBest.y;
+ sizeBest.y = t;
+ }
+ }
+ else
+ {
+ sizeBest.x = size.cx;
+ 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;
+}
+
+WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+ // toolbars never have border, giving one to them results in broken
+ // appearance
+ WXDWORD msStyle = wxControl::MSWGetStyle
+ (
+ (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
+ );
+
+ 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 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 )
+ msStyle |= CCS_NODIVIDER;
+
+ if ( style & wxTB_NOALIGN )
+ msStyle |= CCS_NOPARENTALIGN;
+
+ if ( style & wxTB_VERTICAL )
+ msStyle |= CCS_VERT;
+
+ if( style & wxTB_BOTTOM )
+ msStyle |= CCS_BOTTOM;
+
+ if ( style & wxTB_RIGHT )
+ msStyle |= CCS_RIGHT;
+
+ return msStyle;
}
// ----------------------------------------------------------------------------
// adding/removing tools
// ----------------------------------------------------------------------------
-bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
- wxToolBarToolBase *tool)
+bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
{
// nothing special to do here - we really create the toolbar buttons in
// Realize() later
tool->Attach(this);
- return TRUE;
+ InvalidateBestSize();
+ return true;
}
bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
// first determine the position of the first button to delete: it may be
// different from pos if we use several separators to cover the space used
// by a control
- wxToolBarToolsList::Node *node;
+ wxToolBarToolsList::compatibility_iterator node;
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
wxToolBarToolBase *tool2 = node->GetData();
}
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
{
wxLogLastError(wxT("TB_DELETEBUTTON"));
- return FALSE;
+ return false;
}
}
// 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, -1);
+ control->Move(x - width, wxDefaultCoord);
+
+ wxStaticText* staticText = tool2->GetStaticText();
+ staticText->Move(x - width, wxDefaultCoord);
}
}
- return TRUE;
+ 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 ( wxApp::GetComCtl32Version() >= 470 )
+ {
+ // search for the first disabled button img in the toolbar, if any
+ for ( wxToolBarToolsList::compatibility_iterator
+ node = m_tools.GetFirst(); node; node = node->GetNext() )
+ {
+ wxToolBarToolBase *tool = node->GetData();
+ wxBitmap bmpDisabled = tool->GetDisabledBitmap();
+ if ( bmpDisabled.Ok() )
+ {
+ m_disabledImgList = new wxImageList
+ (
+ m_defaultWidth,
+ m_defaultHeight,
+ bmpDisabled.GetMask() != NULL,
+ GetToolsCount()
+ );
+ break;
+ }
+ }
+
+ // we don't have any disabled bitmaps
+ }
}
bool wxToolBar::Realize()
{
- size_t nTools = GetToolsCount();
+ const size_t nTools = GetToolsCount();
if ( nTools == 0 )
- {
// nothing to do
- return TRUE;
- }
+ return true;
- bool isVertical = (GetWindowStyle() & wxTB_VERTICAL) != 0;
+#ifdef wxREMAP_BUTTON_COLOURS
+ // don't change the values of these constants, they can be set from the
+ // user code via wxSystemOptions
+ enum
+ {
+ 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++ )
+ {
+ if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, 0, 0) )
+ {
+ wxLogDebug(wxT("TB_DELETEBUTTON failed"));
+ }
+ }
// First, add the bitmap: we use one bitmap for all toolbar buttons
// ----------------------------------------------------------------
- // if we already have a bitmap, we'll replace the existing one - otherwise
- // we'll install a new one
- HBITMAP oldToolBarBitmap = (HBITMAP)m_hBitmap;
-
- int totalBitmapWidth = (int)(m_defaultWidth * nTools);
- int totalBitmapHeight = (int)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);
- dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH);
- dcAllButtons.Clear();
-
- m_hBitmap = bitmap.GetHBITMAP();
- HBITMAP hBitmap = (HBITMAP)m_hBitmap;
-#else // !USE_BITMAP_MASKS
- HBITMAP hBitmap = ::CreateCompatibleBitmap(ScreenHDC(),
- totalBitmapWidth,
- totalBitmapHeight);
- if ( !hBitmap )
- {
- wxLogLastError(_T("CreateCompatibleBitmap"));
+ wxToolBarToolsList::compatibility_iterator node;
+ int bitmapId = 0;
- return FALSE;
+ wxSize sizeBmp;
+ if ( HasFlag(wxTB_NOICONS) )
+ {
+ // no icons, don't leave space for them
+ sizeBmp.x =
+ sizeBmp.y = 0;
}
+ else // do show icons
+ {
+ // if we already have a bitmap, we'll replace the existing one --
+ // otherwise we'll install a new one
+ HBITMAP oldToolBarBitmap = (HBITMAP)m_hBitmap;
- m_hBitmap = (WXHBITMAP)hBitmap;
+ sizeBmp.x = m_defaultWidth;
+ sizeBmp.y = m_defaultHeight;
- HDC memoryDC = ::CreateCompatibleDC(NULL);
- HBITMAP oldBitmap = (HBITMAP) ::SelectObject(memoryDC, hBitmap);
+ const wxCoord totalBitmapWidth = m_defaultWidth *
+ wx_truncate_cast(wxCoord, nTools),
+ totalBitmapHeight = m_defaultHeight;
- HDC memoryDC2 = ::CreateCompatibleDC(NULL);
-#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
+ // Create a bitmap and copy all the tool bitmaps into it
+ wxMemoryDC dcAllButtons;
+ wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
+ dcAllButtons.SelectObject(bitmap);
- // the button position
- wxCoord x = 0;
+#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__
+ wxColour(0xc0, 0xc0, 0xc0)
+#else // !__WXWINCE__
+ GetBackgroundColour()
+#endif // __WXWINCE__/!__WXWINCE__
+ ));
+ dcAllButtons.Clear();
+ }
- // the number of buttons (not separators)
- int nButtons = 0;
+ m_hBitmap = bitmap.GetHBITMAP();
+ HBITMAP hBitmap = (HBITMAP)m_hBitmap;
- wxToolBarToolsList::Node *node = m_tools.GetFirst();
- while ( node )
- {
- wxToolBarToolBase *tool = node->GetData();
- if ( tool->IsButton() )
+#ifdef wxREMAP_BUTTON_COLOURS
+ if ( remapValue == Remap_Bg )
+ {
+ dcAllButtons.SelectObject(wxNullBitmap);
+
+ // Even if we're not remapping the bitmap
+ // content, we still have to remap the background.
+ hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+ totalBitmapWidth, totalBitmapHeight);
+
+ dcAllButtons.SelectObject(bitmap);
+ }
+#endif // wxREMAP_BUTTON_COLOURS
+
+ // the button position
+ wxCoord x = 0;
+
+ // the number of buttons (not separators)
+ int nButtons = 0;
+
+ CreateDisabledImageList();
+ for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
- const wxBitmap& bmp = tool->GetBitmap1();
- if ( bmp.Ok() )
+ wxToolBarToolBase *tool = node->GetData();
+ if ( tool->IsButton() )
{
-#if USE_BITMAP_MASKS
- // notice the last parameter: do use mask
- dcAllButtons.DrawBitmap(tool->GetBitmap1(), x, 0, TRUE);
-#else // !USE_BITMAP_MASKS
- HBITMAP hbmp = GetHbitmapOf(bmp);
- HBITMAP oldBitmap2 = (HBITMAP)::SelectObject(memoryDC2, hbmp);
- if ( !BitBlt(memoryDC, x, 0, m_defaultWidth, m_defaultHeight,
- memoryDC2, 0, 0, SRCCOPY) )
+ const wxBitmap& bmp = tool->GetNormalBitmap();
+
+ const int w = bmp.GetWidth();
+ const int h = bmp.GetHeight();
+
+ if ( bmp.Ok() )
{
- wxLogLastError(wxT("BitBlt"));
+ int xOffset = wxMax(0, (m_defaultWidth - w)/2);
+ int yOffset = wxMax(0, (m_defaultHeight - h)/2);
+
+ // notice the last parameter: do use mask
+ dcAllButtons.DrawBitmap(bmp, x + xOffset, yOffset, true);
+ }
+ else
+ {
+ wxFAIL_MSG( _T("invalid tool button bitmap") );
}
- ::SelectObject(memoryDC2, oldBitmap2);
-#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
- }
- else
- {
- wxFAIL_MSG( _T("invalid tool button bitmap") );
- }
+ // also deal with disabled bitmap if we want to use them
+ if ( m_disabledImgList )
+ {
+ wxBitmap bmpDisabled = tool->GetDisabledBitmap();
+#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 = bmp.ConvertToImage().ConvertToGreyscale();
+
+#ifdef wxREMAP_BUTTON_COLOURS
+ if ( remapValue == Remap_Buttons )
+ {
+ // we need to have light grey background colour for
+ // MapBitmap() to work correctly
+ for ( int y = 0; y < h; y++ )
+ {
+ 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
+
+#ifdef wxREMAP_BUTTON_COLOURS
+ if ( remapValue == Remap_Buttons )
+ MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
+#endif // wxREMAP_BUTTON_COLOURS
+
+ m_disabledImgList->Add(bmpDisabled);
+ }
- // still inc width and number of buttons because otherwise the
- // subsequent buttons will all be shifted which is rather confusing
- // (and like this you'd see immediately which bitmap was bad)
- x += m_defaultWidth;
- nButtons++;
+ // still inc width and number of buttons because otherwise the
+ // subsequent buttons will all be shifted which is rather confusing
+ // (and like this you'd see immediately which bitmap was bad)
+ x += m_defaultWidth;
+ nButtons++;
+ }
}
- node = node->GetNext();
- }
-
-#if USE_BITMAP_MASKS
- dcAllButtons.SelectObject(wxNullBitmap);
+ dcAllButtons.SelectObject(wxNullBitmap);
- // don't delete this HBITMAP!
- bitmap.SetHBITMAP(0);
-#else // !USE_BITMAP_MASKS
- ::SelectObject(memoryDC, oldBitmap);
- ::DeleteDC(memoryDC);
- ::DeleteDC(memoryDC2);
-#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
+ // don't delete this HBITMAP!
+ bitmap.SetHBITMAP(0);
- // Map to system colours
- hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
- totalBitmapWidth, totalBitmapHeight);
-
- int bitmapId = 0;
+#ifdef wxREMAP_BUTTON_COLOURS
+ if ( remapValue == Remap_Buttons )
+ {
+ // Map to system colours
+ hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+ totalBitmapWidth, totalBitmapHeight);
+ }
+#endif // wxREMAP_BUTTON_COLOURS
- bool addBitmap = TRUE;
+ bool addBitmap = true;
- if ( oldToolBarBitmap )
- {
-#ifdef TB_REPLACEBITMAP
- if ( wxTheApp->GetComCtl32Version() >= 400 )
+ if ( oldToolBarBitmap )
{
- TBREPLACEBITMAP replaceBitmap;
- replaceBitmap.hInstOld = NULL;
- replaceBitmap.hInstNew = NULL;
- replaceBitmap.nIDOld = (UINT) oldToolBarBitmap;
- replaceBitmap.nIDNew = (UINT) hBitmap;
- replaceBitmap.nButtons = nButtons;
- if ( !::SendMessage(GetHwnd(), TB_REPLACEBITMAP,
- 0, (LPARAM) &replaceBitmap) )
+#ifdef TB_REPLACEBITMAP
+ if ( wxApp::GetComCtl32Version() >= 400 )
{
- wxFAIL_MSG(wxT("Could not replace the old bitmap"));
- }
+ TBREPLACEBITMAP replaceBitmap;
+ replaceBitmap.hInstOld = NULL;
+ replaceBitmap.hInstNew = NULL;
+ replaceBitmap.nIDOld = (UINT_PTR)oldToolBarBitmap;
+ replaceBitmap.nIDNew = (UINT_PTR)hBitmap;
+ replaceBitmap.nButtons = nButtons;
+ if ( !::SendMessage(GetHwnd(), TB_REPLACEBITMAP,
+ 0, (LPARAM) &replaceBitmap) )
+ {
+ wxFAIL_MSG(wxT("Could not replace the old bitmap"));
+ }
- ::DeleteObject(oldToolBarBitmap);
+ ::DeleteObject(oldToolBarBitmap);
- // already done
- addBitmap = FALSE;
- }
- else
+ // already done
+ addBitmap = false;
+ }
+ else
#endif // TB_REPLACEBITMAP
- {
- // 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;
+ {
+ // 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;
- bitmapId = m_nButtons;
+ bitmapId = m_nButtons;
+ }
}
- // Now delete all the buttons
- for ( size_t pos = 0; pos < m_nButtons; pos++ )
+ if ( addBitmap ) // no old bitmap or we can't replace it
{
- if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, 0, 0) )
+ TBADDBITMAP addBitmap;
+ addBitmap.hInst = 0;
+ addBitmap.nID = (UINT_PTR)hBitmap;
+ if ( ::SendMessage(GetHwnd(), TB_ADDBITMAP,
+ (WPARAM) nButtons, (LPARAM)&addBitmap) == -1 )
{
- wxLogDebug(wxT("TB_DELETEBUTTON failed"));
+ wxFAIL_MSG(wxT("Could not add bitmap to toolbar"));
}
}
+ // 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)hil);
+
+ // delete previous image list if any
+ if ( oldImageList )
+ ::DeleteObject(oldImageList);
+ }
}
- if ( addBitmap ) // no old bitmap or we can't replace it
+ // don't call SetToolBitmapSize() as we don't want to change the values of
+ // m_defaultWidth/Height
+ if ( !::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0,
+ MAKELONG(sizeBmp.x, sizeBmp.y)) )
{
- TBADDBITMAP addBitmap;
- addBitmap.hInst = 0;
- addBitmap.nID = (UINT) hBitmap;
- if ( ::SendMessage(GetHwnd(), TB_ADDBITMAP,
- (WPARAM) nButtons, (LPARAM)&addBitmap) == -1 )
- {
- wxFAIL_MSG(wxT("Could not add bitmap to toolbar"));
- }
+ wxLogLastError(_T("TB_SETBITMAPSIZE"));
}
// Next add the buttons and separators
// this array will hold the indices of all controls in the toolbar
wxArrayInt controlIds;
+ bool lastWasRadio = false;
int i = 0;
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
wxToolBarToolBase *tool = node->GetData();
- // don't add separators to the vertical toolbar - looks ugly
- if ( isVertical && tool->IsSeparator() )
+ // don't add separators to the vertical toolbar with old comctl32.dll
+ // versions as they didn't handle this properly
+ if ( IsVertical() && tool->IsSeparator() &&
+ wxApp::GetComCtl32Version() <= 472 )
+ {
continue;
+ }
TBBUTTON& button = buttons[i];
wxZeroMemory(button);
+ bool isRadio = false;
switch ( tool->GetStyle() )
{
case wxTOOL_STYLE_CONTROL:
break;
case wxTOOL_STYLE_BUTTON:
- button.iBitmap = bitmapId;
+ if ( !HasFlag(wxTB_NOICONS) )
+ button.iBitmap = bitmapId;
+
+ if ( HasFlag(wxTB_TEXT) )
+ {
+ const wxString& label = tool->GetLabel();
+ if ( !label.empty() )
+ button.iString = (INT_PTR)label.wx_str();
+ }
+
button.idCommand = tool->GetId();
if ( tool->IsEnabled() )
if ( tool->IsToggled() )
button.fsState |= TBSTATE_CHECKED;
- button.fsStyle = tool->CanBeToggled() ? TBSTYLE_CHECK
- : TBSTYLE_BUTTON;
+ switch ( tool->GetKind() )
+ {
+ case wxITEM_RADIO:
+ button.fsStyle = TBSTYLE_CHECKGROUP;
+
+ if ( !lastWasRadio )
+ {
+ // the first item in the radio group is checked by
+ // default to be consistent with wxGTK and the menu
+ // radio items
+ button.fsState |= TBSTATE_CHECKED;
+
+ if (tool->Toggle(true))
+ {
+ DoToggleTool(tool, true);
+ }
+ }
+ else if ( tool->IsToggled() )
+ {
+ wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
+ int prevIndex = i - 1;
+ while ( nodePrev )
+ {
+ TBBUTTON& prevButton = buttons[prevIndex];
+ wxToolBarToolBase *tool = nodePrev->GetData();
+ if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
+ break;
+
+ if ( tool->Toggle(false) )
+ DoToggleTool(tool, false);
+
+ prevButton.fsState &= ~TBSTATE_CHECKED;
+ nodePrev = nodePrev->GetPrevious();
+ prevIndex--;
+ }
+ }
+
+ isRadio = true;
+ break;
+
+ case wxITEM_CHECK:
+ 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") );
+ button.fsStyle = TBSTYLE_BUTTON;
+ break;
+ }
bitmapId++;
break;
}
+ lastWasRadio = isRadio;
+
i++;
}
- if ( !::SendMessage(GetHwnd(), TB_ADDBUTTONS,
- (WPARAM)i, (LPARAM)buttons) )
+ if ( !::SendMessage(GetHwnd(), TB_ADDBUTTONS, (WPARAM)i, (LPARAM)buttons) )
{
wxLogLastError(wxT("TB_ADDBUTTONS"));
}
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
// 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"));
}
}
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 = -1;
+ int left = wxDefaultCoord;
// TB_SETBUTTONINFO message is only supported by comctl32.dll 4.71+
-#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 )
+#ifdef TB_SETBUTTONINFO
// available in headers, now check whether it is available now
// (during run-time)
- if ( wxTheApp->GetComCtl32Version() >= 471 )
+ if ( wxApp::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) )
+ tbbi.cx = (WORD)size.x;
+ if ( !::SendMessage(GetHwnd(), TB_SETBUTTONINFO,
+ tool->GetId(), (LPARAM)&tbbi) )
{
// the id is probably invalid?
wxLogLastError(wxT("TB_SETBUTTONINFO"));
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"));
}
((wxToolBarTool *)tool)->SetSeparatorsCount(nSeparators);
// adjust the controls width to exactly cover the separators
- control->SetSize((nSeparators + 1)*widthSep, -1);
+ 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(-1, 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
{
- if ( left == -1 )
+ if ( left == wxDefaultCoord )
left = r.left;
top = r.top;
}
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);
}
- return TRUE;
+ 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;
+ return false;
+
+ bool toggled = false; // just to suppress warnings
if ( tool->CanBeToggled() )
{
LRESULT state = ::SendMessage(GetHwnd(), TB_GETSTATE, id, 0);
- tool->Toggle((state & TBSTATE_CHECKED) != 0);
- }
+ toggled = (state & TBSTATE_CHECKED) != 0;
- bool toggled = tool->IsToggled();
+ // 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;
- // OnLeftClick() can veto the button state change - for buttons which may
- // be toggled only, of couse
- if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )
+ tool->Toggle(toggled);
+ UnToggleRadioGroup(tool);
+ }
+
+ // OnLeftClick() can veto the button state change - for buttons which
+ // may be toggled only, of couse
+ if ( !OnLeftClick(id, toggled) && tool->CanBeToggled() )
{
// revert back
- toggled = !toggled;
- tool->SetToggle(toggled);
+ tool->Toggle(!toggled);
- ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(toggled, 0));
+ ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(!toggled, 0));
}
- return TRUE;
+ return true;
}
bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
WXLPARAM lParam,
WXLPARAM *WXUNUSED(result))
{
- // 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
- int code = (int)hdr->code;
- if ( (code != TTN_NEEDTEXTA) && (code != TTN_NEEDTEXTW) )
- return FALSE;
+ wxCommandEvent evt(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, tbhdr->iItem);
+ if ( HandleWindowEvent(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;
+ }
- const wxString& help = tool->GetShortHelp();
- if ( !help.IsEmpty() )
+ if( !HasFlag(wxTB_NO_TOOLTIPS) )
{
- if ( code == TTN_NEEDTEXTA )
- {
- ttText->lpszText = (wxChar *)help.c_str();
- }
- else
- {
-#if wxUSE_UNICODE
- ttText->lpszText = (wxChar *)help.c_str();
+#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;
+
+ wxToolBarToolBase *tool = FindById(id);
+ if ( tool )
+ return HandleTooltipNotify(code, lParam, tool->GetShortHelp());
#else
- // VZ: I don't know why it happens, but the versions of
- // comctl32.dll starting from 4.70 sometimes send TTN_NEEDTEXTW
- // even to ANSI programs (normally, this message is supposed
- // to be sent to Unicode programs only) - hence we need to
- // handle it as well, otherwise no tooltips will be shown in
- // this case
-
- size_t lenAnsi = help.Len();
- #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);
- #endif
-
- // using the pointer of right type avoids us doing all sorts of
- // pointer arithmetics ourselves
- wchar_t *dst = (wchar_t *)ttText->szText,
- *pwz = new wchar_t[lenUnicode + 1];
- mbstowcs(pwz, help, lenAnsi + 1);
- memcpy(dst, pwz, lenUnicode*sizeof(wchar_t));
-
- // put the terminating _wide_ NUL
- dst[lenUnicode] = 0;
-
- delete [] pwz;
+ wxUnusedVar(lParam);
#endif
- }
}
- return TRUE;
+ return false;
}
// ----------------------------------------------------------------------------
{
// TB_GETBUTTONSIZE is supported from version 4.70
#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \
- && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
- if ( wxTheApp->GetComCtl32Version() >= 470 )
+ && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) \
+ && !defined (__DIGITALMARS__)
+ if ( wxApp::GetComCtl32Version() >= 470 )
{
DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);
wxToolBarToolBase *GetItemSkippingDummySpacers(const wxToolBarToolsList& tools,
size_t index )
{
- wxToolBarToolsList::Node* current = tools.GetFirst();
+ wxToolBarToolsList::compatibility_iterator current = tools.GetFirst();
- for ( ; current != 0; current = current->GetNext() )
+ for ( ; current ; current = current->GetNext() )
{
if ( index == 0 )
return current->GetData();
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 )
- if ( wxTheApp->GetComCtl32Version() >= 471 )
+ // 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
- SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
-
- // we must also refresh the frame after the toolbar size (possibly) changed
+ wxPoint pos = GetPosition();
+ ::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
+ 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
+ static const long MASK_NEEDS_RECREATE = wxTB_TEXT | wxTB_NOICONS;
+
+ const long styleOld = GetWindowStyle();
+
+ wxToolBarBase::SetWindowStyleFlag(style);
+
+ // don't recreate an empty toolbar: not only this is unnecessary, but it is
+ // also fatal as we'd then try to recreate the toolbar when it's just being
+ // created
+ if ( GetToolsCount() &&
+ (style & MASK_NEEDS_RECREATE) != (styleOld & MASK_NEEDS_RECREATE) )
+ {
+ // to remove the text labels, simply re-realizing the toolbar is enough
+ // but I don't know of any way to add the text to an existing toolbar
+ // other than by recreating it entirely
+ Recreate();
+ }
+}
+
// ----------------------------------------------------------------------------
// tool state
// ----------------------------------------------------------------------------
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.RightDown())
+ if ( event.Leaving() )
{
- // For now, we don't have an id. Later we could
- // try finding the tool.
- OnRightClick((int)-1, event.GetX(), event.GetY());
+ if ( m_pInTool )
+ {
+ OnMouseEnter(wxID_ANY);
+ m_pInTool = NULL;
+ }
+
+ event.Skip();
+ return;
+ }
+
+ if ( event.RightDown() )
+ {
+ // find the tool under the mouse
+ wxCoord x = 0, y = 0;
+ event.GetPosition(&x, &y);
+
+ wxToolBarToolBase *tool = FindToolForPosition(x, y);
+ OnRightClick(tool ? tool->GetId() : -1, x, y);
}
else
{
}
}
-long wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+// This handler is required to allow the toolbar to be set to a non-default
+// colour: for example, when it must blend in with a notebook page.
+void wxToolBar::OnEraseBackground(wxEraseEvent& event)
{
- if ( nMsg == WM_SIZE )
+ RECT rect = wxGetClientRect(GetHwnd());
+
+ wxDC *dc = event.GetDC();
+ if (!dc) return;
+ wxMSWDCImpl *impl = (wxMSWDCImpl*) dc->GetImpl();
+ HDC hdc = GetHdcOf(*impl);
+
+ 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() )
{
- // calculate our minor dimenstion ourselves - we're confusing the
- // standard logic (TB_AUTOSIZE) with our horizontal toolbars and other
- // hacks
- RECT r;
- if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&r) )
+ wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
+ if ( theme )
{
- int w, h;
+ 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);
+ }
+ }
+
+ // 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 r;
+ wxRect rect = GetClientRect();
+ wxCopyRectToRECT(rect, r);
+
+ HRESULT hr = theme->DrawThemeBackground(hTheme, hdc, 0, 0, & r, NULL);
+ if ( hr == S_OK )
+ return;
- if ( GetWindowStyle() & wxTB_VERTICAL )
+ // 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);
+ }
+ }
+
+#endif // wxUSE_UXTHEME
+
+ // we need to always draw our background under XP, as otherwise it doesn't
+ // appear correctly with some themes (e.g. Zune one)
+ if ( majorVersion == 5 ||
+ 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()));
+
+ 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)
+{
+ // calculate our minor dimension ourselves - we're confusing the standard
+ // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks
+ RECT r;
+ if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&r) )
+ {
+ int w, h;
+
+ if ( IsVertical() )
+ {
+ w = r.right - r.left;
+ if ( m_maxRows )
{
- w = r.right - r.left;
- if ( m_maxRows )
- {
- w *= (m_nButtons + m_maxRows - 1)/m_maxRows;
- }
- h = HIWORD(lParam);
+ w *= (m_nButtons + m_maxRows - 1)/m_maxRows;
}
+ h = HIWORD(lParam);
+ }
+ else
+ {
+ w = LOWORD(lParam);
+ if (HasFlag( wxTB_FLAT ))
+ h = r.bottom - r.top - 3;
else
- {
- w = LOWORD(lParam);
h = r.bottom - r.top;
- if ( m_maxRows )
- {
- h += 6; // FIXME: this is the separator line height...
- h *= m_maxRows;
- }
- }
-
- if ( MAKELPARAM(w, h) != lParam )
+ if ( m_maxRows )
{
- // size really changed
- SetSize(w, h);
+ // FIXME: hardcoded separator line height...
+ h += HasFlag(wxTB_NODIVIDER) ? 4 : 6;
+ h *= m_maxRows;
}
+ }
- // message processed
- return 0;
+ if ( MAKELPARAM(w, h) != lParam )
+ {
+ // size really changed
+ SetSize(w, h);
}
+
+ // message processed
+ return true;
}
- else if ( nMsg == WM_MOUSEMOVE )
+
+ return false;
+}
+
+bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
+{
+ // erase any dummy separators which were used
+ // for aligning the controls if any here
+
+ // first of all, are there any controls at all?
+ wxToolBarToolsList::compatibility_iterator node;
+ for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
- wxCoord x = GET_X_LPARAM(lParam), y = GET_Y_LPARAM(lParam);
- wxToolBarToolBase* tool = FindToolForPosition( x, y );
+ if ( node->GetData()->IsControl() )
+ break;
+ }
- // cursor left current tool
- if( tool != m_pInTool && !tool )
- {
- m_pInTool = 0;
- OnMouseEnter( -1 );
- }
+ if ( !node )
+ // no controls, nothing to erase
+ return false;
+
+ wxSize clientSize = GetClientSize();
+ int majorVersion, minorVersion;
+ wxGetOsVersion(& majorVersion, & minorVersion);
- // cursor entered a tool
- if( tool != m_pInTool && tool )
+ // prepare the DC on which we'll be drawing
+ wxClientDC dc(this);
+ dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
+ dc.SetPen(*wxTRANSPARENT_PEN);
+
+ RECT r;
+ if ( !::GetUpdateRect(GetHwnd(), &r, FALSE) )
+ // nothing to redraw anyhow
+ return false;
+
+ wxRect rectUpdate;
+ wxCopyRECTToRect(r, rectUpdate);
+
+ dc.SetClippingRegion(rectUpdate);
+
+ // draw the toolbar tools, separators &c normally
+ wxControl::MSWWindowProc(WM_PAINT, wParam, lParam);
+
+ // for each control in the toolbar find all the separators intersecting it
+ // and erase them
+ //
+ // NB: this is really the only way to do it as we don't know if a separator
+ // corresponds to a control (i.e. is a dummy one) or a real one
+ // otherwise
+ for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+ {
+ wxToolBarTool *tool = (wxToolBarTool*)node->GetData();
+ if ( tool->IsControl() )
{
- m_pInTool = tool;
- OnMouseEnter( tool->GetId() );
+ // 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;
+ int count = ::SendMessage(GetHwnd(), TB_BUTTONCOUNT, 0, 0);
+ for ( int n = 0; n < count; n++ )
+ {
+ // is it a separator?
+ if ( !::SendMessage(GetHwnd(), TB_GETBUTTON,
+ n, (LPARAM)&tbb) )
+ {
+ wxLogDebug(_T("TB_GETBUTTON failed?"));
+
+ continue;
+ }
+
+ if ( tbb.fsStyle != TBSTYLE_SEP )
+ continue;
+
+ // get the bounding rect of the separator
+ RECT r;
+ if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT,
+ n, (LPARAM)&r) )
+ {
+ wxLogDebug(_T("TB_GETITEMRECT failed?"));
+
+ continue;
+ }
+
+ // does it intersect the control?
+ wxRect rectItem;
+ wxCopyRECTToRect(r, rectItem);
+ if ( rectCtrl.Intersects(rectItem) || (staticText && rectStaticText.Intersects(rectItem)))
+ {
+ // yes, do erase it!
+
+ 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;
+
+ wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
+ HRESULT hr = theme->DrawThemeBackground(hTheme, GetHdcOf(*impl), 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);
+ }
+ }
}
+ }
+
+ return true;
+}
+
+void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
+{
+ wxCoord x = GET_X_LPARAM(lParam),
+ y = GET_Y_LPARAM(lParam);
+ wxToolBarToolBase* tool = FindToolForPosition( x, y );
+
+ // has the current tool changed?
+ if ( tool != m_pInTool )
+ {
+ m_pInTool = tool;
+ OnMouseEnter(tool ? tool->GetId() : wxID_ANY);
+ }
+}
+
+WXLRESULT wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+ switch ( nMsg )
+ {
+ case WM_MOUSEMOVE:
+ // we don't handle mouse moves, so always pass the message to
+ // wxControl::MSWWindowProc (HandleMouseMove just calls OnMouseEnter)
+ HandleMouseMove(wParam, lParam);
+ break;
- // we don't handle mouse moves, so fall through
- // to wxControl::MSWWindowProc
+ case WM_SIZE:
+ if ( HandleSize(wParam, lParam) )
+ return 0;
+ break;
+
+#ifndef __WXWINCE__
+ case WM_PAINT:
+ 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