From: ouv <ouv@opencascade.com>
Date: Mon, 1 Sep 2008 14:15:35 +0000 (+0000)
Subject: Merging from BR_QT4_Dev
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=51a3db9df8f0246214d74ca7467da956465bbb29;p=modules%2Fgui.git

Merging from BR_QT4_Dev
---

diff --git a/src/Qtx/QtxColorScale.cxx b/src/Qtx/QtxColorScale.cxx
index b7dbf558a..44589c9c1 100755
--- 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 453aeefe6..10014c8d9 100755
--- 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: