[GME-commit] GMESRC/GME/Console Console.rc, 1.2, 1.3 Console.vcproj, 1.6, 1.7 ConsoleCtl.cpp, 1.7, 1.8

Log messages of CVS commits gme-commit at list.isis.vanderbilt.edu
Fri Apr 18 13:08:20 CDT 2008


Update of /project/gme-repository/GMESRC/GME/Console
In directory escher:/tmp/cvs-serv6698

Modified Files:
	Console.rc Console.vcproj ConsoleCtl.cpp 
Log Message:
fix.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: Console.vcproj
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Console/Console.vcproj,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Console.vcproj	15 Apr 2008 20:04:57 -0000	1.6
--- Console.vcproj	18 Apr 2008 18:08:18 -0000	1.7
***************
*** 429,433 ****
  			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
  			<File
! 				RelativePath=".\cleancon.bmp">
  			</File>
  			<File
--- 429,433 ----
  			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
  			<File
! 				RelativePath="res\cleancon.bmp">
  			</File>
  			<File
***************
*** 444,448 ****
  			</File>
  			<File
! 				RelativePath=".\execscr.bmp">
  			</File>
  			<File
--- 444,448 ----
  			</File>
  			<File
! 				RelativePath="res\execscr.bmp">
  			</File>
  			<File
***************
*** 450,454 ****
  			</File>
  			<File
! 				RelativePath=".\loadscr.bmp">
  			</File>
  			<File
--- 450,454 ----
  			</File>
  			<File
! 				RelativePath="res\loadscr.bmp">
  			</File>
  			<File

Index: Console.rc
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Console/Console.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Console.rc	2 Dec 2004 21:59:56 -0000	1.2
--- Console.rc	18 Apr 2008 18:08:18 -0000	1.3
***************
*** 1,3 ****
! //Microsoft Developer Studio generated resource script.
  //
  #include "resource.h"
--- 1,3 ----
! // Microsoft Visual C++ generated resource script.
  //
  #include "resource.h"
***************
*** 28,37 ****
  //
  
! 1 TEXTINCLUDE DISCARDABLE 
  BEGIN
      "resource.h\0"
  END
  
! 2 TEXTINCLUDE DISCARDABLE 
  BEGIN
      "#include ""afxres.h""\r\n"
--- 28,37 ----
  //
  
! 1 TEXTINCLUDE 
  BEGIN
      "resource.h\0"
  END
  
! 2 TEXTINCLUDE 
  BEGIN
      "#include ""afxres.h""\r\n"
***************
*** 39,43 ****
  END
  
! 3 TEXTINCLUDE DISCARDABLE 
  BEGIN
      "1 TYPELIB ""Console.tlb""\r\n"
--- 39,43 ----
  END
  
! 3 TEXTINCLUDE 
  BEGIN
      "1 TYPELIB ""Console.tlb""\r\n"
***************
*** 48,52 ****
  
  
- #ifndef _MAC
  /////////////////////////////////////////////////////////////////////////////
  //
--- 48,51 ----
***************
*** 71,84 ****
          BLOCK "040904B0"
          BEGIN
!             VALUE "CompanyName", "Budapest University of Technology and Economics\0"
!             VALUE "FileDescription", "Console ActiveX Control Module\0"
!             VALUE "FileVersion", "1, 0, 0, 1\0"
!             VALUE "InternalName", "Console\0"
!             VALUE "LegalCopyright", "Copyright (C) 2004\0"
!             VALUE "LegalTrademarks", "\0"
!             VALUE "OriginalFilename", "Console.OCX\0"
!             VALUE "ProductName", "Console ActiveX Control Module\0"
!             VALUE "ProductVersion", "1, 0, 0, 1\0"
!             VALUE "OLESelfRegister", "\0"
          END
      END
--- 70,81 ----
          BLOCK "040904B0"
          BEGIN
!             VALUE "CompanyName", "Budapest University of Technology and Economics"
!             VALUE "FileDescription", "Console ActiveX Control Module"
!             VALUE "FileVersion", "1, 0, 0, 1"
!             VALUE "InternalName", "Console"
!             VALUE "LegalCopyright", "Copyright (C) 2004"
!             VALUE "OriginalFilename", "Console.OCX"
!             VALUE "ProductName", "Console ActiveX Control Module"
!             VALUE "ProductVersion", "1, 0, 0, 1"
          END
      END
***************
*** 89,94 ****
  END
  
- #endif    // !_MAC
- 
  
  /////////////////////////////////////////////////////////////////////////////
--- 86,89 ----
***************
*** 99,103 ****
  // Icon with lowest ID value placed first to ensure application icon
  // remains consistent on all systems.
! IDI_ABOUTDLL            ICON    DISCARDABLE     "Console.ico"
  
  /////////////////////////////////////////////////////////////////////////////
--- 94,98 ----
  // Icon with lowest ID value placed first to ensure application icon
  // remains consistent on all systems.
! IDI_ABOUTDLL            ICON                    "Console.ico"
  
  /////////////////////////////////////////////////////////////////////////////
***************
*** 106,110 ****
  //
  
! IDB_CONSOLE             BITMAP  DISCARDABLE     "ConsoleCtl.bmp"
  
  /////////////////////////////////////////////////////////////////////////////
--- 101,108 ----
  //
  
! IDB_CONSOLE             BITMAP                  "ConsoleCtl.bmp"
! IDB_LOADSCR             BITMAP                  "res\\loadscr.bmp"
! IDB_EXECSCR             BITMAP                  "res\\execscr.bmp"
! IDB_CLEANCON            BITMAP                  "res\\cleancon.bmp"
  
  /////////////////////////////////////////////////////////////////////////////
***************
*** 113,118 ****
  //
  
! IDD_ABOUTBOX_CONSOLE DIALOG DISCARDABLE  34, 22, 260, 55
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "About GME Console Control"
  FONT 8, "MS Sans Serif"
--- 111,116 ----
  //
  
! IDD_ABOUTBOX_CONSOLE DIALOG  34, 22, 260, 55
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "About GME Console Control"
  FONT 8, "MS Sans Serif"
***************
*** 126,131 ****
  END
  
! IDD_PROPPAGE_CONSOLE DIALOG DISCARDABLE  0, 0, 250, 62
! STYLE WS_CHILD
  FONT 8, "MS Sans Serif"
  BEGIN
--- 124,129 ----
  END
  
! IDD_PROPPAGE_CONSOLE DIALOG  0, 0, 250, 62
! STYLE DS_SETFONT | WS_CHILD
  FONT 8, "MS Sans Serif"
  BEGIN
***************
*** 140,144 ****
  
  #ifdef APSTUDIO_INVOKED
! GUIDELINES DESIGNINFO DISCARDABLE 
  BEGIN
      IDD_ABOUTBOX_CONSOLE, DIALOG
--- 138,142 ----
  
  #ifdef APSTUDIO_INVOKED
! GUIDELINES DESIGNINFO 
  BEGIN
      IDD_ABOUTBOX_CONSOLE, DIALOG
***************
*** 166,174 ****
  //
  
! BLANK.HTML              HTML    DISCARDABLE     "res\\blank.html"
! WARNING.GIF             HTML    DISCARDABLE     "res\\warning.gif"
! ERROR.GIF               HTML    DISCARDABLE     "res\\error.gif"
! INFO.GIF                HTML    DISCARDABLE     "res\\info.gif"
! NORMAL.GIF              HTML    DISCARDABLE     "res\\normal.gif"
  
  /////////////////////////////////////////////////////////////////////////////
--- 164,172 ----
  //
  
! BLANK.HTML              HTML                    "res\\blank.html"
! WARNING.GIF             HTML                    "res\\warning.gif"
! ERROR.GIF               HTML                    "res\\error.gif"
! INFO.GIF                HTML                    "res\\info.gif"
! NORMAL.GIF              HTML                    "res\\normal.gif"
  
  /////////////////////////////////////////////////////////////////////////////
***************
*** 177,182 ****
  //
  
! IDR_CONSOLE             REGISTRY DISCARDABLE    "Console.rgs"
! IDR_SCRIPTHOST          REGISTRY DISCARDABLE    "ScriptHost.rgs"
  
  /////////////////////////////////////////////////////////////////////////////
--- 175,180 ----
  //
  
! IDR_CONSOLE             REGISTRY                "Console.rgs"
! IDR_SCRIPTHOST          REGISTRY                "ScriptHost.rgs"
  
  /////////////////////////////////////////////////////////////////////////////
***************
*** 185,189 ****
  //
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      IDS_CONSOLE             "GME Console Control"
--- 183,187 ----
  //
  
! STRINGTABLE 
  BEGIN
      IDS_CONSOLE             "GME Console Control"
***************
*** 191,195 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      IDS_CONSOLE_PPG_CAPTION "General"
--- 189,193 ----
  END
  
! STRINGTABLE 
  BEGIN
      IDS_CONSOLE_PPG_CAPTION "General"

Index: ConsoleCtl.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Console/ConsoleCtl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ConsoleCtl.cpp	15 Apr 2008 20:04:57 -0000	1.7
--- ConsoleCtl.cpp	18 Apr 2008 18:08:18 -0000	1.8
***************
*** 22,40 ****
  IMPLEMENT_DYNCREATE(CConsoleCtrl, COleControl)
  
- 
- #define IDC_MENU_COMMAND				105
- #define IDC_EDITOR_COMMAND				106
- #define IDC_LOADSCRIPT_COMMAND			107
- #define IDC_RUNSCRIPT_COMMAND			108
- #define IDC_CLEARCONSOLE_COMMAND        109
- #define IDC_SELECTENGINE_COMMAND        113
- #define IDC_RELOADRUN_COMMAND           114
- #define IDC_RELOAD_COMMAND              115
- #define IDC_RECENT_SCRIPT1              121
- #define IDC_RECENT_SCRIPT2              122
- #define IDC_RECENT_SCRIPT3              123
- #define IDC_RECENT_SCRIPT4              124
- #define IDC_RECENT_SCRIPT5              125
- 
  /////////////////////////////////////////////////////////////////////////////
  // Message map
--- 22,25 ----



More information about the GME-commit mailing list