PR: merge from branch BR_UnitTests tag mergeto_trunk_17oct05

[modules/kernel.git] / src / SALOMEGUI / QAD_Message.cxx

diff --git a/src/SALOMEGUI/QAD_Message.cxx b/src/SALOMEGUI/QAD_Message.cxx
index a932028e29f0f370025fb58813ef5114c23a753f..1f5f570c4440cf405119008d167debfb528507ae 100644 (file)
--- a/src/SALOMEGUI/QAD_Message.cxx
+++ b/src/SALOMEGUI/QAD_Message.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 #include "QAD_Message.h"
 #include "QAD_Application.h"
 #include "QAD_Config.h"
@@ -35,6 +34,7 @@ using namespace std;
 #include <qstring.h>
 #include <qpopupmenu.h>
 #include <qmap.h>
+using namespace std;
 
 enum { IdCopy, IdClear, IdSelectAll };
 
@@ -111,9 +111,9 @@ void QAD_Message::mousePressEvent(QMouseEvent* event)
     id = popup->insertItem( tr( "EDIT_SELECTALL_CMD" ) );
     idMap.insert(IdSelectAll, id);
     popup->setItemEnabled( idMap[ IdCopy ], hasMarkedText() );
-    popup->setItemEnabled( idMap[ IdSelectAll ],
-                         (bool)text().length() && !allSelected );
-    
+    popup->setItemEnabled( idMap[ IdSelectAll ], !allSelected );
+    popup->setItemEnabled( idMap[ IdClear ], textLine(1)!=myPrompt );
+        
     int r = popup->exec( event->globalPos() );
     delete popup;