diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-03 08:49:38 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-03 08:49:38 -0500 |
| commit | 7d22e97622a6b963382b88aac6dfde06a2cd8f03 (patch) | |
| tree | 231f5c31f279d3e798702fe61e9b6bcef52b089b /src/dialogs/qdialog.cpp | |
| parent | 6d0157ea558089bb957f35263424a405e42a6931 (diff) | |
| parent | fe7969ef886d7287fa959929ddd33fbad8407884 (diff) | |
| download | tqt-7d22e97622a6b963382b88aac6dfde06a2cd8f03.tar.gz tqt-7d22e97622a6b963382b88aac6dfde06a2cd8f03.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/dialogs/qdialog.cpp')
| -rw-r--r-- | src/dialogs/qdialog.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp index 4f40ded28..095cbf2e7 100644 --- a/src/dialogs/qdialog.cpp +++ b/src/dialogs/qdialog.cpp @@ -1077,13 +1077,14 @@ void TQDialog::showExtension( bool showIt ) /*! \reimp */ TQSize TQDialog::sizeHint() const { - if ( d->extension ) + if ( d->extension ) { if ( d->orientation == Horizontal ) return TQSize( TQWidget::sizeHint().width(), TQMAX( TQWidget::sizeHint().height(),d->extension->sizeHint().height() ) ); else return TQSize( TQMAX( TQWidget::sizeHint().width(), d->extension->sizeHint().width() ), TQWidget::sizeHint().height() ); + } return TQWidget::sizeHint(); } @@ -1092,13 +1093,14 @@ TQSize TQDialog::sizeHint() const /*! \reimp */ TQSize TQDialog::minimumSizeHint() const { - if ( d->extension ) + if ( d->extension ) { if (d->orientation == Horizontal ) return TQSize( TQWidget::minimumSizeHint().width(), TQMAX( TQWidget::minimumSizeHint().height(), d->extension->minimumSizeHint().height() ) ); else return TQSize( TQMAX( TQWidget::minimumSizeHint().width(), d->extension->minimumSizeHint().width() ), TQWidget::minimumSizeHint().height() ); + } return TQWidget::minimumSizeHint(); } |