[GME-commit] GMESRC/GME/Gme AboutDlg.cpp,1.8,1.9 GME.rc,1.144,1.145 resource.h,1.67,1.68

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv22215/GME/Gme

Modified Files:
	AboutDlg.cpp GME.rc resource.h 
Log Message:
Resolving copyright issues, giving proper credit to 3rd party developers

CVS User: Peter Volgyesi, ISIS (volgy)

Index: resource.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/resource.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** resource.h	9 Aug 2005 18:05:46 -0000	1.67
--- resource.h	12 Sep 2005 17:42:01 -0000	1.68
***************
*** 345,350 ****
  #define ID_CNTX_NMPOS_WEST              32982
  #define ID_CNTX_NMPOS_EAST              32984
! #define ID_CNTX_PASTESPECIAL_SMART_MERGE      32985
! #define ID_CNTX_PASTESPECIAL_SMART_ADDITIVE   32986
  #define ID_EDIT_PASTESPECIAL_SMART_MERGE 32987
  #define ID_EDIT_PASTESPECIAL_SMART_ADDITIVE 32988
--- 345,350 ----
  #define ID_CNTX_NMPOS_WEST              32982
  #define ID_CNTX_NMPOS_EAST              32984
! #define ID_CNTX_PASTESPECIAL_SMART_MERGE 32985
! #define ID_CNTX_PASTESPECIAL_SMART_ADDITIVE 32986
  #define ID_EDIT_PASTESPECIAL_SMART_MERGE 32987
  #define ID_EDIT_PASTESPECIAL_SMART_ADDITIVE 32988
***************
*** 369,373 ****
  #define _APS_NEXT_RESOURCE_VALUE        212
  #define _APS_NEXT_COMMAND_VALUE         32989
! #define _APS_NEXT_CONTROL_VALUE         1109
  #define _APS_NEXT_SYMED_VALUE           115
  #endif
--- 369,373 ----
  #define _APS_NEXT_RESOURCE_VALUE        212
  #define _APS_NEXT_COMMAND_VALUE         32989
! #define _APS_NEXT_CONTROL_VALUE         1111
  #define _APS_NEXT_SYMED_VALUE           115
  #endif

Index: GME.rc
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GME.rc,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** GME.rc	9 Aug 2005 18:05:46 -0000	1.144
--- GME.rc	12 Sep 2005 17:42:01 -0000	1.145
***************
*** 592,607 ****
  //
  
! IDD_ABOUTBOX DIALOGEX 0, 0, 179, 114
  STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "About GME"
  FONT 10, "MS Sans Serif", 0, 0, 0x0
  BEGIN
!     CTEXT           GME_VERSION_STR,IDC_STATIC,11,65,152,8,SS_NOPREFIX
      CTEXT           "Copyright © 2000-2005 Vanderbilt University",IDC_STATIC,
!                     10,75,152,8
!     DEFPUSHBUTTON   "OK",IDOK,65,94,43,12,WS_GROUP
!     CTEXT           "GENERIC MODELING ENVIRONMENT 5",IDC_STATIC,10,55,152,8
      CONTROL         184,IDC_BMPABOUT,"Static",SS_BITMAP | SS_NOTIFY,7,7,165,
                      45
  END
  
--- 592,611 ----
  //
  
! IDD_ABOUTBOX DIALOGEX 0, 0, 179, 171
  STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "About GME"
  FONT 10, "MS Sans Serif", 0, 0, 0x0
  BEGIN
!     CTEXT           GME_VERSION_STR,IDC_STATIC,7,65,165,8,SS_NOPREFIX
      CTEXT           "Copyright © 2000-2005 Vanderbilt University",IDC_STATIC,
!                     7,135,165,8
!     DEFPUSHBUTTON   "OK",IDOK,65,151,43,12,WS_GROUP
!     CTEXT           "GENERIC MODELING ENVIRONMENT 5",IDC_STATIC,7,55,165,8
      CONTROL         184,IDC_BMPABOUT,"Static",SS_BITMAP | SS_NOTIFY,7,7,165,
                      45
+     CTEXT           "This product includes software developed by the Apache Software Foundation (http://www.apache.org)",
+                     IDC_STATIC,7,80,165,20
+     CTEXT           "Portions of this software are based on the Purdue Compiler Construction Tool Set (http://www.antlr.org)",
+                     IDC_STATIC,7,106,165,20
  END
  
***************
*** 1034,1038 ****
          RIGHTMARGIN, 172
          TOPMARGIN, 7
!         BOTTOMMARGIN, 106
      END
  
--- 1038,1042 ----
          RIGHTMARGIN, 172
          TOPMARGIN, 7
!         BOTTOMMARGIN, 163
      END
  
***************
*** 1267,1274 ****
  BEGIN
      IDR_MAINFRAME           "GME"
- END
- 
- STRINGTABLE 
- BEGIN
      IDR_GMETYPE             "\nGME\nGME\n\n\nGME.Project\nGME Project"
  END
--- 1271,1274 ----

Index: AboutDlg.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/AboutDlg.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AboutDlg.cpp	17 Jun 2005 22:08:21 -0000	1.8
--- AboutDlg.cpp	12 Sep 2005 17:42:01 -0000	1.9
***************
*** 29,32 ****
--- 29,34 ----
  	//}}AFX_MSG
  	DECLARE_MESSAGE_MAP()
+ public:
+ 	afx_msg void OnEnChangeRichedit21();
  };
  
***************
*** 49,52 ****
--- 51,55 ----
  	ON_BN_CLICKED(IDC_BMPABOUT, OnAboutPicture)
  	//}}AFX_MSG_MAP
+ 	ON_EN_CHANGE(IDC_RICHEDIT21, OnEnChangeRichedit21)
  END_MESSAGE_MAP()
  
***************
*** 249,251 ****
  	return TRUE;  // return TRUE unless you set the focus to a control
  	              // EXCEPTION: OCX Property Pages should return FALSE
! }
\ No newline at end of file
--- 252,263 ----
  	return TRUE;  // return TRUE unless you set the focus to a control
  	              // EXCEPTION: OCX Property Pages should return FALSE
! }
! void CAboutDlg::OnEnChangeRichedit21()
! {
! 	// TODO:  If this is a RICHEDIT control, the control will not
! 	// send this notification unless you override the CDialog::OnInitDialog()
! 	// function and call CRichEditCtrl().SetEventMask()
! 	// with the ENM_CHANGE flag ORed into the mask.
! 
! 	// TODO:  Add your control notification handler code here
! }