From f5c7bb3100ed321392da42f61c2ab505833ec61a Mon Sep 17 00:00:00 2001 From: Vitaly SMETANNIKOV Date: Wed, 18 Nov 2015 12:25:12 +0300 Subject: [PATCH] Issue #1063: Problem of dynamic cast on Linux for Selection validators is solved --- src/ModuleBase/CMakeLists.txt | 1 + src/ModuleBase/ModuleBase_SelectionValidator.h | 2 +- test.squish/shared/testdata/SalomeApp.xml | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt index 0969deb10..aa6a72b63 100644 --- a/src/ModuleBase/CMakeLists.txt +++ b/src/ModuleBase/CMakeLists.txt @@ -106,6 +106,7 @@ SET(PROJECT_SOURCES ModuleBase_WidgetValidated.cpp ModuleBase_IconFactory.cpp ModuleBase_WidgetErrorLabel.cpp + ModuleBase_SelectionValidator.cpp ) SET(PROJECT_LIBRARIES diff --git a/src/ModuleBase/ModuleBase_SelectionValidator.h b/src/ModuleBase/ModuleBase_SelectionValidator.h index 64eafc112..ea177598f 100644 --- a/src/ModuleBase/ModuleBase_SelectionValidator.h +++ b/src/ModuleBase/ModuleBase_SelectionValidator.h @@ -26,7 +26,7 @@ public: /// Returns True if selection is valid /// \param theSelection selection instance /// \param theOperation - current operation (can be 0) - virtual bool isValid(const ModuleBase_ISelection* theSelection, ModuleBase_Operation* theOperation) const = 0; + virtual bool isValid(const ModuleBase_ISelection* theSelection, ModuleBase_Operation* theOperation) const; }; #endif diff --git a/test.squish/shared/testdata/SalomeApp.xml b/test.squish/shared/testdata/SalomeApp.xml index da472b70e..aeac49ce8 100644 --- a/test.squish/shared/testdata/SalomeApp.xml +++ b/test.squish/shared/testdata/SalomeApp.xml @@ -16,6 +16,9 @@ Changes made in this file can be lost!
+
+ +
@@ -88,7 +91,7 @@ Changes made in this file can be lost!
- +
@@ -110,9 +113,9 @@ Changes made in this file can be lost! - - - + + +
@@ -124,10 +127,10 @@ Changes made in this file can be lost!
- - + +
-- 2.39.2