Changeset 1226

Timestamp:

Sep 14, 2008, 1:12:40 AM (17 years ago)

Author:

John Small

Message:

Ticket 187: Moved typedef's and some #define's from fm3dll.h

Location:

trunk/dll

Files:

• objwin.c (modified) (1 diff)
• obsolete.h (modified) (2 diffs)
• presparm.c (modified) (1 diff)
• presparm.h (modified) (1 diff)
• printer.c (modified) (1 diff)
• remap.c (modified) (2 diffs)
• rename.c (modified) (2 diffs)
• saveclip.c (modified) (1 diff)
• seeall.c (modified) (2 diffs)
• select.c (modified) (2 diffs)

trunk/dll/objwin.c

@@ -22 +22 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
 #include "init.h"                       // Data declaration(s)
 #include "fm3dlg.h"

trunk/dll/obsolete.h

@@ -5 +5 @@
 
 Function declarations neither called or defined in FM/2 source files
+These can be deleted after a year of disuse, i.e. Sep 2009
 
 Copyright (c) 1993-98 M. Kimes
@@ -15 +16 @@
 #if !defined(OBSOLETE_H)
 #define OBSOLETE_H
-
-
 
 /**************************************************/

trunk/dll/presparm.c

@@ -22 +22 @@
 
 #include "fm3dll.h"
+#include "colors.h"                     // typedef RGB2
+#include "presparm.h"
 #include "notebook.h"                   // Data declaration(s)
-#include "presparm.h"
 #include "wrappers.h"                   // xmalloc
 #include "fortify.h"

trunk/dll/presparm.h

@@ -16 +16 @@
 #define PRESPARM_H
 
+// PMBITMAP_INCLUDED - IBM Toolkit
+// INCL_GPIBITMAPS - OpenWatcom Toolkit
+// #if !defined(PMBITMAP_INCLUDED) && !defined(INCL_GPIBITMAPS)
+// typedef struct _RGB2         /* rgb2 */
+// {
+//   BYTE bBlue;                        /* Blue component of the color definition */
+//   BYTE bGreen;                       /* Green component of the color definition */
+//   BYTE bRed;                 /* Red component of the color definition  */
+//   BYTE fcOptions;            /* Reserved, must be zero                 */
+// }
+// RGB2;
+// typedef RGB2 *PRGB2;
+// #endif
+
 VOID CopyPresParams(HWND target, HWND source);
 VOID PresParamChanged(HWND hwnd, CHAR * keyroot, MPARAM mp1, MPARAM mp2);

trunk/dll/printer.c

@@ -27 +27 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
 #include "notebook.h"                   // Data declaration(s)
 #include "mainwnd.h"                    // Data declaration(s)

trunk/dll/remap.c

@@ -29 +29 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
+#include "remap.h"
 #include "arccnrs.h"                    // Data declaration(s)
 #include "mainwnd.h"                    // Data declaration(s)
@@ -41 +43 @@
 #include "pathutil.h"                   // BldFullPathName
 #include "valid.h"                      // CheckDrive, FillInDriveFlags
-#include "remap.h"
 #include "wrappers.h"                   // xfgets
 #include "strips.h"                     // bstrip

trunk/dll/rename.c

@@ -22 +22 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
+#include "worker.h"                     // typedef MOVEIT
+#include "rename.h"
 #include "notebook.h"                   // Data declaration(s)
 #include "init.h"                       // Data declaration(s)
@@ -29 +32 @@
 #include "strutil.h"                    // GetPString
 #include "copyf.h"                      // AdjustWildcardName
-#include "rename.h"
 #include "valid.h"                      // TestFDates
 #include "mkdir.h"                      // SetDir

trunk/dll/saveclip.c

@@ -36 +36 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
 #include "arccnrs.h"                    // Data declaration(s)
 #include "notebook.h"                   // Data declaration(s)

trunk/dll/seeall.c

@@ -53 +53 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
+#include "seeall.h"
 #include "mainwnd2.h"                   // Data declaration(s)
 #include "grep.h"                       // Data declaration(s)
@@ -95 +97 @@
 #include "literal.h"                    // wildcard
 #include "wrappers.h"                   // xDosFindNext
-#include "seeall.h"
 #include "misc.h"                       // SetConditionalCascade
 #include "fonts.h"                      // SetMLEFont

trunk/dll/select.c

@@ -43 +43 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
+#include "select.h"
 #include "notebook.h"                   // Data declaration(s)
 #include "newview.h"                    // Data declarations
@@ -50 +52 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
-#include "select.h"
 #include "valid.h"                      // TestCDates
 #include "misc.h"                       // CurrentRecord