Author: gedmurphy Date: Tue Jul 14 01:38:08 2009 New Revision: 41944
URL: http://svn.reactos.org/svn/reactos?rev=41944&view=rev Log: Fix a double definition
Modified: trunk/reactos/base/shell/explorer-new/lang/en-US.rc trunk/reactos/base/shell/explorer-new/resource.h
Modified: trunk/reactos/base/shell/explorer-new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] Tue Jul 14 01:38:08 2009 @@ -90,7 +90,7 @@ CAPTION "Notification Area" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED GROUPBOX "Icons", IDC_STATIC, 6,33,240,58, WS_DISABLED LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,48,223,16, WS_DISABLED AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
Modified: trunk/reactos/base/shell/explorer-new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/res... ============================================================================== --- trunk/reactos/base/shell/explorer-new/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/resource.h [iso-8859-1] Tue Jul 14 01:38:08 2009 @@ -72,7 +72,7 @@ #define IDC_TASKBARPROP_RECENTFOLDERS 2106
#define IDD_TASKBARPROP_NOTIFICATION 2200 -#define IDC_TASKBARPROP_TASKBARBITMAP 2201 +#define IDC_TASKBARPROP_NOTIFICATIONBITMAP 2201 #define IDC_TASKBARPROP_HIDEICONS 2202 #define IDC_TASKBARPROP_ICONCUST 2203 #define IDC_TASKBARPROP_CLOCK 2204