From: stv <stv@opencascade.com>
Date: Wed, 23 Nov 2005 12:32:01 +0000 (+0000)
Subject: no message
X-Git-Tag: BR_3_1_0_deb~47
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=51d06fe9eb9333d5b434d13fad90344f97377707;p=modules%2Fgui.git

no message
---

diff --git a/src/Qtx/QtxListAction.cxx b/src/Qtx/QtxListAction.cxx
index 633fa370a..8abe2236a 100755
--- a/src/Qtx/QtxListAction.cxx
+++ b/src/Qtx/QtxListAction.cxx
@@ -423,7 +423,7 @@ void QtxListAction::initialize()
 {
 	myTipGroup = new QToolTipGroup( this );
 
-	myFrame = new QtxListFrame( qApp->mainWidget() );
+	myFrame = new QtxListFrame( this, qApp->mainWidget() );
   myFrame->setMaxLines( 5 );
   myFrame->setMaxLineChars( 7 );
 
@@ -628,10 +628,11 @@ private:
 /*!
     Constructor
 */
-QtxListFrame::QtxListFrame( QWidget* parent, WFlags f )
+QtxListFrame::QtxListFrame( QtxListAction* a, QWidget* parent, WFlags f )
 : QFrame( parent, 0, WStyle_Customize | WStyle_NoBorderEx | WType_Popup | WStyle_Tool | WStyle_StaysOnTop ),
 myList( 0 ),
 myOwner( 0 ),
+myAction( a ),
 myComment( 0 ),
 myMaxLines( 5 ),
 myMaxLineChars( 10 ),
@@ -670,6 +671,8 @@ myScrollBlock( false )
 
 QtxListFrame::~QtxListFrame()
 {
+  if ( myAction )
+    myAction->myFrame = 0;
 }
 
 /*!
diff --git a/src/Qtx/QtxListAction.h b/src/Qtx/QtxListAction.h
index 8f74210e1..8aa95cf13 100755
--- a/src/Qtx/QtxListAction.h
+++ b/src/Qtx/QtxListAction.h
@@ -97,6 +97,7 @@ private:
     QToolTipGroup*          myTipGroup;
 
     friend class ToolButton;
+    friend class QtxListFrame;
 };
 
 /*************************************
@@ -111,7 +112,7 @@ class QtxListFrame : public QFrame
     class ScrollEvent;
 
 public:
-    QtxListFrame( QWidget* parent, WFlags f = 0 );
+    QtxListFrame( QtxListAction*, QWidget* parent, WFlags f = 0 );
     virtual ~QtxListFrame();
 
     void                    clear();
@@ -159,6 +160,7 @@ private:
     QListBox*               myList;
     QStringList             myNames;
     QWidget*                myOwner;
+    QtxListAction*          myAction;
     QLabel*                 myComment;
     
     QString                 mySingleComment;