diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 267f24ee64f..fbb93d495cf 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -796,7 +796,7 @@ static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dw /* hhctrl.ocx bitmaps */ tbAB.hInst = hhctrl_hinstance; tbAB.nID = IDB_HHTOOLBAR; - nHHBitmaps = SendMessageW(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbAB); + nHHBitmaps = SendMessageW(hToolbar, TB_ADDBITMAP, HHTB_NUMBITMAPS, (LPARAM)&tbAB); *pdwNumButtons = 0; @@ -826,17 +826,16 @@ static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dw TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_FORWARD, nHistBitmaps + HIST_FORWARD); if (dwButtonFlags & HHWIN_BUTTON_STOP) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_STOP, nHHBitmaps + HH_STOP); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_STOP, nHHBitmaps + HHTB_STOP); if (dwButtonFlags & HHWIN_BUTTON_REFRESH) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_REFRESH, nHHBitmaps + HH_REFRESH); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_REFRESH, nHHBitmaps + HHTB_REFRESH); if (dwButtonFlags & HHWIN_BUTTON_HOME) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_HOME, nHHBitmaps + HH_HOME); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_HOME, nHHBitmaps + HHTB_HOME); - /* FIXME: Load the correct button bitmaps */ if (dwButtonFlags & HHWIN_BUTTON_SYNC) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_SYNC, nStdBitmaps + STD_PRINT); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_SYNC, nHHBitmaps + HHTB_SYNC); if (dwButtonFlags & HHWIN_BUTTON_OPTIONS) TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_OPTIONS, nStdBitmaps + STD_PROPERTIES); diff --git a/dlls/hhctrl.ocx/hhtoolbar.bmp b/dlls/hhctrl.ocx/hhtoolbar.bmp index b2db3714e53..36fa4b57620 100644 Binary files a/dlls/hhctrl.ocx/hhtoolbar.bmp and b/dlls/hhctrl.ocx/hhtoolbar.bmp differ diff --git a/dlls/hhctrl.ocx/hhtoolbar.svg b/dlls/hhctrl.ocx/hhtoolbar.svg index ac826619e1d..8622bfd79e0 100644 --- a/dlls/hhctrl.ocx/hhtoolbar.svg +++ b/dlls/hhctrl.ocx/hhtoolbar.svg @@ -1,6 +1,6 @@ - + @@ -35,7 +35,7 @@ - + @@ -43,11 +43,11 @@ - + - + @@ -55,18 +55,18 @@ - + - + - + @@ -74,7 +74,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -108,29 +108,45 @@ - + - + - - - + + + - + - - + + + + + + + + + + + + + + + + + + - + @@ -168,7 +184,7 @@ - + @@ -181,5 +197,26 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/dlls/hhctrl.ocx/resource.h b/dlls/hhctrl.ocx/resource.h index 64f125c2428..9d98ccfa068 100644 --- a/dlls/hhctrl.ocx/resource.h +++ b/dlls/hhctrl.ocx/resource.h @@ -34,6 +34,8 @@ #define IDB_HHTOOLBAR 1000 /* IDB_HHTOOLBAR bitmaps: */ -#define HH_STOP 0 -#define HH_REFRESH 1 -#define HH_HOME 2 +#define HHTB_STOP 0 +#define HHTB_REFRESH 1 +#define HHTB_HOME 2 +#define HHTB_SYNC 3 +#define HHTB_NUMBITMAPS HHTB_SYNC