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

Add precondition checks to Do{Get,Set}ClientSize()

Browse Source 
Don't crash if these methods are called before the window is created.
This commit is contained in:
Vadim Zeitlin
2019-09-22 02:38:59 +02:00
parent cd7594e639
commit 54c1359d1f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/window.cpp
View File

@@ -975,6 +975,8 @@ void wxWindowQt::DoSetSize(int x, int y, int width, int height, int sizeFlags )
void wxWindowQt::DoGetClientSize(int *width, int *height) const void wxWindowQt::DoGetClientSize(int *width, int *height) const
{ {
QWidget *qtWidget = QtGetClientWidget(); QWidget *qtWidget = QtGetClientWidget();
wxCHECK_RET( qtWidget, "window must be created" );
const QRect geometry = qtWidget->geometry(); const QRect geometry = qtWidget->geometry();
if (width) *width = geometry.width(); if (width) *width = geometry.width();
if (height) *height = geometry.height(); if (height) *height = geometry.height();
@@ -984,6 +986,8 @@ void wxWindowQt::DoGetClientSize(int *width, int *height) const
void wxWindowQt::DoSetClientSize(int width, int height) void wxWindowQt::DoSetClientSize(int width, int height)
{ {
QWidget *qtWidget = QtGetClientWidget(); QWidget *qtWidget = QtGetClientWidget();
wxCHECK_RET( qtWidget, "window must be created" );
QRect geometry = qtWidget->geometry(); QRect geometry = qtWidget->geometry();
geometry.setWidth( width ); geometry.setWidth( width );
geometry.setHeight( height ); geometry.setHeight( height );