From 0edf04ebeca0cf973d1394a59d64a8ae0da695a8 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 28 Sep 2010 05:47:38 +0000 Subject: [PATCH] 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 '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 'It hides the error message from the terminal output.': src/STD/STD_Application.h src/SVTK/SVTK_SpaceMouse.cxx --- src/STD/STD_Application.h | 3 ++- src/SVTK/SVTK_SpaceMouse.cxx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/STD/STD_Application.h b/src/STD/STD_Application.h index 77f2ed646..5c12b4b65 100755 --- 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 7d858a780..62275e4d6 100644 --- 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; } -- 2.39.2