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 ee739d075ef192cbd565d03c876f99f0c7c3f49d..dc59f51f562857e3e9e864f08008ad579c3a3722 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -27,16 +27,16 @@
     <parameter name="name" value="Geometry"/>
     <parameter name="icon" value="ModuleGeom.png"/>
     <parameter name="documentation" value="geom_help"/>
-    <parameter name="GEOM_VERSION" value="@VERSION@"/>
+    <parameter name="version" value="@VERSION@"/>
   </section>
   <section name="geom_help" >
     <parameter name="sub_menu"          value="%1 module"/>
-    <parameter name="User's Guide"      value="${GEOM_ROOT_DIR}/share/doc/salome/gui/GEOM/index.html"/>
-    <parameter name="Developer's Guide" value="${GEOM_ROOT_DIR}/share/doc/salome/tui/GEOM/index.html"/>
+    <parameter name="User's Guide"      value="%GEOM_ROOT_DIR%/share/doc/salome/gui/GEOM/index.html"/>
+    <parameter name="Developer's Guide" value="%GEOM_ROOT_DIR%/share/doc/salome/tui/GEOM/index.html"/>
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="GEOM" value="${GEOM_ROOT_DIR}/share/salome/resources/geom"/>
+    <parameter name="GEOM" value="%GEOM_ROOT_DIR%/share/salome/resources/geom"/>
   </section>
   <section name="Geometry" >
     <!-- Other module preferences -->

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index 0337045129689a4f10e9f8ef2345810f06754d42..5d138bbf756226b5d125f311790ab83466f51502 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -109,7 +109,7 @@ extern "C" {
   }
 
   Standard_EXPORT char* getModuleVersion() {
-    return GEOM_VERSION_STR;
+    return (char*)GEOM_VERSION_STR;
   }
 }