[commit] r2220 - trunk/GME/Gme

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed May 29 10:10:41 2013
New Revision: 2220

Log:
Fix version info

Modified:
   trunk/GME/Gme/GME.rc
   trunk/GME/Gme/GUIObject.cpp

Modified: trunk/GME/Gme/GME.rc
==============================================================================
--- trunk/GME/Gme/GME.rc	Wed May 29 10:10:26 2013	(r2219)
+++ trunk/GME/Gme/GME.rc	Wed May 29 10:10:41 2013	(r2220)
@@ -71,6 +71,7 @@
 IDI_TYPEMARK_ICON       ICON                    "res\\icon1.ico"
 IDI_INSTANCEMARK_ICON   ICON                    "res\\typemark.ico"
 IDI_COMPNOTFOUND        ICON                    "res\\compnotfound.ico"
+// If this changes from ,5, change GME_bin.wxs
 ID_FILE_IMPORTXML       ICON                    "res\\XME.ico"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -125,13 +126,13 @@
     SEPARATOR
     BUTTON      ID_MODE_SHORTCONNECT
     BUTTON      ID_MODE_SHORTDISCONNECT
+    SEPARATOR
     BUTTON      ID_VIEW_GRID
     BUTTON      ID_VIEW_SHOWCONNECTEDPORTSONLY
     BUTTON      ID_EDIT_SYNC
     SEPARATOR
     BUTTON      ID_VIEW_PARENT
     BUTTON      ID_EDIT_SHOWBASETYPE
-    SEPARATOR
     BUTTON      ID_EDIT_SHOWTYPE
 END
 
@@ -1072,8 +1073,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 11,11,3,0
- PRODUCTVERSION 11,11,3,0
+ FILEVERSION GME_VERSION_RC
+ PRODUCTVERSION GME_VERSION_RC
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1089,12 +1090,12 @@
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "GME"
-            VALUE "FileVersion", "11.11.3"
+            VALUE "FileVersion", GME_VERSION_STR
             VALUE "InternalName", "GME"
             VALUE "LegalCopyright", "Copyright (C) 1999-2011 ISIS, Vanderbilt University"
             VALUE "OriginalFilename", "GME.EXE"
             VALUE "ProductName", "GME Application"
-            VALUE "ProductVersion", "11.11.3"
+            VALUE "ProductVersion", GME_VERSION_STR
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/GME/Gme/GUIObject.cpp
==============================================================================
--- trunk/GME/Gme/GUIObject.cpp	Wed May 29 10:10:26 2013	(r2219)
+++ trunk/GME/Gme/GUIObject.cpp	Wed May 29 10:10:41 2013	(r2220)
@@ -1273,7 +1273,7 @@
 		while (ppos && vpos) {
 			CComBSTR param(params.GetNext(ppos));
 			CComVariant value(values.GetNext(vpos));
-			COMTHROW(decor->SetParam(param,value));
+			COMTHROW(decor->SetParam(param, value));
 		}
 		// *************************************************************************************