--- mstools/samples/mfedit/mfedit.h	2018/08/09 18:20:54	1.1
+++ mstools/samples/mfedit/mfedit.h	2018/08/09 18:21:57	1.1.1.2
@@ -49,6 +49,7 @@
 #define MM_PEN                  7021
 #define MM_BRUSH                7022
 #define MM_FONT                 7023
+#define MM_LEABOUT              7024
 
 #define SIZEOFCAPTIONTEXT	20
 
@@ -79,6 +80,7 @@
 #define DID_FF                  1015
 #define DID_CLEAR               1016
 #define DID_COUNTER             1017
+#define DID_TMP                 1018
 
 //
 // Control Panel's Owner draw bitmaps
@@ -245,6 +247,39 @@
 #define GET_WM_CTLCOLOR_HWND(wp, lp, msg)       (HWND)(lp)
 #define GET_WM_CTLCOLOR_TYPE(wp, lp, msg)       (WORD)(msg - WM_CTLCOLORMSGBOX)
 
+#define META32_SIGNATURE        0x464D4520      // ' EMF'
+#define ALDUS_ID		0x9AC6CDD7
+
+typedef struct
+  {
+  DWORD   key;
+  HANDLE  hmf;
+  RECT    bbox;
+  WORD    inch;
+  DWORD   reserved;
+  WORD    checksum;
+  } APMFILEHEADER;
+typedef APMFILEHEADER * PAPMFILEHEADER;
+#define APMSIZE 22
+
+
+#ifndef RC_INVOKED
+#pragma pack(2)
+typedef struct tagMETA16HEADER
+{
+    WORD	mtType;
+    WORD	mtHeaderSize;
+    WORD	mtVersion;
+    DWORD	mtSize;
+    WORD	mtNoObjects;
+    DWORD	mtMaxRecord;
+    WORD	mtNoParameters;
+} META16HEADER, LPMETA16HEADER;
+#pragma pack()
+
+#endif // RC_INVOKED
+
+
 typedef struct _playinfo {
     int iRecord;
     BOOL bPlayContinuous;
@@ -390,7 +425,8 @@ HMENU   hMenu,      hMenuWindow;
 HMENU   hChildMenu, hChildMenuWindow;
 HDC     ghDCMem;
 HDC     ghDCMetaf = (HDC) NULL;
-HANDLE  ghMetaf = NULL;
+HENHMETAFILE ghMetaf = NULL;
+
 HBITMAP ghBmp = NULL, ghBmpMask = NULL;
 
 #if 0   // STRICT doesn't like this
@@ -405,3 +441,5 @@ HBRUSH  ghbrCur;
 HPEN    ghpnCur;
 HBRUSH  ghbrAppBkgd;
 HPEN    ghpnWide;
+
+HWND    ghwndNext = NULL;