[PATCH] [Bug 3330] Toolbar button missing

[Jason Edmeades]

If CreateToolBarEx is called with a bitmap instance of HINST_COMMCTRL
it means load the default icons. This would happen unless the toolbar
being created is empty, which is incorrect.
---
 dlls/comctl32/commctrl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 5d75d79..24e5e9a 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -704,7 +704,7 @@ CreateToolbarEx (HWND hwnd, DWORD style, UINT wID, INT nBitmaps,
 
 
 	/* add bitmaps */
-	if (nBitmaps > 0)
+	if (nBitmaps > 0 || hBMInst == HINST_COMMCTRL)
 	{
 	    tbab.hInst = hBMInst;
 	    tbab.nID   = wBMID;
-- 
1.5.0