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

Merge branch 'WX_3_0_BRANCH' into wxPy-3.0-branch

Browse Source
This commit is contained in:
Robin Dunn
2016-07-14 11:53:26 -07:00
parent 5f86a4d86d 3e9bd07e3f
commit b93215eddd
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/changes.txt
View File

@@ -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 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! 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 - wxWindow::Freeze/Thaw() are not virtual any more, if you overrode them in
your code you need to override DoFreeze/DoThaw() instead now. your code you need to override DoFreeze/DoThaw() instead now.

3
src/common/dcgraph.cpp
View File

@@ -1202,9 +1202,10 @@ void wxGCDCImpl::Clear(void)
wxCompositionMode formerMode = m_graphicContext->GetCompositionMode(); wxCompositionMode formerMode = m_graphicContext->GetCompositionMode();
m_graphicContext->SetCompositionMode(wxCOMPOSITION_SOURCE); m_graphicContext->SetCompositionMode(wxCOMPOSITION_SOURCE);
// maximum positive coordinate Cairo can handle is 2^23 - 1 // maximum positive coordinate Cairo can handle is 2^23 - 1
// Use a value slightly less than this to be sure we avoid the limit
DoDrawRectangle( DoDrawRectangle(
DeviceToLogicalX(0), DeviceToLogicalY(0), DeviceToLogicalX(0), DeviceToLogicalY(0),
DeviceToLogicalXRel(0x007fffff), DeviceToLogicalYRel(0x007fffff)); DeviceToLogicalXRel(0x800000 - 64), DeviceToLogicalYRel(0x800000 - 64));
m_graphicContext->SetCompositionMode(formerMode); m_graphicContext->SetCompositionMode(formerMode);
m_graphicContext->SetPen( m_pen ); m_graphicContext->SetPen( m_pen );
m_graphicContext->SetBrush( m_brush ); m_graphicContext->SetBrush( m_brush );

11
src/msw/toolbar.cpp
View File

@@ -1091,11 +1091,12 @@ bool wxToolBar::Realize()
// Instead of using fixed widths for all buttons, size them // Instead of using fixed widths for all buttons, size them
// automatically according to the size of their bitmap and text // automatically according to the size of their bitmap and text
// label, if present. This particularly matters for toolbars // label, if present. They look hideously ugly without autosizing
// with the wxTB_HORZ_LAYOUT style: they look hideously ugly // when the labels have even slightly different lengths.
// without autosizing when the labels have even slightly if ( HasFlag(wxTB_HORZ_LAYOUT) )
// different lengths. {
button.fsStyle |= TBSTYLE_AUTOSIZE; button.fsStyle |= TBSTYLE_AUTOSIZE;
}
bitmapId++; bitmapId++;
break; break;