Changeset 1289 for trunk/dll

Timestamp:

Nov 21, 2008, 9:30:11 PM (17 years ago)

Author:

John Small

Message:

Ticket 297: Current copyright year has been centralized into a single
#define in dll\copyright.h

Location:

trunk/dll

Files:

• copyright.c (modified) (1 diff)
• copyright.h (added)
• fm3res.dlg (modified) (3 diffs)
• fm3res.rc (modified) (3 diffs)
• makefile (modified) (3 diffs)

trunk/dll/copyright.c

@@ -6 +6 @@
  * Change Log:
  *    21 Nov 08 JBS Initial addition to SVN repository
+ *    21 Nov 08 JBS Added use of copyright.h
  *
  */
-static char szCopyRight[] = "Copyright (c) 1993, 1998 M. Kimes, " \
-                     "Copyright (c) 2001, 2008 Steven Levine and Associates, Inc." \
-                     "All rights reserved";
 
+#include "copyright.h"
+static char szCopyRight[] = COPYRIGHT_STRING;
+

trunk/dll/fm3res.dlg

@@ -37 +37 @@
   31 Jul 08 JBS Added a missing mnemonic and replaced "Mommy make it stop!" with useful text.
   01 Sep 08 GKY Change User-defined BMP text to better match what it actually does.
+  21 Nov 08 JBS Ticket 297: Added use of COPYRIGHT_YEAR in About dialog
 
 ***********************************************************************/
@@ -42 +43 @@
 DLGINCLUDE 1 fm3dlg.h
 DLGINCLUDE 2 fm3dll2.h
+DLGINCLUDE 3 copyright.h
 
 DLGTEMPLATE MSK_FRAME LOADONCALL MOVEABLE DISCARDABLE
@@ -1043 +1045 @@
         CTEXT           "All rights reserved", -1, 10, 88, 164, 8,
                         DT_VCENTER | NOT WS_GROUP
-        CTEXT           "Copyright ž 1998, 2007", -1, 10, 80, 164, 8,
+        CTEXT           "Copyright ž 1998, " COPYRIGHT_YEAR, -1, 10, 80, 164, 8,
                         DT_VCENTER | NOT WS_GROUP
         CTEXT           "Steven Levine and Associates, Inc.", -1, 10, 72,

trunk/dll/fm3res.rc

@@ -38 +38 @@
   20 Jul 08 GKY Add save/append filename to clipboard.
                 Change menu wording to make these easier to find
+  21 Nov 08 JBS Ticket 297: Added STRINGTABLE with COPYRIGHT_STRING
 
 ***********************************************************************/
@@ -45 +46 @@
 #include "fm3dll2.h"
 #include "fm3dlg.h"
-
-#define IDS_COPYRIGHT 1
+#include "copyright.h"
 
 ICON        MAIN_FRAME          ..\icons\FM3.ICO
@@ -2340 +2340 @@
 STRINGTABLE
   BEGIN
-    IDS_COPYRIGHT, "Copyright (c) 1993, 1998 M. Kimes, " \
-                     "Copyright (c) 2001, 2008 Steven Levine and Associates, Inc." \
-                     "All rights reserved";
+    IDS_COPYRIGHT, COPYRIGHT_STRING;
   END
 

trunk/dll/makefile

@@ -44 +44 @@
 # 18 Nov 08 JBS Ticket 297: Various build improvements/corrections
 # 19 Nov 08 JBS Ticket 297: Removed bldlevel calls
+# 21 Nov 08 JBS Ticket 297: Added support for copyright.c and copyright.h
 
 # Environment:
@@ -224 +225 @@
   @%append $^@ library os2386.lib
 
-copyright.obj: copyright.c
+copyright.obj: copyright.c copyright.h
   $(CC) $(COPYRIGHT_CFLAGS) copyright.c
 
@@ -260 +261 @@
   $(CC) $(CFLAGSR) $(BASERES).c
 
-$(BASERES).res: *.rc *.dlg fm3dll2.h fm3dlg.h $(ICONS)
+$(BASERES).res: *.rc *.dlg fm3dll2.h fm3dlg.h copyright.h $(ICONS)
   @echo.
   @echo Compiling resource: $*