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

Fix wxGTK build after WXSetInitialFittingClientSize() change

Browse Source 
This should have been part of 136574b1e0 (Make wxSizer::SetSizeHints()
work again, 2021-07-24).

See #19170.
This commit is contained in:
Vadim Zeitlin
2021-07-24 19:15:55 +02:00
parent f58af942ef
commit 912f4b76ac
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/toplevel.h
View File

@@ -143,7 +143,7 @@ public:
virtual void SetMinSize(const wxSize& minSize) wxOVERRIDE;
virtual void WXSetInitialFittingClientSize(int flags) wxOVERRIDE;
virtual void WXSetInitialFittingClientSize(int flags, wxSizer* sizer = NULL) wxOVERRIDE;
private:
// Flags to call WXSetInitialFittingClientSize() with if != 0.

5
src/gtk/toplevel.cpp
View File

@@ -1567,10 +1567,11 @@ void wxTopLevelWindowGTK::SetMinSize(const wxSize& minSize)
m_pendingFittingClientSizeFlags &= ~wxSIZE_SET_MIN;
}
void wxTopLevelWindowGTK::WXSetInitialFittingClientSize(int flags)
void
wxTopLevelWindowGTK::WXSetInitialFittingClientSize(int flags, wxSizer* sizer)
{
// In any case, update the size immediately.
wxTopLevelWindowBase::WXSetInitialFittingClientSize(flags);
wxTopLevelWindowBase::WXSetInitialFittingClientSize(flags, sizer);
// But if we're not shown yet, the fitting size may be wrong because GTK
// style cache hasn't been updated yet and we need to do it again when the