* include/winuser.h [WINVER >= 0x0500] (EVENT_*): Add constants.

	* include/uxtheme.h: Cleanup.
	* include/tmschema.h: Cleanup.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index aa0e6fc5da893f7beffe00be42ac4a7c791a8f10..74705fb24a7d0c1eec44b12719ae7bdf34ae481f 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-03  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+       * include/winuser.h [WINVER >= 0x0500] (EVENT_*): Add constants.
+
+       * include/uxtheme.h: Cleanup.
+       * include/tmschema.h: Cleanup.
+
 2003-10-02  Luke Dunstan  <infidel@users.sourceforge.net>
 
        * include/winspool.h (GetDefaultPrinter[AW]): Add functions.
@@ -19,7 +26,7 @@
 
 2003-09-30  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
-       * include/dhcpcsvc.h: New file.
+       * include/dhcpcdsk.h: New file.
        Note that MSDN is confused about whether it should start constant
        and structure names with DHCPCAPI or DHCPAPI. It's using both but
        experience suggests it's DHCPCAPI with `C'.

diff --git a/winsup/w32api/include/tmschema.h b/winsup/w32api/include/tmschema.h
index ef62dc0ca163a9ff83dd6bb174653ede4eeca608..58cf8fa17bf547d3223eb2e3bf99a1a9cef2e292 100644 (file)
--- a/winsup/w32api/include/tmschema.h
+++ b/winsup/w32api/include/tmschema.h
@@ -661,4 +661,4 @@ enum {
        VTS_DISABLED = 4\r
 };\r
 \r
-#endif /* _TMSCHEMA_H */\r
+#endif\r

diff --git a/winsup/w32api/include/uxtheme.h b/winsup/w32api/include/uxtheme.h
index 0d32d820c698557901cbb2265527a9d2695658cc..f7054bd44d76aed85b1de85d0c720fe3adbfe5ef 100644 (file)
--- a/winsup/w32api/include/uxtheme.h
+++ b/winsup/w32api/include/uxtheme.h
@@ -4,11 +4,11 @@
 #pragma GCC system_header\r
 #endif\r
 \r
-#if (_WIN32_WINNT >= 0x0501)\r
 #ifdef __cplusplus\r
 extern "C" {\r
 #endif\r
 \r
+#if (_WIN32_WINNT >= 0x0501)\r
 #define DTBG_CLIPRECT 0x00000001\r
 #define DTBG_DRAWSOLID 0x00000002\r
 #define DTBG_OMITBORDER 0x00000004\r
@@ -112,9 +112,9 @@ BOOL WINAPI IsThemePartDefined(HTHEME,int,int);
 HTHEME WINAPI OpenThemeData(HWND,LPCWSTR);\r
 void WINAPI SetThemeAppProperties(DWORD);\r
 HRESULT WINAPI SetWindowTheme(HWND,LPCWSTR,LPCWSTR);\r
+#endif\r
 \r
 #ifdef __cplusplus\r
 }\r
 #endif\r
 #endif\r
-#endif /* _UXTHEME_H */\r

diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 358401f2e2a86a77b10fd59a3d4e21820804ff68..dd42506ba59e768a780678be440e1529d86beba7 100644 (file)
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -2095,6 +2095,50 @@ extern "C" {
 #if (_WIN32_WINNT >= 0x0501)
 #define DEVICE_NOTIFY_ALL_INTERFACE_CLASSES 0x00000004
 #endif
+#define EVENT_MIN                      0x00000001
+#define EVENT_SYSTEM_SOUND             0x00000001
+#define EVENT_SYSTEM_ALERT             0x00000002
+#define EVENT_SYSTEM_FOREGROUND        0x00000003
+#define EVENT_SYSTEM_MENUSTART         0x00000004
+#define EVENT_SYSTEM_MENUEND           0x00000005
+#define EVENT_SYSTEM_MENUPOPUPSTART    0x00000006
+#define EVENT_SYSTEM_MENUPOPUPEND      0x00000007
+#define EVENT_SYSTEM_CAPTURESTART      0x00000008
+#define EVENT_SYSTEM_CAPTUREEND        0x00000009
+#define EVENT_SYSTEM_MOVESIZESTART     0x0000000a
+#define EVENT_SYSTEM_MOVESIZEEND       0x0000000b
+#define EVENT_SYSTEM_CONTEXTHELPSTART  0x0000000c
+#define EVENT_SYSTEM_CONTEXTHELPEND    0x0000000d
+#define EVENT_SYSTEM_DRAGDROPSTART     0x0000000e
+#define EVENT_SYSTEM_DRAGDROPEND       0x0000000f
+#define EVENT_SYSTEM_DIALOGSTART       0x00000010
+#define EVENT_SYSTEM_DIALOGEND         0x00000011
+#define EVENT_SYSTEM_SCROLLINGSTART    0x00000012
+#define EVENT_SYSTEM_SCROLLINGEND      0x00000013
+#define EVENT_SYSTEM_SWITCHSTART       0x00000014
+#define EVENT_SYSTEM_SWITCHEND         0x00000015
+#define EVENT_SYSTEM_MINIMIZESTART     0x00000016
+#define EVENT_SYSTEM_MINIMIZEEND       0x00000017
+#define EVENT_OBJECT_CREATE            0x00008000
+#define EVENT_OBJECT_DESTROY           0x00008001
+#define EVENT_OBJECT_SHOW              0x00008002
+#define EVENT_OBJECT_HIDE              0x00008003
+#define EVENT_OBJECT_REORDER           0x00008004
+#define EVENT_OBJECT_FOCUS             0x00008005
+#define EVENT_OBJECT_SELECTION         0x00008006
+#define EVENT_OBJECT_SELECTIONADD      0x00008007
+#define EVENT_OBJECT_SELECTIONREMOVE   0x00008008
+#define EVENT_OBJECT_SELECTIONWITHIN   0x00008009
+#define EVENT_OBJECT_STATECHANGE       0x0000800a
+#define EVENT_OBJECT_LOCATIONCHANGE    0x0000800b
+#define EVENT_OBJECT_NAMECHANGE        0x0000800c
+#define EVENT_OBJECT_DESCRIPTIONCHANGE 0x0000800d
+#define EVENT_OBJECT_VALUECHANGE       0x0000800e
+#define EVENT_OBJECT_PARENTCHANGE      0x0000800f
+#define EVENT_OBJECT_HELPCHANGE        0x00008010
+#define EVENT_OBJECT_DEFACTIONCHANGE   0x00008011
+#define EVENT_OBJECT_ACCELERATORCHANGE 0x00008012
+#define EVENT_MAX                      0x00008012
 #endif /* (WINVER >= 0x0500) */
 #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490)
 #define ASFW_ANY ((DWORD)-1)