diff options
author | Tim E. Real <termtech@rogers.com> | 2010-10-26 22:30:37 +0000 |
---|---|---|
committer | Tim E. Real <termtech@rogers.com> | 2010-10-26 22:30:37 +0000 |
commit | b5a9f51073ba4e3c166f9229cd596f22878acafc (patch) | |
tree | 2f2bd80dd09f6391166ef35c2521eb2651ade4c1 /muse2/muse/widgets/lcombo.cpp | |
parent | 1b5734729f893636653693776da29c6f391d3439 (diff) |
See ChangeLog
Diffstat (limited to 'muse2/muse/widgets/lcombo.cpp')
-rw-r--r-- | muse2/muse/widgets/lcombo.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/muse2/muse/widgets/lcombo.cpp b/muse2/muse/widgets/lcombo.cpp index fa647002..beb34255 100644 --- a/muse2/muse/widgets/lcombo.cpp +++ b/muse2/muse/widgets/lcombo.cpp @@ -7,11 +7,11 @@ #include "lcombo.h" -#include <qlayout.h> -#include <q3frame.h> +#include <QLayout> +#include <QFrame> #include <qlabel.h> //Added by qt3to4: -#include <Q3HBoxLayout> +#include <QHBoxLayout> //--------------------------------------------------------- // LabelCombo @@ -21,16 +21,18 @@ LabelCombo::LabelCombo(const QString& txt, QWidget* parent, const char* name) : QWidget(parent, name) { // setFixedHeight(20); - Q3HBoxLayout* layout = new Q3HBoxLayout(this); + QHBoxLayout* layout = new QHBoxLayout(this); QLabel* label = new QLabel(txt, this); - box = new QComboBox(false, this); - layout->addStretch(); + //box = new QComboBox(false, this); + box = new QComboBox(this); + box->setEditable(false); + ///layout->addStretch(); layout->addSpacing(5); layout->addWidget(label); layout->addSpacing(5); layout->addWidget(box); layout->addSpacing(5); - layout->addStretch(); + ///layout->addStretch(); connect(box, SIGNAL(activated(int)), SIGNAL(activated(int))); } @@ -46,4 +48,4 @@ void LabelCombo::clearFocus() void LabelCombo::setFocusPolicy ( Qt::FocusPolicy fp ) { box->setFocusPolicy(fp); -}
\ No newline at end of file +} |