// 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"
// 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
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.
- // However, the separators can look ugly and distracting, especially between controls,
- // so I'm restoring the test and removing the separators again - JACS
-#if 1
- wxUxThemeEngine *p = wxUxThemeEngine::Get();
- if ( !p || !p->IsThemeActive() )
-#endif
- {
- DWORD dwToolbarStyle;
+ LRESULT style = ::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L);
- 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;
}
::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;
}
}
CacheBestSize(sizeBest);
+
return sizeBest;
}
(style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
);
- // always include this one, it never hurts and setting it later only if we
- // do have tooltips wouldn't work
+ // always include this one, it never hurts and setting it later
+ // only if we do have tooltips wouldn't work
msStyle |= TBSTYLE_TOOLTIPS;
if ( style & (wxTB_FLAT | wxTB_HORZ_LAYOUT) )
// 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 ( 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;
}
}
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 )
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)
+ doRemapBg = doRemap = doTransparent = false;
+
+#ifndef __WXWINCE__
+ int remapValue = (-1);
+ const wxChar *remapOptionStr = wxT("msw.remap");
+ if (wxSystemOptions::HasOption( remapOptionStr ))
+ remapValue = wxSystemOptions::GetOptionInt( remapOptionStr );
+
+ doTransparent = (remapValue == 2);
+ if (!doTransparent)
{
- doRemapBg = doRemap = false;
- doTransparent = true;
- }
- else
- { doRemap = !wxSystemOptions::HasOption(wxT("msw.remap"))
- || wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 1;
+ doRemap = (remapValue != 0);
doRemapBg = !doRemap;
- doTransparent = false;
}
#endif
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 __WXWINCE__
- dcAllButtons.SetBackground(wxBrush(wxColour(192,192,192)));
-#else
+
+#ifndef __WXWINCE__
if (doTransparent)
dcAllButtons.SetBackground(*wxTRANSPARENT_BRUSH);
else
- dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH);
+ dcAllButtons.SetBackground(wxBrush(GetBackgroundColour()));
+#else
+ dcAllButtons.SetBackground(wxBrush(wxColour(192,192,192)));
#endif
dcAllButtons.Clear();
totalBitmapWidth, totalBitmapHeight);
dcAllButtons.SelectObject(bitmap);
-
-
}
#endif // !__WXWINCE__
wxImage imgGreyed;
wxCreateGreyedImage(bmp.ConvertToImage(), imgGreyed);
- // we need to have light grey background colour for
- // MapBitmap() to work correctly
- for ( int y = 0; y < h; y++ )
+ if (doRemap)
{
- 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 // wxUSE_IMAGE
- MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
+ if (doRemap)
+ MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
m_disabledImgList->Add(bmpDisabled);
}
// Map to system colours
hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
totalBitmapWidth, totalBitmapHeight);
-
-
}
bool addBitmap = true;
continue;
}
-
TBBUTTON& button = buttons[i];
wxZeroMemory(button);
{
const wxString& label = tool->GetLabel();
if ( !label.empty() )
- {
button.iString = (int)label.c_str();
- }
}
button.idCommand = tool->GetId();
wxToolBarToolBase *tool = nodePrev->GetData();
if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
break;
-
+
if ( tool->Toggle(false) )
- {
DoToggleTool(tool, false);
- }
+
prevButton.fsState = TBSTATE_ENABLED;
nodePrev = nodePrev->GetPrevious();
prevIndex--;
- }
+ }
}
isRadio = true;
button.fsStyle = TBSTYLE_CHECK;
break;
+ case wxITEM_NORMAL:
+ button.fsStyle = TBSTYLE_BUTTON;
+ break;
+
default:
wxFAIL_MSG( _T("unexpected toolbar button kind") );
- // fall through
-
- case wxITEM_NORMAL:
button.fsStyle = TBSTYLE_BUTTON;
+ break;
}
bitmapId++;
}
wxControl *control = tool->GetControl();
-
wxSize size = control->GetSize();
// the position of the leftmost controls corner
left = 0;
top = y;
- y += height + 2*GetMargins().y;
+ y += height + 2 * GetMargins().y;
}
else // horizontal toolbar
{
if ( !isVertical )
{
if ( m_maxRows == 0 )
- {
// if not set yet, only one row
SetRows(1);
- }
}
else if ( m_nButtons > 0 ) // vertical non empty toolbar
{
if ( m_maxRows == 0 )
- {
// if not set yet, have one column
SetRows(m_nButtons);
- }
}
InvalidateBestSize();
+ SetBestFittingSize();
+ UpdateSize();
+
return true;
}
pt.x = x;
pt.y = y;
int index = (int)::SendMessage(GetHwnd(), TB_HITTEST, 0, (LPARAM)&pt);
+
// MBN: when the point ( x, y ) is close to the toolbar border
// TB_HITTEST returns m_nButtons ( not -1 )
if ( index < 0 || (size_t)index >= m_nButtons )
- {
// it's a separator or there is no tool at all there
return (wxToolBarToolBase *)NULL;
- }
- // 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
- ::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
+ // 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.
- // we must also refresh the frame after the toolbar size (possibly) changed
wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
- if ( frame )
+ if ( frame && frame->GetToolBar() == this )
{
+ // the toolbar size changed
+ ::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
frame->SendSizeEvent();
}
}
bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
{
- // erase any dummy separators which we used for aligning the controls if
- // any here
+ // erase any dummy separators which were used
+ // for aligning the controls if any here
- // first of all, do we have any controls at all?
+ // first of all, are there any controls at all?
wxToolBarToolsList::compatibility_iterator node;
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
}
if ( !node )
- {
// no controls, nothing to erase
return false;
- }
// prepare the DC on which we'll be drawing
wxClientDC dc(this);
RECT r;
if ( !::GetUpdateRect(GetHwnd(), &r, FALSE) )
- {
// nothing to redraw anyhow
return false;
- }
wxRect rectUpdate;
wxCopyRECTToRect(r, rectUpdate);
wxToolBarToolBase* tool = FindToolForPosition( x, y );
// cursor left current tool
- if( tool != m_pInTool && !tool )
+ if ( tool != m_pInTool && !tool )
{
m_pInTool = 0;
OnMouseEnter( -1 );
}
// cursor entered a tool
- if( tool != m_pInTool && tool )
+ if ( tool != m_pInTool && tool )
{
m_pInTool = tool;
OnMouseEnter( tool->GetId() );
if ( HandlePaint(wParam, lParam) )
return 0;
#endif
+
+ default:
+ break;
}
return wxControl::MSWWindowProc(nMsg, wParam, lParam);
#endif // 0
}
-#endif // wxUSE_TOOLBAR && Win95
+#endif // wxUSE_TOOLBAR
projects / wxWidgets.git / blobdiff