refs #550: fix crash when myObject is NULL

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ColorWidget.cxx

diff --git a/src/HYDROGUI/HYDROGUI_ColorWidget.cxx b/src/HYDROGUI/HYDROGUI_ColorWidget.cxx
index 68ad84a7c2dd297503fc8ea3925205c82daca10c..8e4c3cce7ef5bcadf85d93e02482796cc15f43c2 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ColorWidget.cxx
+++ b/src/HYDROGUI/HYDROGUI_ColorWidget.cxx
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,6 +18,7 @@
 
 #include "HYDROGUI_ColorWidget.h"
 
+#include <QApplication>
 #include <QColorDialog>
 
 HYDROGUI_ColorWidget::HYDROGUI_ColorWidget( QWidget* parent )
@@ -52,6 +49,13 @@ void HYDROGUI_ColorWidget::setColor( const QColor& c )
   setPalette( aPalette );
 }
 
+void HYDROGUI_ColorWidget::resetColor()
+{
+  QPalette aDefPalette = QApplication::palette();
+  QColor aColor = aDefPalette.color( QPalette::Window );
+  setColor( aColor );
+}
+
 void HYDROGUI_ColorWidget::mouseDoubleClickEvent( QMouseEvent* )
 {
   QColor c = QColorDialog::getColor( color(), this );