Merging from BR_QT4_Dev

diff --git a/src/Qtx/QtxColorScale.cxx b/src/Qtx/QtxColorScale.cxx
index b7dbf558a743ce56542765eb7cf9dda112c752c0..44589c9c1e75b35ecbdf4ec1ee046c39f901f7c2 100755 (executable)
--- a/src/Qtx/QtxColorScale.cxx
+++ b/src/Qtx/QtxColorScale.cxx
@@ -698,6 +698,17 @@ void QtxColorScale::hide()
   QFrame::hide();
 }
 
+/*!
+  \brief Paint widget
+  \param e paint event
+*/
+void QtxColorScale::paintEvent( QPaintEvent* e )
+{
+  QPainter p( this );
+  drawFrame( &p );
+  drawContents( &p );
+}
+
 /*!
   \brief Draw color scale (reimplemented from QFrame).
   \param p painter

diff --git a/src/Qtx/QtxColorScale.h b/src/Qtx/QtxColorScale.h
index 453aeefe66b4e69c54b3af73022ea0422bd0f0f5..10014c8d9181861f722e9c304105f5b253391820 100755 (executable)
--- a/src/Qtx/QtxColorScale.h
+++ b/src/Qtx/QtxColorScale.h
@@ -123,6 +123,7 @@ public:
   virtual void          hide();
 
 protected:
+  virtual void          paintEvent( QPaintEvent* );
   virtual void          drawContents( QPainter* );
 
 private: