This commit was generated by cvs2git to create tag 'V_5_1_7'.

Sprout from BR_HDF_dev 2010-08-06 05:57:53 UTC nds <nds@opencascade.com> 'It corrects an exception which was generated by the scrolled QWebView. The zero widget came to the method.'
Cherrypick from BR_HDF_dev 2010-09-28 05:47:37 UTC nds <nds@opencascade.com> 'It hides the error message from the terminal output.':
    src/STD/STD_Application.h
    src/SVTK/SVTK_SpaceMouse.cxx

diff --git a/src/STD/STD_Application.h b/src/STD/STD_Application.h
index 77f2ed6465e90223f83442700948e58fa31ca35e..5c12b4b65a4a38c569e495d7faec744113c52b58 100755 (executable)
--- a/src/STD/STD_Application.h
+++ b/src/STD/STD_Application.h
@@ -94,6 +94,8 @@ public:
   bool                  exitConfirmation() const;
   void                  setExitConfirmation( const bool );
 
+  virtual void          updateDesktopTitle();
+
 signals:
   /*!emit that view manager added*/
   void                  viewManagerAdded( SUIT_ViewManager* );
@@ -140,7 +142,6 @@ protected:
 
 protected:
   virtual void          createActions();
-  virtual void          updateDesktopTitle();
   virtual void          updateCommandsStatus();
 
   virtual void          setDesktop( SUIT_Desktop* );

diff --git a/src/SVTK/SVTK_SpaceMouse.cxx b/src/SVTK/SVTK_SpaceMouse.cxx
index 7d858a7809b2aff7fe0b5152e0f2227eb5ef3c5c..62275e4d6a7ea2c671a3dab38d1c105232c5e844 100644 (file)
--- a/src/SVTK/SVTK_SpaceMouse.cxx
+++ b/src/SVTK/SVTK_SpaceMouse.cxx
@@ -94,7 +94,7 @@ static int errorCallback( Display *display, XErrorEvent *Error )
   char msg[ 128 ];
   if ( Error->error_code != BadWindow ) {
     XGetErrorText( display,Error->error_code,msg,sizeof( msg ) );
-    fprintf( stderr, "SpaceMouse reported error = %s. Exit ... \n", msg );
+    //fprintf( stderr, "SpaceMouse reported error = %s. Exit ... \n", msg );
   }
   return 0;
 }