cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxToolBar size in wxMSW when not using icons.

Browse Source 
There were several problems when the toolbar style was toggled to not show
icons, fix them by adding missing checks for wxTB_NOICONS style.

Closes #13578.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2014-02-08 14:12:20 +00:00
parent 5b8479e809
commit 6e7ebad658
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/tbarbase.cpp
View File

@ -437,6 +437,12 @@ void wxToolBarBase::ClearTools()
void wxToolBarBase::AdjustToolBitmapSize()
{
if ( HasFlag(wxTB_NOICONS) )
{
SetToolBitmapSize(wxSize(0, 0));
return;
}
const wxSize sizeOrig(m_defaultWidth, m_defaultHeight);
wxSize sizeActual(sizeOrig);

18
src/msw/toolbar.cpp
View File

@ -974,6 +974,16 @@ bool wxToolBar::Realize()
switch ( tool->GetStyle() )
{
case wxTOOL_STYLE_CONTROL:
if ( wxStaticText *staticText = tool->GetStaticText() )
{
// Display control and its label only if buttons have icons
// and texts as otherwise there is not enough room on the
// toolbar to fit the label.
staticText->
Show(HasFlag(wxTB_TEXT) && !HasFlag(wxTB_NOICONS));
}
// Fall through
case wxTOOL_STYLE_SEPARATOR:
if ( tool->IsStretchableSpace() )
{
@ -1127,7 +1137,7 @@ bool wxToolBar::Realize()
wxSize size = control->GetSize();
wxSize staticTextSize;
if ( staticText )
if ( staticText && staticText->IsShown() )
{
staticTextSize = staticText->GetSize();
staticTextSize.y += 3; // margin between control and its label
@ -1464,6 +1474,12 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
void wxToolBar::SetToolBitmapSize(const wxSize& size)
{
// Leave the effective size as (0, 0) if we are not showing bitmaps at all.
wxSize effectiveSize;
if ( !HasFlag(wxTB_NOICONS) )
effectiveSize = size;
wxToolBarBase::SetToolBitmapSize(size);
::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0, MAKELONG(size.x, size.y));