[GME-commit] GMESRC/GME/Gme GME.vcproj,NONE,1.1 GME.rc,1.136,1.137 GMEApp.cpp,1.126,1.127 GMEConsole.cpp,1.2,1.3 GMEOLEData.cpp,1.21,1.22 GMEOLEModel.cpp,1.7,1.8 GMEView.cpp,1.162,1.163 GUIObject.cpp,1.49,1.50 MainFrm.cpp,1.27,1.28 RecentConnStrList.cpp,1.1,1.2 Regexp.h,1.1,1.2 StdAfx.h,1.11,1.12 console.cpp,1.2,1.3 console.h,1.2,1.3 GME.dsp,1.95,NONE

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Wed Jan 26 11:31:38 CST 2005 

Update of /var/lib/gme/GMESRC/GME/Gme
In directory braindrain:/tmp/cvs-serv19193/GME/Gme

Modified Files:
	GME.rc GMEApp.cpp GMEConsole.cpp GMEOLEData.cpp 
	GMEOLEModel.cpp GMEView.cpp GUIObject.cpp MainFrm.cpp 
	RecentConnStrList.cpp Regexp.h StdAfx.h console.cpp console.h 
Added Files:
	GME.vcproj 
Removed Files:
	GME.dsp 
Log Message:
Checkin for VC7.1 upgrade


CVS User: zolmol

--- NEW FILE: GME.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="GME"
	SccProjectName=""
	SccLocalPath=""
	Keyword="MFCProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Release|Win32"
			OutputDirectory=".\Release"
			IntermediateDirectory=".\Release"
			ConfigurationType="1"
			UseOfMFC="2"
[...1838 lines suppressed...]
		</Filter>
		<File
			RelativePath="changes.txt">
		</File>
		<File
			RelativePath="GME.reg">
		</File>
		<File
			RelativePath="ReadMe.txt">
		</File>
		<File
			RelativePath="..\RequestedFeatureList.txt">
		</File>
	</Files>
	<Globals>
		<Global
			Name="RESOURCE_FILE"
			Value="GME.rc"/>
	</Globals>
</VisualStudioProject>

Index: GME.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GME.rc,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** GME.rc	12 Jan 2005 18:03:33 -0000	1.136
--- GME.rc	26 Jan 2005 17:28:27 -0000	1.137
***************
*** 1,3 ****
! //Microsoft Developer Studio generated resource script.
  //
  #include "resource.h"
--- 1,3 ----
! // Microsoft Visual C++ generated resource script.
  //
  #include "resource.h"
***************
*** 29,38 ****
  //
  
! 1 TEXTINCLUDE DISCARDABLE 
  BEGIN
      "resource.h\0"
  END
  
! 2 TEXTINCLUDE DISCARDABLE 
  BEGIN
      "#include ""afxres.h""\r\n"
--- 29,38 ----
  //
  
! 1 TEXTINCLUDE 
  BEGIN
      "resource.h\0"
  END
  
! 2 TEXTINCLUDE 
  BEGIN
      "#include ""afxres.h""\r\n"
***************
*** 41,45 ****
  END
  
! 3 TEXTINCLUDE DISCARDABLE 
  BEGIN
      "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
--- 41,45 ----
  END
  
! 3 TEXTINCLUDE 
  BEGIN
      "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
***************
*** 69,77 ****
  // Icon with lowest ID value placed first to ensure application icon
  // remains consistent on all systems.
! IDR_MAINFRAME           ICON    DISCARDABLE     "res\\GME.ico"
! IDR_GMETYPE             ICON    DISCARDABLE     "res\\GMEDoc.ico"
! IDI_TYPEMARK_ICON       ICON    DISCARDABLE     "res\\icon1.ico"
! IDI_INSTANCEMARK_ICON   ICON    DISCARDABLE     "res\\typemark.ico"
! IDI_COMPNOTFOUND        ICON    DISCARDABLE     "res\\ico00001.ico"
  
  /////////////////////////////////////////////////////////////////////////////
--- 69,77 ----
  // Icon with lowest ID value placed first to ensure application icon
  // remains consistent on all systems.
! IDR_MAINFRAME           ICON                    "res\\GME.ico"
! IDR_GMETYPE             ICON                    "res\\GMEDoc.ico"
! IDI_TYPEMARK_ICON       ICON                    "res\\icon1.ico"
! IDI_INSTANCEMARK_ICON   ICON                    "res\\typemark.ico"
! IDI_COMPNOTFOUND        ICON                    "res\\ico00001.ico"
  
  /////////////////////////////////////////////////////////////////////////////
***************
*** 80,91 ****
  //
  
! IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
! IDR_TOOLBAR_MODE        BITMAP  DISCARDABLE     "res\\toolbar1.bmp"
! IDB_METAOPEN            BITMAP  DISCARDABLE     "res\\mgaopen.bmp"
! IDB_MGAOPEN             BITMAP  DISCARDABLE     "res\\metaopen.bmp"
! IDB_BITMAP_LOGO         BITMAP  DISCARDABLE     "res\\bitmap_l.bmp"
! IDB_SPLASH              BITMAP  DISCARDABLE     "Splsh16.bmp"
! IDB_ABOUT               BITMAP  DISCARDABLE     "aboutpic.bmp"
! IDR_TOOLBAR_DUMMY       BITMAP  DISCARDABLE     "res\\dummybar.bmp"
  
  /////////////////////////////////////////////////////////////////////////////
--- 80,91 ----
  //
  
! IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
! IDR_TOOLBAR_MODE        BITMAP                  "res\\toolbar1.bmp"
! IDB_METAOPEN            BITMAP                  "res\\mgaopen.bmp"
! IDB_MGAOPEN             BITMAP                  "res\\metaopen.bmp"
! IDB_BITMAP_LOGO         BITMAP                  "res\\bitmap_l.bmp"
! IDB_SPLASH              BITMAP                  "Splsh16.bmp"
! IDB_ABOUT               BITMAP                  "aboutpic.bmp"
! IDR_TOOLBAR_DUMMY       BITMAP                  "res\\dummybar.bmp"
  
  /////////////////////////////////////////////////////////////////////////////
***************
*** 94,98 ****
  //
  
! IDR_MAINFRAME TOOLBAR DISCARDABLE  16, 15
  BEGIN
      BUTTON      ID_FILE_CHECK
--- 94,98 ----
  //
  
! IDR_MAINFRAME TOOLBAR  16, 15
  BEGIN
      BUTTON      ID_FILE_CHECK
***************
*** 129,133 ****
  END
  
! IDR_TOOLBAR_MODE TOOLBAR DISCARDABLE  16, 15
  BEGIN
      BUTTON      ID_MODE_EDIT
--- 129,133 ----
  END
  
! IDR_TOOLBAR_MODE TOOLBAR  16, 15
  BEGIN
      BUTTON      ID_MODE_EDIT
***************
*** 139,143 ****
  END
  
! IDR_TOOLBAR_DUMMY TOOLBAR DISCARDABLE  16, 15
  BEGIN
      BUTTON      ID_DUMMY
--- 139,143 ----
  END
  
! IDR_TOOLBAR_DUMMY TOOLBAR  16, 15
  BEGIN
      BUTTON      ID_DUMMY
***************
*** 150,154 ****
  //
  
! IDR_MAINFRAME MENU PRELOAD DISCARDABLE 
  BEGIN
      POPUP "&File"
--- 150,154 ----
  //
  
! IDR_MAINFRAME MENU 
  BEGIN
      POPUP "&File"
***************
*** 208,212 ****
  END
  
! IDR_GMETYPE MENU PRELOAD DISCARDABLE 
  BEGIN
      POPUP "&File"
--- 208,212 ----
  END
  
! IDR_GMETYPE MENU 
  BEGIN
      POPUP "&File"
***************
*** 311,315 ****
  END
  
! IDR_GMETYPE_CNTR_IP MENU PRELOAD DISCARDABLE 
  BEGIN
      POPUP "&File"
--- 311,315 ----
  END
  
! IDR_GMETYPE_CNTR_IP MENU 
  BEGIN
      POPUP "&File"
***************
*** 342,346 ****
  END
  
! IDR_SELFCONTEXT_MENU MENU DISCARDABLE 
  BEGIN
      POPUP "Cntx"
--- 342,346 ----
  END
  
! IDR_SELFCONTEXT_MENU MENU 
  BEGIN
      POPUP "Cntx"
***************
*** 387,391 ****
  END
  
! IDR_ANNCONTEXT_MENU MENU DISCARDABLE 
  BEGIN
      POPUP "Cntx"
--- 387,391 ----
  END
  
! IDR_ANNCONTEXT_MENU MENU 
  BEGIN
      POPUP "Cntx"
***************
*** 400,404 ****
  END
  
! IDR_CONNCONTEXT_MENU MENU DISCARDABLE 
  BEGIN
      POPUP "Cntx"
--- 400,404 ----
  END
  
! IDR_CONNCONTEXT_MENU MENU 
  BEGIN
      POPUP "Cntx"
***************
*** 444,448 ****
  END
  
! IDR_CONTEXT_MENU MENU DISCARDABLE 
  BEGIN
      POPUP "Cntx"
--- 444,448 ----
  END
  
! IDR_CONTEXT_MENU MENU 
  BEGIN
      POPUP "Cntx"
***************
*** 511,515 ****
  //
  
! IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE 
  BEGIN
      "1",            ID_MODE_EDIT,           VIRTKEY, CONTROL, NOINVERT
--- 511,515 ----
  //
  
! IDR_MAINFRAME ACCELERATORS 
  BEGIN
      "1",            ID_MODE_EDIT,           VIRTKEY, CONTROL, NOINVERT
***************
*** 527,531 ****
  END
  
! IDR_GMETYPE_CNTR_IP ACCELERATORS PRELOAD MOVEABLE PURE 
  BEGIN
      "N",            ID_FILE_NEW,            VIRTKEY, CONTROL
--- 527,531 ----
  END
  
! IDR_GMETYPE_CNTR_IP ACCELERATORS 
  BEGIN
      "N",            ID_FILE_NEW,            VIRTKEY, CONTROL
***************
*** 538,542 ****
  END
  
! IDR_GMEVIEW ACCELERATORS DISCARDABLE 
  BEGIN
      "A",            ID_EDIT_SELECTALL,      VIRTKEY, CONTROL, NOINVERT
--- 538,542 ----
  END
  
! IDR_GMEVIEW ACCELERATORS 
  BEGIN
      "A",            ID_EDIT_SELECTALL,      VIRTKEY, CONTROL, NOINVERT
***************
*** 562,567 ****
  //
  
! IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 179, 114
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "About GME"
  FONT 10, "MS Sans Serif"
--- 562,567 ----
  //
  
! IDD_ABOUTBOX DIALOG  0, 0, 179, 114
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "About GME"
  FONT 10, "MS Sans Serif"
***************
*** 576,581 ****
  END
  
! CG_IDD_MODELPROPERTIESBAR DIALOG DISCARDABLE  0, 0, 467, 16
! STYLE WS_CHILD
  FONT 8, "MS Sans Serif"
  BEGIN
--- 576,581 ----
  END
  
! CG_IDD_MODELPROPERTIESBAR DIALOG  0, 0, 467, 16
! STYLE DS_SETFONT | WS_CHILD
  FONT 8, "MS Sans Serif"
  BEGIN
***************
*** 598,602 ****
  
  IDD_PARTBROWSER_DIALOG DIALOGEX 0, 0, 137, 74
! STYLE DS_SETFOREGROUND | WS_CHILD | WS_VISIBLE
  EXSTYLE WS_EX_CLIENTEDGE
  FONT 8, "MS Sans Serif", 0, 0, 0x1
--- 598,602 ----
  
  IDD_PARTBROWSER_DIALOG DIALOGEX 0, 0, 137, 74
! STYLE DS_SETFONT | DS_SETFOREGROUND | WS_CHILD | WS_VISIBLE
  EXSTYLE WS_EX_CLIENTEDGE
  FONT 8, "MS Sans Serif", 0, 0, 0x1
***************
*** 606,617 ****
  END
  
! IDD_PARTBROWSERFRAME_DIALOG DIALOG DISCARDABLE  0, 0, 107, 56
! STYLE WS_CHILD | WS_VISIBLE | WS_VSCROLL
  FONT 8, "MS Sans Serif"
  BEGIN
  END
  
! IDD_BROWSER_DIALOG DIALOG DISCARDABLE  0, 0, 250, 256
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "GME Browser"
  FONT 8, "MS Sans Serif"
--- 606,617 ----
  END
  
! IDD_PARTBROWSERFRAME_DIALOG DIALOG  0, 0, 107, 56
! STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_VSCROLL
  FONT 8, "MS Sans Serif"
  BEGIN
  END
  
! IDD_BROWSER_DIALOG DIALOG  0, 0, 250, 256
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "GME Browser"
  FONT 8, "MS Sans Serif"
***************
*** 622,627 ****
  END
  
! IDD_MGAOPEN DIALOG DISCARDABLE  0, 0, 167, 100
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Open"
  FONT 8, "MS Sans Serif"
--- 622,627 ----
  END
  
! IDD_MGAOPEN DIALOG  0, 0, 167, 100
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Open"
  FONT 8, "MS Sans Serif"
***************
*** 642,653 ****
  END
  
! IDR_MAINFRAME DIALOG DISCARDABLE  0, 0, 214, 16
! STYLE WS_CHILD
  FONT 8, "MS Sans Serif"
  BEGIN
  END
  
! IDD_PROJECTPROPERTIES_DIALOG DIALOG DISCARDABLE  0, 0, 193, 271
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Project Properties"
  FONT 8, "MS Sans Serif"
--- 642,653 ----
  END
  
! IDR_MAINFRAME DIALOG  0, 0, 214, 16
! STYLE DS_SETFONT | WS_CHILD
  FONT 8, "MS Sans Serif"
  BEGIN
  END
  
! IDD_PROJECTPROPERTIES_DIALOG DIALOG  0, 0, 193, 271
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Project Properties"
  FONT 8, "MS Sans Serif"
***************
*** 685,690 ****
  END
  
! IDD_SYNCHRONIZE_DIALOG DIALOG DISCARDABLE  0, 0, 312, 166
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Synchronize Aspects"
  FONT 8, "MS Sans Serif"
--- 685,690 ----
  END
  
! IDD_SYNCHRONIZE_DIALOG DIALOG  0, 0, 312, 166
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Synchronize Aspects"
  FONT 8, "MS Sans Serif"
***************
*** 708,713 ****
  END
  
! IDD_DLL_DIALOG DIALOG DISCARDABLE  0, 0, 252, 186
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "DLL Info"
  FONT 8, "MS Sans Serif"
--- 708,713 ----
  END
  
! IDD_DLL_DIALOG DIALOG  0, 0, 252, 186
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "DLL Info"
  FONT 8, "MS Sans Serif"
***************
*** 719,724 ****
  END
  
! IDD_OBJECT_INSPECTOR_DIALOG DIALOG DISCARDABLE  0, 0, 157, 212
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Dialog"
  FONT 8, "MS Sans Serif"
--- 719,724 ----
  END
  
! IDD_OBJECT_INSPECTOR_DIALOG DIALOG  0, 0, 157, 212
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Dialog"
  FONT 8, "MS Sans Serif"
***************
*** 729,734 ****
  END
  
! IDD_SEARCH_DIALOG DIALOG DISCARDABLE  200, 100, 258, 235
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Search"
  FONT 8, "MS Sans Serif"
--- 729,734 ----
  END
  
! IDD_SEARCH_DIALOG DIALOG  200, 100, 258, 235
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Search"
  FONT 8, "MS Sans Serif"
***************
*** 738,743 ****
  END
  
! IDD_PRINTOPTIONS DIALOG DISCARDABLE  0, 0, 162, 205
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Print Options"
  FONT 8, "MS Sans Serif"
--- 738,743 ----
  END
  
! IDD_PRINTOPTIONS DIALOG  0, 0, 162, 205
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Print Options"
  FONT 8, "MS Sans Serif"
***************
*** 756,761 ****
  
  IDD_PRINT_DIALOG DIALOGEX 32, 32, 420, 374
! STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
!     WS_CAPTION | WS_SYSMENU
  CAPTION "Print"
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
--- 756,761 ----
  
  IDD_PRINT_DIALOG DIALOGEX 32, 32, 420, 374
! STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | 
!     WS_VISIBLE | WS_CAPTION | WS_SYSMENU
  CAPTION "Print"
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
***************
*** 834,839 ****
  
  IDD_PRINTSETUP_DIALOG DIALOGEX 32, 32, 291, 177
! STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
!     WS_CAPTION | WS_SYSMENU
  CAPTION "Print Setup"
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
--- 834,839 ----
  
  IDD_PRINTSETUP_DIALOG DIALOGEX 32, 32, 291, 177
! STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | 
!     WS_VISIBLE | WS_CAPTION | WS_SYSMENU
  CAPTION "Print Setup"
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
***************
*** 877,881 ****
  
  IDD_PANNWINDLG DIALOGEX 0, 0, 139, 108
! STYLE DS_SETFOREGROUND | WS_CHILD | WS_VISIBLE
  FONT 8, "MS Sans Serif", 0, 0, 0x1
  BEGIN
--- 877,881 ----
  
  IDD_PANNWINDLG DIALOGEX 0, 0, 139, 108
! STYLE DS_SETFONT | DS_SETFOREGROUND | WS_CHILD | WS_VISIBLE
  FONT 8, "MS Sans Serif", 0, 0, 0x1
  BEGIN
***************
*** 884,889 ****
  END
  
! IDD_NEW_MULTIUSER_PROJ_DLG DIALOG DISCARDABLE  0, 0, 373, 204
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "New Multiuser Project"
  FONT 8, "MS Sans Serif"
--- 884,889 ----
  END
  
! IDD_NEW_MULTIUSER_PROJ_DLG DIALOG  0, 0, 373, 204
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "New Multiuser Project"
  FONT 8, "MS Sans Serif"
***************
*** 913,918 ****
  END
  
! IDD_PARADIGMPROPERTIES_DIALOG DIALOG DISCARDABLE  0, 0, 193, 201
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Paradigm Properties"
  FONT 8, "MS Sans Serif"
--- 913,918 ----
  END
  
! IDD_PARADIGMPROPERTIES_DIALOG DIALOG  0, 0, 193, 201
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Paradigm Properties"
  FONT 8, "MS Sans Serif"
***************
*** 942,947 ****
  END
  
! IDD_CONSOLE_DIALOG DIALOG DISCARDABLE  0, 0, 393, 65
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Dialog"
  FONT 8, "MS Sans Serif"
--- 942,947 ----
  END
  
! IDD_CONSOLE_DIALOG DIALOG  0, 0, 393, 65
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Dialog"
  FONT 8, "MS Sans Serif"
***************
*** 953,957 ****
  
  
- #ifndef _MAC
  /////////////////////////////////////////////////////////////////////////////
  //
--- 953,956 ----
***************
*** 976,991 ****
          BLOCK "040904b0"
          BEGIN
!             VALUE "Comments", "\0"
!             VALUE "CompanyName", "\0"
!             VALUE "FileDescription", "GME MFC Application\0"
!             VALUE "FileVersion", "1, 0, 0, 1\0"
!             VALUE "InternalName", "GME\0"
!             VALUE "LegalCopyright", "Copyright (C) 1999\0"
!             VALUE "LegalTrademarks", "\0"
!             VALUE "OriginalFilename", "GME.EXE\0"
!             VALUE "PrivateBuild", "\0"
!             VALUE "ProductName", "GME Application\0"
!             VALUE "ProductVersion", "1, 0, 0, 1\0"
!             VALUE "SpecialBuild", "\0"
          END
      END
--- 975,985 ----
          BLOCK "040904b0"
          BEGIN
!             VALUE "FileDescription", "GME MFC Application"
!             VALUE "FileVersion", "1, 0, 0, 1"
!             VALUE "InternalName", "GME"
!             VALUE "LegalCopyright", "Copyright (C) 1999"
!             VALUE "OriginalFilename", "GME.EXE"
!             VALUE "ProductName", "GME Application"
!             VALUE "ProductVersion", "1, 0, 0, 1"
          END
      END
***************
*** 996,1001 ****
  END
  
- #endif    // !_MAC
- 
  
  /////////////////////////////////////////////////////////////////////////////
--- 990,993 ----
***************
*** 1005,1009 ****
  
  #ifdef APSTUDIO_INVOKED
! GUIDELINES DESIGNINFO DISCARDABLE 
  BEGIN
      IDD_ABOUTBOX, DIALOG
--- 997,1001 ----
  
  #ifdef APSTUDIO_INVOKED
! GUIDELINES DESIGNINFO 
  BEGIN
      IDD_ABOUTBOX, DIALOG
***************
*** 1216,1227 ****
  //
  
! IDC_AUTOCONNECT_CURSOR  CURSOR  DISCARDABLE     "res\\cursor1.cur"
! IDC_DISCONNECT_CURSOR   CURSOR  DISCARDABLE     "res\\cur00001.cur"
! IDC_AUTOCONNECT2_CURSOR CURSOR  DISCARDABLE     "res\\cur00002.cur"
! IDC_DISCONNECT2_CURSOR  CURSOR  DISCARDABLE     "res\\cur00003.cur"
! IDC_SET_CURSOR          CURSOR  DISCARDABLE     "res\\cur00005.cur"
! IDC_SET2_CURSOR         CURSOR  DISCARDABLE     "res\\cur00004.cur"
! IDC_VISUAL_CURSOR       CURSOR  DISCARDABLE     "res\\visual_c.cur"
! IDC_ZOOM_CURSOR         CURSOR  DISCARDABLE     "res\\cur00006.cur"
  
  /////////////////////////////////////////////////////////////////////////////
--- 1208,1219 ----
  //
  
! IDC_AUTOCONNECT_CURSOR  CURSOR                  "res\\cursor1.cur"
! IDC_DISCONNECT_CURSOR   CURSOR                  "res\\cur00001.cur"
! IDC_AUTOCONNECT2_CURSOR CURSOR                  "res\\cur00002.cur"
! IDC_DISCONNECT2_CURSOR  CURSOR                  "res\\cur00003.cur"
! IDC_SET_CURSOR          CURSOR                  "res\\cur00005.cur"
! IDC_SET2_CURSOR         CURSOR                  "res\\cur00004.cur"
! IDC_VISUAL_CURSOR       CURSOR                  "res\\visual_c.cur"
! IDC_ZOOM_CURSOR         CURSOR                  "res\\cur00006.cur"
  
  /////////////////////////////////////////////////////////////////////////////
***************
*** 1230,1234 ****
  //
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      IDP_FAILED_TO_CREATE    "Failed to create object.  Make sure the object is entered in the system registry."
--- 1222,1226 ----
  //
  
! STRINGTABLE 
  BEGIN
      IDP_FAILED_TO_CREATE    "Failed to create object.  Make sure the object is entered in the system registry."
***************
*** 1242,1246 ****
  END
  
! STRINGTABLE PRELOAD DISCARDABLE 
  BEGIN
      IDR_MAINFRAME           "GME"
--- 1234,1238 ----
  END
  
! STRINGTABLE 
  BEGIN
      IDR_MAINFRAME           "GME"
***************
*** 1248,1252 ****
  END
  
! STRINGTABLE PRELOAD DISCARDABLE 
  BEGIN
      AFX_IDS_APP_TITLE       "GME"
--- 1240,1244 ----
  END
  
! STRINGTABLE 
  BEGIN
      AFX_IDS_APP_TITLE       "GME"
***************
*** 1254,1258 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_INDICATOR_EXT        "EXT"
--- 1246,1250 ----
  END
  
! STRINGTABLE 
  BEGIN
      ID_INDICATOR_EXT        "EXT"
***************
*** 1264,1268 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_FILE_NEW             "Create a new project\nNew"
--- 1256,1260 ----
  END
  
! STRINGTABLE 
  BEGIN
      ID_FILE_NEW             "Create a new project\nNew"
***************
*** 1277,1281 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_APP_ABOUT            "Display program information, version number and copyright\nAbout"
--- 1269,1273 ----
  END
  
! STRINGTABLE 
  BEGIN
      ID_APP_ABOUT            "Display program information, version number and copyright\nAbout"
***************
*** 1283,1287 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_FILE_MRU_FILE1       "Open this document"
--- 1275,1279 ----
  END
  
! STRINGTABLE 
  BEGIN
      ID_FILE_MRU_FILE1       "Open this document"
***************
*** 1303,1307 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_NEXT_PANE            "Switch to the next window pane\nNext Pane"
--- 1295,1299 ----
  END
  
! STRINGTABLE 
  BEGIN
      ID_NEXT_PANE            "Switch to the next window pane\nNext Pane"
***************
*** 1309,1313 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_WINDOW_NEW           "Open another window for the active document\nNew Window"
--- 1301,1305 ----
  END
  
! STRINGTABLE 
  BEGIN
      ID_WINDOW_NEW           "Open another window for the active document\nNew Window"
***************
*** 1319,1323 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_EDIT_CLEAR           "Erase the selection\nErase"
--- 1311,1315 ----
  END
  
! STRINGTABLE 
  BEGIN
      ID_EDIT_CLEAR           "Erase the selection\nErase"
***************
*** 1336,1340 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_VIEW_TOOLBAR         "Show or hide the toolbar\nToggle ToolBar"
--- 1328,1332 ----
  END
  
! STRINGTABLE 
  BEGIN
      ID_VIEW_TOOLBAR         "Show or hide the toolbar\nToggle ToolBar"
***************
*** 1342,1346 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_OLE_INSERT_NEW       "Insert new embedded object\nNew Object"
--- 1334,1338 ----
  END
  
! STRINGTABLE 
  BEGIN
      ID_OLE_INSERT_NEW       "Insert new embedded object\nNew Object"
***************
*** 1349,1353 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_OLE_VERB_FIRST       "Activate embedded or linked object"
--- 1341,1345 ----
  END
  
! STRINGTABLE 
  BEGIN
      ID_OLE_VERB_FIRST       "Activate embedded or linked object"
***************
*** 1357,1361 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      AFX_IDS_SCSIZE          "Change the window size"
--- 1349,1353 ----
  END
  
! STRINGTABLE 
  BEGIN
      AFX_IDS_SCSIZE          "Change the window size"
***************
*** 1368,1372 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      AFX_IDS_SCRESTORE       "Restore the window to normal size"
--- 1360,1364 ----
  END
  
! STRINGTABLE 
  BEGIN
      AFX_IDS_SCRESTORE       "Restore the window to normal size"
***************
*** 1375,1384 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      AFX_IDS_PREVIEW_CLOSE   "Close print preview mode\nCancel Preview"
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_MODE_EDIT            "Edit Mode\nEdit Mode"
--- 1367,1376 ----
  END
  
! STRINGTABLE 
  BEGIN
      AFX_IDS_PREVIEW_CLOSE   "Close print preview mode\nCancel Preview"
  END
  
! STRINGTABLE 
  BEGIN
      ID_MODE_EDIT            "Edit Mode\nEdit Mode"
***************
*** 1395,1404 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_VIEW_BROWSER         "Toggle Browser\nTree Browser"
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_EDIT_CANCEL          "Cancel operation\nCancel"
--- 1387,1396 ----
  END
  
! STRINGTABLE 
  BEGIN
      ID_VIEW_BROWSER         "Toggle Browser\nTree Browser"
  END
  
! STRINGTABLE 
  BEGIN
      ID_EDIT_CANCEL          "Cancel operation\nCancel"
***************
*** 1411,1420 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_HELP_HELP            "Web-based context-sensitive help\nHelp"
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_EDIT_SHOWBASETYPE    "Show bastype mdoel of current model\nShow Basetype"
--- 1403,1412 ----
  END
  
! STRINGTABLE 
  BEGIN
      ID_HELP_HELP            "Web-based context-sensitive help\nHelp"
  END
  
! STRINGTABLE 
  BEGIN
      ID_EDIT_SHOWBASETYPE    "Show bastype mdoel of current model\nShow Basetype"
***************
*** 1429,1433 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_CNTX_INTERPRET       "Interpret selected models"
--- 1421,1425 ----
  END
  
! STRINGTABLE 
  BEGIN
      ID_CNTX_INTERPRET       "Interpret selected models"
***************
*** 1440,1451 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_EDIT_COPYCLOSURE     "Copy a closure of the selected objects to the Clipboard"
      ID_CNTX_CHECK           "Check selected or current model"
      ID_CNTX_LOCATE          "Locate in Object Browser"
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_FILE_ABORTPROJECT    "Abort Project\nAbort"
--- 1432,1446 ----
  END
  
! STRINGTABLE 
  BEGIN
      ID_EDIT_COPYCLOSURE     "Copy a closure of the selected objects to the Clipboard"
+     ID_EDIT_COPYSMART       "Copies references/sets/connections to the Clipboard so that it can be reproduced upon Paste"
      ID_CNTX_CHECK           "Check selected or current model"
      ID_CNTX_LOCATE          "Locate in Object Browser"
+     ID_EDIT_PASTESPECIAL_ASCLOSURE 
+                             "Pastes copyclosured/smartcopied data without checking constraints"
  END
  
! STRINGTABLE 
  BEGIN
      ID_FILE_ABORTPROJECT    "Abort Project\nAbort"
***************
*** 1453,1462 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_EDIT_SEARCH          "Search in the Project\nSearch"
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      ID_FILE_PRINTSEL        "Print the selected models\\Print Selected"
--- 1448,1457 ----
  END
  
! STRINGTABLE 
  BEGIN
      ID_EDIT_SEARCH          "Search in the Project\nSearch"
  END
  
! STRINGTABLE 
  BEGIN
      ID_FILE_PRINTSEL        "Print the selected models\\Print Selected"

Index: GMEApp.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEApp.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** GMEApp.cpp	2 Dec 2004 22:32:22 -0000	1.126
--- GMEApp.cpp	26 Jan 2005 17:28:27 -0000	1.127
***************
*** 3,6 ****
--- 3,7 ----
  
  #include "stdafx.h"
+ #include <afxwin.h> // for CWaitCursor
  #include "GMEApp.h"
  
***************
*** 233,237 ****
  
  #ifdef _AFXDLL
! 	Enable3dControls();			// Call this when using MFC in a shared DLL
  #else
  	Enable3dControlsStatic();	// Call this when linking to MFC statically
--- 234,238 ----
  
  #ifdef _AFXDLL
! 	//Enable3dControls(); // deprecated
  #else
  	Enable3dControlsStatic();	// Call this when linking to MFC statically
***************
*** 474,478 ****
  {
  
! 	CWaitCursor wait();
  	
  	if(CGMEDataSource::myData) // it is true when object copied to the clipboard from the view
--- 475,479 ----
  {
  
! 	CWaitCursor wait;
  	
  	if(CGMEDataSource::myData) // it is true when object copied to the clipboard from the view
***************
*** 935,939 ****
  						  "Connection string: " + CString(conn));
  		}
! 		if(!(parname == metaname)) {
  			throw CString("The paradigm opened '" + CString(parname) + "'\n"
  		 				  "differs from the requested paradigm '"+ metaname + "'\n"
--- 936,940 ----
  						  "Connection string: " + CString(conn));
  		}
! 		if(!( parname == CComBSTR( (LPCTSTR) metaname))) {
  			throw CString("The paradigm opened '" + CString(parname) + "'\n"
  		 				  "differs from the requested paradigm '"+ metaname + "'\n"
***************
*** 986,990 ****
  	MSGTRY
  	{
! 		CWaitCursor wait();
  
  		ASSERT( mgaProject == 0 );
--- 987,991 ----
  	MSGTRY
  	{
! 		CWaitCursor wait;
  
  		ASSERT( mgaProject == 0 );
***************
*** 1126,1130 ****
  	try
  	{
! 		CWaitCursor wait();
  
  		// create the project
--- 1127,1131 ----
  	try
  	{
! 		CWaitCursor wait;
  
  		// create the project

Index: GMEConsole.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEConsole.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GMEConsole.cpp	2 Dec 2004 22:32:22 -0000	1.2
--- GMEConsole.cpp	26 Jan 2005 17:28:27 -0000	1.3
***************
*** 119,121 ****
  {
  	m_Console.SetGMEApp(idp);
! }
--- 119,121 ----
  {
  	m_Console.SetGMEApp(idp);
! }
\ No newline at end of file

Index: GMEOLEData.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEOLEData.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** GMEOLEData.cpp	13 Jan 2005 21:13:47 -0000	1.21
--- GMEOLEData.cpp	26 Jan 2005 17:28:27 -0000	1.22
***************
*** 407,411 ****
  			return FALSE;
  		}
! 		catch(CFileException &)
  		{
  			return FALSE;
--- 407,411 ----
  			return FALSE;
  		}
! 		catch(CFileException *)
  		{
  			return FALSE;
***************
*** 490,494 ****
  			return FALSE;
  		}
! 		catch(CFileException &)
  		{
  			return FALSE;
--- 490,494 ----
  			return FALSE;
  		}
! 		catch(CFileException *)
  		{
  			return FALSE;

Index: GMEOLEModel.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEOLEModel.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GMEOLEModel.cpp	12 Jan 2005 17:53:16 -0000	1.7
--- GMEOLEModel.cpp	26 Jan 2005 17:28:27 -0000	1.8
***************
*** 232,236 ****
  	return m_view->currentModel;
  
! 	return NULL;
  }
  
--- 232,236 ----
  	return m_view->currentModel;
  
! 	//return NULL;//unreachable code
  }
  

Index: GMEView.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** GMEView.cpp	13 Jan 2005 21:13:47 -0000	1.162
--- GMEView.cpp	26 Jan 2005 17:28:27 -0000	1.163
***************
*** 2664,2668 ****
  						}
  						CComPtr<IMgaFCO> fco;
! 						COMTHROW(fcos->get_Item(0,&fco));
  						if(!IsEqualObject(fco,mgaRef)) {
  							try {
--- 2664,2668 ----
  						}
  						CComPtr<IMgaFCO> fco;
! 						COMTHROW(fcos->get_Item(1,&fco));// index modified from 0 to 1 [zolmol]
  						if(!IsEqualObject(fco,mgaRef)) {
  							try {

Index: GUIObject.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GUIObject.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** GUIObject.cpp	20 Jul 2004 16:58:56 -0000	1.49
--- GUIObject.cpp	26 Jan 2005 17:28:27 -0000	1.50
***************
*** 1163,1167 ****
  		return false;
  	}
! 	return true;
  }
  
--- 1163,1167 ----
  		return false;
  	}
! 	//return true;// unreachable code
  }
  

Index: MainFrm.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/MainFrm.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** MainFrm.cpp	2 Dec 2004 22:01:36 -0000	1.27
--- MainFrm.cpp	26 Jan 2005 17:28:27 -0000	1.28
***************
*** 79,83 ****
  	ON_UPDATE_COMMAND_UI(ID_VIEW_REFRESH_SOURCECONTROL, OnUpdateViewRefreshSourcecontrol)
  	ON_WM_CLOSE()
! 	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
  
--- 79,83 ----
  	ON_UPDATE_COMMAND_UI(ID_VIEW_REFRESH_SOURCECONTROL, OnUpdateViewRefreshSourcecontrol)
  	ON_WM_CLOSE()
! //}}AFX_MSG_MAP
  END_MESSAGE_MAP()
  
***************
*** 100,104 ****
  	theInstance = 0;	
  }
- 
  
  void CMainFrame::OnClose()
--- 100,103 ----

Index: RecentConnStrList.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/RecentConnStrList.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RecentConnStrList.cpp	5 Jul 2000 19:20:00 -0000	1.1
--- RecentConnStrList.cpp	26 Jan 2005 17:28:27 -0000	1.2
***************
*** 166,170 ****
  		wsprintf(pszEntry, m_strEntryFormat, iMRU + 1);
  		m_arrNames[iMRU] = pApp->GetProfileString(
! 			m_strSectionName, pszEntry, &afxChNil);
  	}
  	delete[] pszEntry;
--- 166,170 ----
  		wsprintf(pszEntry, m_strEntryFormat, iMRU + 1);
  		m_arrNames[iMRU] = pApp->GetProfileString(
! 			m_strSectionName, pszEntry, NULL);// '&afxChNil' previously
  	}
  	delete[] pszEntry;

Index: Regexp.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/Regexp.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Regexp.h	27 Mar 2001 20:12:00 -0000	1.1
--- Regexp.h	26 Jan 2005 17:28:28 -0000	1.2
***************
*** 2,6 ****
  #define __REGEXP_H__
  
! class CString;
  class regexp;
  
--- 2,6 ----
  #define __REGEXP_H__
  
! //class CString; //commented for VC7
  class regexp;
  

Index: StdAfx.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/StdAfx.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** StdAfx.h	13 Oct 2004 15:17:55 -0000	1.11
--- StdAfx.h	26 Jan 2005 17:28:28 -0000	1.12
***************
*** 11,14 ****
--- 11,19 ----
  #endif // _MSC_VER > 1000
  
+ #define STRICT
+ #ifndef _WIN32_WINNT
+ #define _WIN32_WINNT 0x0400
+ #endif
+ 
  #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
  

Index: console.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/console.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** console.cpp	2 Dec 2004 22:32:22 -0000	1.2
--- console.cpp	26 Jan 2005 17:28:28 -0000	1.3
***************
*** 19,23 ****
  {
  	static BYTE parms[] = VTS_DISPATCH;
! 	InvokeHelper(5, DISPATCH_METHOD, VT_EMPTY, NULL, parms, NULL);
  }
  
--- 19,23 ----
  {
  	static BYTE parms[] = VTS_DISPATCH;
! 	InvokeHelper(5, DISPATCH_METHOD, VT_EMPTY, NULL, parms, NULL); 
  }
  
***************
*** 71,73 ****
  	static BYTE parms[] = VTS_DISPATCH;
  	InvokeHelper(5, DISPATCH_METHOD, VT_EMPTY, NULL, parms, idp);
! }
--- 71,73 ----
  	static BYTE parms[] = VTS_DISPATCH;
  	InvokeHelper(5, DISPATCH_METHOD, VT_EMPTY, NULL, parms, idp);
! }
\ No newline at end of file

Index: console.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/console.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** console.h	2 Dec 2004 22:32:22 -0000	1.2
--- console.h	26 Jan 2005 17:28:28 -0000	1.3
***************
*** 18,22 ****
  	DECLARE_DYNCREATE(CConsole)
  public:
! 	~CConsole();	
  	CLSID const& GetClsid()
  	{
--- 18,22 ----
  	DECLARE_DYNCREATE(CConsole)
  public:
! 	~CConsole();
  	CLSID const& GetClsid()
  	{

--- GME.dsp DELETED ---

More information about the GME-commit mailing list