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

correct null reference if set flags is called in Init

Browse Source
This commit is contained in:
Sean D'Epagnier
2016-08-26 17:39:38 -04:00
committed by Vadim Zeitlin
parent 7e7530f010
commit 5261d3eb05
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/qt/toplevel.cpp
View File

@@ -121,6 +121,14 @@ void wxTopLevelWindowQt::SetWindowStyleFlag( long style )
{ {
wxWindow::SetWindowStyleFlag( style ); wxWindow::SetWindowStyleFlag( style );
if ( HasFlag( wxCENTRE ) )
{
Centre();
}
if(!GetHandle())
return;
Qt::WindowFlags qtFlags = GetHandle()->windowFlags(); Qt::WindowFlags qtFlags = GetHandle()->windowFlags();
if ( HasFlag( wxSTAY_ON_TOP ) != qtFlags.testFlag( Qt::WindowStaysOnTopHint ) ) if ( HasFlag( wxSTAY_ON_TOP ) != qtFlags.testFlag( Qt::WindowStaysOnTopHint ) )
@@ -167,12 +175,7 @@ void wxTopLevelWindowQt::SetWindowStyleFlag( long style )
GetHandle()->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ); GetHandle()->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred );
else else
GetHandle()->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); GetHandle()->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
if ( HasFlag( wxCENTRE ) )
{
Centre();
} }
}
long wxTopLevelWindowQt::GetWindowStyleFlag() const long wxTopLevelWindowQt::GetWindowStyleFlag() const
{ {

3
src/qt/window.cpp
View File

@@ -741,6 +741,9 @@ void wxWindowQt::SetWindowStyleFlag( long style )
// qtFrame->setFrameShadow( QFrame::Plain ); // qtFrame->setFrameShadow( QFrame::Plain );
// } // }
if(!GetHandle())
return;
Qt::WindowFlags qtFlags = GetHandle()->windowFlags(); Qt::WindowFlags qtFlags = GetHandle()->windowFlags();
if ( HasFlag( wxFRAME_NO_TASKBAR ) ) if ( HasFlag( wxFRAME_NO_TASKBAR ) )