*** empty log message ***

diff --git a/src/GLViewer/resources/GLViewer_msg_en.po b/src/GLViewer/resources/GLViewer_msg_en.po
index 3b9e942beee47d9690312305c51280448800358a..32d5f88cbc9ccffd780c425b64e0aa51f95fe9c2 100644 (file)
--- a/src/GLViewer/resources/GLViewer_msg_en.po
+++ b/src/GLViewer/resources/GLViewer_msg_en.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: example-Qt-message-extraction\n"
 "POT-Creation-Date: 1999-02-23 15:38+0200\n"
-"PO-Revision-Date: 2005-05-05 10:19+0400\n"
+"PO-Revision-Date: 1999-02-23 15:38+0200\n"
 "Last-Translator: \n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 
@@ -60,7 +60,7 @@ msgid "DSC_DUMP_VIEW"
 msgstr "Saves the active view in the image file"
 
 msgid "MNU_DUMP_VIEW"
-msgstr "Dump view..."
+msgstr "Dump"
 
 msgid "GL_IMAGE_FILES"
 msgstr "Images Files (*.bmp *.png)"
@@ -77,17 +77,14 @@ msgstr "Error"
 msgid "BUT_OK"
 msgstr "Ok"
 
-msgid "GLViewer_Viewer2d::CHANGE_BGCOLOR"
+msgid "CHANGE_BGCOLOR"
 msgstr "Change background..."
 
 msgid "GLViewer_ViewFrame::DUMP_VIEW_SAVE_FILE_DLG_CAPTION"
-msgstr "Dump View"
+msgstr "Save Dump View in file"
 
 msgid "GLViewer_ViewFrame::DUMP_VIEW_ERROR_DLG_CAPTION"
 msgstr "Error"
 
 msgid "GLViewer_ViewFrame::DUMP_VIEW_ERROR_DLG_TEXT"
-msgstr "Dump view operation failed."
-
-msgid "GLViewer_ViewFrame::DUMP_VIEW_ERROR_UNSUPPORTED_FORMAT"
-msgstr "Can't dump view. Unsupported image format: %1."
+msgstr "Can't save Dump View in file"

diff --git a/src/OBJECT/SALOME_GLOwner.h b/src/OBJECT/SALOME_GLOwner.h
index 824140c6d54ea86d9fc53ba4f3c005be8bae7304..e541f23f0543c893f5bd61a5f6ff745c736443bf 100644 (file)
--- a/src/OBJECT/SALOME_GLOwner.h
+++ b/src/OBJECT/SALOME_GLOwner.h
@@ -2,9 +2,10 @@
 #define SALOME_GLOWNER_H
 
 #include <string>
+//#include <GLViewer.h>
 #include <GLViewer_Object.h>
 
-class Standard_EXPORT SALOME_GLOwner : public GLViewer_Owner
+class GLVIEWER_API SALOME_GLOwner : public GLViewer_Owner
 {
 public:
   SALOME_GLOwner( const char* );

diff --git a/src/SalomeApp/SalomeApp_GLSelector.cxx b/src/SalomeApp/SalomeApp_GLSelector.cxx
index 4b1351e18bdfd85f0403aa1830a3795ed37f4eb8..33a2e3ba9978d4f5b6fce4527a65acea5fe1fbea 100644 (file)
--- a/src/SalomeApp/SalomeApp_GLSelector.cxx
+++ b/src/SalomeApp/SalomeApp_GLSelector.cxx
@@ -59,18 +59,15 @@ void SalomeApp_GLSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
     return;
 
   QMap<QString, GLViewer_Object*> aDisplayed;
-  const ObjectMap& displayed = cont->getObjects();
-  for ( ObjectMap::const_iterator it = displayed.begin(); it != displayed.end(); ++it )
+  const ObjList& displayed = cont->getObjects();
+  for ( ObjList::const_iterator it = displayed.begin(); it != displayed.end(); ++it )
   {
-    if ( it.key()->getVisible() )
+    GLViewer_Object* obj = *it;
+    if ( obj && obj->getVisible() )
     {
-      GLViewer_Object* obj = it.key();
-      if ( obj )
-      {
-        SALOME_GLOwner* owner = dynamic_cast< SALOME_GLOwner* >( obj->owner() );
-           if ( owner )
-          aDisplayed.insert( owner->entry(), obj );
-      }
+      SALOME_GLOwner* owner = dynamic_cast< SALOME_GLOwner* >( obj->owner() );
+      if ( owner )
+       aDisplayed.insert( owner->entry(), obj );
     }
   }