From b5a9f51073ba4e3c166f9229cd596f22878acafc Mon Sep 17 00:00:00 2001
From: "Tim E. Real" <termtech@rogers.com>
Date: Tue, 26 Oct 2010 22:30:37 +0000
Subject: See ChangeLog

---
 muse2/muse/widgets/lcombo.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'muse2/muse/widgets/lcombo.cpp')

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
+}
-- 
cgit v1.2.3