Jacek Caban : ieframe: Use int resource ID for toolbar image.

Alexandre Julliard julliard at winehq.org
Thu Jan 31 12:11:42 CST 2013


Module: wine
Branch: master
Commit: 35f21ac8265430c0b7936efcead5352006ae50c9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=35f21ac8265430c0b7936efcead5352006ae50c9

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Jan 31 12:46:22 2013 +0100

ieframe: Use int resource ID for toolbar image.

---

 dlls/ieframe/iexplore.c |    3 +--
 dlls/ieframe/resource.h |    2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c
index 0643f16..c3d519a 100644
--- a/dlls/ieframe/iexplore.c
+++ b/dlls/ieframe/iexplore.c
@@ -439,7 +439,6 @@ static void create_rebar(HWND hwnd)
     REBARBANDINFOW bandinf;
     WCHAR addr[40];
     HIMAGELIST imagelist;
-    WCHAR idb_ietoolbar[] = {'I','D','B','_','I','E','T','O','O','L','B','A','R',0};
     SIZE toolbar_size;
 
     LoadStringW(ieframe_instance, IDS_ADDRESS, addr, sizeof(addr)/sizeof(addr[0]));
@@ -457,7 +456,7 @@ static void create_rebar(HWND hwnd)
     hwndToolbar = CreateWindowExW(TBSTYLE_EX_MIXEDBUTTONS, TOOLBARCLASSNAMEW, NULL, TBSTYLE_FLAT | WS_CHILD | WS_VISIBLE | CCS_NORESIZE,
             0, 0, 0, 0, hwndRebar, (HMENU)IDC_BROWSE_TOOLBAR, ieframe_instance, NULL);
 
-    imagelist = ImageList_LoadImageW(ieframe_instance, idb_ietoolbar, 32, 0, CLR_NONE, IMAGE_BITMAP, LR_CREATEDIBSECTION);
+    imagelist = ImageList_LoadImageW(ieframe_instance, MAKEINTRESOURCEW(IDB_IETOOLBAR), 32, 0, CLR_NONE, IMAGE_BITMAP, LR_CREATEDIBSECTION);
 
     SendMessageW(hwndToolbar, TB_SETIMAGELIST, 0, (LPARAM)imagelist);
     SendMessageW(hwndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
diff --git a/dlls/ieframe/resource.h b/dlls/ieframe/resource.h
index da24048..ae02b20 100644
--- a/dlls/ieframe/resource.h
+++ b/dlls/ieframe/resource.h
@@ -62,6 +62,8 @@
 
 #define IDS_ADDRESS                    1106
 
+#define IDB_IETOOLBAR                  1400
+
 /* update status text in BINDSTATUS_* callback */
 #define IDS_STATUSFMT_FIRST            4096
 #define IDS_FINDINGRESOURCE            (IDS_STATUSFMT_FIRST + 1)




More information about the wine-cvs mailing list