fix infinite sizing loop with GTK3 when using a non-default target window, closes #16668
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -581,6 +581,11 @@ All (GUI):
|
|||||||
|
|
||||||
- Fix several floating point rounding bugs in wxPropertyGrid (Artur Wieczorek).
|
- Fix several floating point rounding bugs in wxPropertyGrid (Artur Wieczorek).
|
||||||
|
|
||||||
|
wxGTK:
|
||||||
|
|
||||||
|
- Fix infinite sizing loop with GTK3 when using wxScrolled with a non-default
|
||||||
|
target window.
|
||||||
|
|
||||||
wxMSW:
|
wxMSW:
|
||||||
|
|
||||||
- Fix compilation with C++Builder XE compiler (Nichka).
|
- Fix compilation with C++Builder XE compiler (Nichka).
|
||||||
|
@@ -81,6 +81,14 @@ void wxScrollHelper::AdjustScrollbars()
|
|||||||
{
|
{
|
||||||
int vw, vh;
|
int vw, vh;
|
||||||
m_targetWindow->GetVirtualSize(&vw, &vh);
|
m_targetWindow->GetVirtualSize(&vw, &vh);
|
||||||
|
#ifdef __WXGTK3__
|
||||||
|
if (m_targetWindow != m_win)
|
||||||
|
{
|
||||||
|
// setting wxPizza preferred size keeps GtkScrolledWindow from causing
|
||||||
|
// an infinite sizing loop
|
||||||
|
gtk_widget_set_size_request(m_win->m_wxwindow, vw, vh);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
int w, h;
|
int w, h;
|
||||||
const wxSize availSize = GetSizeAvailableForScrollTarget(
|
const wxSize availSize = GetSizeAvailableForScrollTarget(
|
||||||
|
Reference in New Issue
Block a user