Additional modifications for the "20494: EDF 1123 KERNEL/GUI : Improvment of 'About...

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index d1dd817f1c203bf3eb4e2663b6a6799a67e53c76..0901da047548c7307120ad93d77c5b511631179d 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -26,9 +26,9 @@
  <section name="ATOMIC" >
   <parameter name="name" value="Atomic" />
   <parameter name="icon" value="ATOMIC.png" />
-  <parameter name="ATOMIC_VERSION" value="@VERSION@" />
+  <parameter name="version" value="@VERSION@" />
  </section>
  <section name="resources" >
-  <parameter name="ATOMIC" value="${ATOMIC_ROOT_DIR}/share/salome/resources/atomic" />
+  <parameter name="ATOMIC" value="%ATOMIC_ROOT_DIR%/share/salome/resources/atomic" />
  </section>
 </document>

diff --git a/src/ATOMICGUI/ATOMICGUI.cxx b/src/ATOMICGUI/ATOMICGUI.cxx
index 189ab7c797da89da8aa3e685b25759d24042ed98..cf8b9832dea8f73cc64648435cc54c7d20d5096a 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI.cxx
+++ b/src/ATOMICGUI/ATOMICGUI.cxx
@@ -239,6 +239,6 @@ extern "C" {
   }
   
   ATOMICGUI_EXPORT char* getModuleVersion() {
-    return ATOMIC_VERSION_STR;
+    return (char*)ATOMIC_VERSION_STR;
   }
 }