diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-12-22 03:18:11 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-12-22 03:18:11 -0600 |
| commit | 523c1fd99e9ba466064edfc235104ec5190e5ca3 (patch) | |
| tree | 7cc06d8420c780ebd59197897f7ec096b361d9dc /src/widgets/qdockarea.cpp | |
| parent | d55c0cef4d3956a0c9d476bb06b4544ec702cd49 (diff) | |
| download | tqt-523c1fd99e9ba466064edfc235104ec5190e5ca3.tar.gz tqt-523c1fd99e9ba466064edfc235104ec5190e5ca3.zip | |
Automated update from Qt3
Diffstat (limited to 'src/widgets/qdockarea.cpp')
| -rw-r--r-- | src/widgets/qdockarea.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/qdockarea.cpp b/src/widgets/qdockarea.cpp index 14c63885f..e0764a32a 100644 --- a/src/widgets/qdockarea.cpp +++ b/src/widgets/qdockarea.cpp @@ -204,13 +204,15 @@ static int dock_strut( TQDockWindow *w, TQt::Orientation o ) { if ( o != TQt::Horizontal ) { int wid; - if ( ( wid = w->fixedExtent().width() ) != -1 ) + if ( ( wid = w->fixedExtent().width() ) != -1 ) { return TQMAX( wid, TQMAX( w->minimumSize().width(), w->minimumSizeHint().width() ) ); + } return TQMAX( w->sizeHint().width(), TQMAX( w->minimumSize().width(), w->minimumSizeHint().width() ) ); } else { int hei; - if ( ( hei = w->fixedExtent().height() ) != -1 ) + if ( ( hei = w->fixedExtent().height() ) != -1 ) { return TQMAX( hei, TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() ) ); + } return TQMAX( w->sizeHint().height(), TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() ) ); } } |