* include/commctrl.h (STATUSCLASSNAME, TOOLBARCLASSNAME,

	TOOLTIPS_CLASS, TRACKBAR_CLASS, UPDOWN_CLASS, PROGRESS_CLASS,
	HOTKEY_CLASS): Remove dupicate defines for UNICODE case.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 4532a41ff3d2f61bf22d81b29a865215b7a96e6d..b7a4091b41cb6a838f54e5d5dc3fd4def216cb5e 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-05  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/commctrl.h (STATUSCLASSNAME, TOOLBARCLASSNAME,
+       TOOLTIPS_CLASS, TRACKBAR_CLASS, UPDOWN_CLASS, PROGRESS_CLASS,
+       HOTKEY_CLASS): Remove dupicate defines for UNICODE case.
+
 2003-05-02  Steven Edwards  <Steven_Ed4153@yahoo.com>
 
        * include/richedit.h (EM_FINDTEXTEXW, EM_FINDTEXTW,

diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h
index 0cc1e6f37c556213e0fa1b404e62f4df366290fa..4a8e45251c3c8f2c46b857b9cc9b35f1b38c89aa 100644 (file)
--- a/winsup/w32api/include/commctrl.h
+++ b/winsup/w32api/include/commctrl.h
@@ -2610,7 +2610,6 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO;
 #define SB_GETTEXT     SB_GETTEXTW
 #define SB_SETTEXT     SB_SETTEXTW
 #define SB_GETTEXTLENGTH       SB_GETTEXTLENGTHW
-#define STATUSCLASSNAME         STATUSCLASSNAMEW
 #define HDM_INSERTITEM HDM_INSERTITEMW
 #define HDM_GETITEM HDM_GETITEMW
 #define HDM_SETITEM HDM_SETITEMW
@@ -2626,7 +2625,6 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO;
 #define HDN_GETDISPINFO HDN_GETDISPINFOW
 #endif
 #define HD_NOTIFY HD_NOTIFYW
-#define TOOLBARCLASSNAME TOOLBARCLASSNAMEW
 #define TBSAVEPARAMS TBSAVEPARAMSW
 #define TB_GETBUTTONTEXT TB_GETBUTTONTEXTW
 #define TB_SAVERESTORE TB_SAVERESTOREW
@@ -2640,7 +2638,6 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO;
 #define LPTBNOTIFY LPTBNOTIFYW
 #define NMTOOLBAR NMTOOLBARW
 #define LPNMTOOLBAR LPNMTOOLBARW
-#define TOOLTIPS_CLASS TOOLTIPS_CLASSW
 #define TTM_ADDTOOL    TTM_ADDTOOLW
 #define TTM_DELTOOL    TTM_DELTOOLW
 #define TTM_NEWTOOLRECT        TTM_NEWTOOLRECTW
@@ -2656,10 +2653,6 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO;
 #define SB_GETTEXT     SB_GETTEXTW
 #define SB_SETTEXT     SB_SETTEXTW
 #define SB_GETTEXTLENGTH       SB_GETTEXTLENGTHW
-#define TRACKBAR_CLASS TRACKBAR_CLASSW
-#define UPDOWN_CLASS UPDOWN_CLASSW
-#define PROGRESS_CLASS PROGRESS_CLASSW
-#define HOTKEY_CLASS HOTKEY_CLASSW
 #define LV_ITEM LV_ITEMW
 #define LVITEM LVITEMW
 #define LPSTR_TEXTCALLBACK LPSTR_TEXTCALLBACKW