Release 961013

Sun Oct 13 15:32:32 1996  Alexandre Julliard  <julliard@lrc.epfl.ch>

	* [Make.rules.in] [*/Makefile.in]
	Made it possible to compile from a directory other than the source
	directory.

	* [graphics/metafiledrv/init.c] [include/metafiledrv.h]
	  [objects/metafile.c] [objects/dc.c]
	New graphics driver for metafiles.

	* [if1632/thunk.c]
	Added thunks for SetWindowsHook and SetDCHook.

	* [windows/dialog.c]
	Fixed GetNextDlgGroupItem and GetNextDlgTabItem to skip disabled
	items.

	* [*/*]
	Removed non Win32-clean types HANDLE, HBITMAP, HBRUSH, HFONT,
 	HINSTANCE, HMENU, HRGN and HTASK.

Wed Oct  9 14:59:45 1996  Frans van Dorsselaer  <dorssel@rulhm1.LeidenUniv.nl>

	* [controls/edit.c]
	Fixed EditWndProc() to fall back to DefWndProc() when the
	edit state structure is not available.

Wed Oct  2 14:00:34 1996  Huw D. M. Davies  <h.davies1@physics.oxford.ac.uk>

	* [windows/nonclient.c] [windows/mdi.c]
	AdjustWindowRectEx16() should only take notice of the styles
 	WS_DLGFRAME, WS_BORDER, WS_THICKFRAME and
 	WS_EX_DLGMODALFRAME. Thanks to Alex Korobka.

	* [controls/scroll.c]
	Fixed typo in ShowScrollBar32().

Sun Aug 25 20:18:56 1996  Jukka Iivonen <iivonen@cc.helsinki.fi>

	* [if1632/user32.spec] [if1632/winmm.spec]
	Added SetParent and sndPlaySoundA.
diff --git a/include/wincon.h b/include/wincon.h
index 1c612d0..c295bf7 100644
--- a/include/wincon.h
+++ b/include/wincon.h
@@ -1,5 +1,5 @@
-#ifndef _WINECON_H_
-#define _WINECON_H_
+#ifndef __WINE_WINCON_H
+#define __WINE_WINCON_H
 
 #define CTRL_C_EVENT 0
 #define CTRL_BREAK_EVENT 1
@@ -46,7 +46,7 @@
 } CONSOLE_SCREEN_BUFFER_INFO,*LPCONSOLE_SCREEN_BUFFER_INFO;
 
 
-#endif
+#endif  /* __WINE_WINCON_H */
 
 #if 0
 #ifndef _WINCON_H_
@@ -86,26 +86,6 @@
 
 #if 0
 
-typedef struct
-  {
-    int bKeyDown;
-    WORD wRepeatCount;
-    WORD wVirtualKeyCode;
-    WORD wVirtualScanCode;
-
-    char AsciiChar;
-char pad;
-#if 0
-    union
-      {
-	WCHAR UnicodeChar;
-	CHAR AsciiChar;
-      }
-    uChar;
-#endif
-    DWORD dwControlKeyState;
-  } __attribute__ ((packed)) KEY_EVENT_RECORD;
-
 
 
 #define RIGHT_ALT_PRESSED 0x1