X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Fgenericgui%2FFormContainer.cxx;h=07598f87e94ca532d9e0dc06ed19e37d1da5aec1;hb=c0fcc541861db7c8009c9e4f0b73cfff568c5934;hp=611cb98e80597af18eee62e9c58aabaadd9946d7;hpb=f3b2b68ffecc5033287a7a255c8507f8989fb87f;p=modules%2Fyacs.git

diff --git a/src/genericgui/FormContainer.cxx b/src/genericgui/FormContainer.cxx
index 611cb98e8..07598f87e 100644
--- a/src/genericgui/FormContainer.cxx
+++ b/src/genericgui/FormContainer.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2006-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2014  CEA/DEN, 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
@@ -705,8 +705,16 @@ bool FormContainer::onApply()
   SubjectContainer *scont =
     QtGuiContext::getQtCurrent()->_mapOfSubjectContainer[_container];
   YASSERT(scont);
-  bool ret = scont->setProperties(_properties);
+  bool ret = scont->setName(le_name->text().toStdString());
   DEBTRACE(ret);
-  if (ret) ret = scont->setName(le_name->text().toStdString());
+  if (ret) ret = scont->setProperties(_properties);
   return ret;
 }
+
+void FormContainer::onCancel()
+{
+  SubjectContainer *scont =
+    QtGuiContext::getQtCurrent()->_mapOfSubjectContainer[_container];
+  YASSERT(scont);
+  FillPanel(scont->getContainer());
+}