From: rnv <rnv@opencascade.com>
Date: Fri, 16 Sep 2011 06:10:02 +0000 (+0000)
Subject: Additional modifications for the "20494: EDF 1123 KERNEL/GUI : Improvment of 'About... 
X-Git-Tag: V6_4_0a1~23
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4a8e780deb5da5beb4d1cf8050c88055a0d69aff;p=modules%2Fgeom.git

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

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index ee739d075..dc59f51f5 100644
--- 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 033704512..5d138bbf7 100644
--- 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;
   }
 }