Use equally-sized buttons in wxMSW horizontal toolbars
Only use TBSTYLE_AUTOSIZE, adjusting each button to the size it really needs,
for the toolbars with wxTB_HORZ_LAYOUT style as they don't have any uniform
button size anyhow.
(cherry picked from commit 967bdbf994
)
This commit is contained in:
@@ -127,6 +127,12 @@ Changes in behaviour not resulting in compilation errors, please read this!
|
||||
to check if the changes correspond to your expectations. And if you do need
|
||||
the old behaviour please contact us at wx-dev to let us know about it!
|
||||
|
||||
- Revert to using equally-sized buttons in wxToolBar by default: restore the
|
||||
behaviour of the pre-3.0 versions in which toolbar buttons had the same
|
||||
width for the toolbars not using wxTB_HORZ_LAYOUT style. Toolbars with this
|
||||
style still size their buttons appropriately for their contents as they
|
||||
already did in the previous 3.0.x releases.
|
||||
|
||||
- wxWindow::Freeze/Thaw() are not virtual any more, if you overrode them in
|
||||
your code you need to override DoFreeze/DoThaw() instead now.
|
||||
|
||||
|
@@ -1091,11 +1091,12 @@ bool wxToolBar::Realize()
|
||||
|
||||
// Instead of using fixed widths for all buttons, size them
|
||||
// automatically according to the size of their bitmap and text
|
||||
// label, if present. This particularly matters for toolbars
|
||||
// with the wxTB_HORZ_LAYOUT style: they look hideously ugly
|
||||
// without autosizing when the labels have even slightly
|
||||
// different lengths.
|
||||
button.fsStyle |= TBSTYLE_AUTOSIZE;
|
||||
// label, if present. They look hideously ugly without autosizing
|
||||
// when the labels have even slightly different lengths.
|
||||
if ( HasFlag(wxTB_HORZ_LAYOUT) )
|
||||
{
|
||||
button.fsStyle |= TBSTYLE_AUTOSIZE;
|
||||
}
|
||||
|
||||
bitmapId++;
|
||||
break;
|
||||
|
Reference in New Issue
Block a user