Author: janderwald
Date: Mon Feb 4 12:09:35 2013
New Revision: 58286
URL:
http://svn.reactos.org/svn/reactos?rev=58286&view=rev
Log:
[EXPLORER]
- Fix taskbar icons
Modified:
trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp
Modified: trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba…
==============================================================================
--- trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] Mon Feb 4 12:09:35
2013
@@ -516,33 +516,39 @@
for(set<int>::reverse_iterator it=btn_idx_to_delete.rbegin();
it!=btn_idx_to_delete.rend(); ++it) {
int idx = *it;
- SendMessage(_htoolbar, TB_DELETEBUTTON, idx, 0);
-
- for(TaskBarMap::iterator it=_map.begin(); it!=_map.end(); ++it) {
- TaskBarEntry& entry = it->second;
+ if (!SendMessage(_htoolbar, TB_DELETEBUTTON, idx, 0))
+ MessageBoxW(NULL, L"failed to delete button", NULL, MB_OK);
+
+
+ for(TaskBarMap::iterator it2=_map.begin(); it2!=_map.end(); ++it2) {
+ TaskBarEntry& entry = it2->second;
// adjust button indexes
if (entry._btn_idx > idx) {
--entry._btn_idx;
+#if 0
--entry._bmp_idx;
-
+
TBBUTTONINFO info;
info.cbSize = sizeof(TBBUTTONINFO);
info.dwMask = TBIF_IMAGE;
info.iImage = entry._bmp_idx;
- SendMessage(_htoolbar, TB_SETBUTTONINFO, entry._id, (LPARAM)&info);
+ if (!SendMessage(_htoolbar, TB_SETBUTTONINFO, entry._id, (LPARAM)&info))
+ MessageBoxW(NULL, L"failed to set button info", NULL, MB_OK);
+#endif
}
}
+
}
for(set<HBITMAP>::iterator it=hbmp_to_delete.begin(); it!=hbmp_to_delete.end();
++it) {
HBITMAP hbmp = *it;
-
+#if 0
TBREPLACEBITMAP tbrepl = {0, (UINT_PTR)hbmp, 0, 0};
SendMessage(_htoolbar, TB_REPLACEBITMAP, 0, (LPARAM)&tbrepl);
-
+#endif
DeleteObject(hbmp);
for(TaskBarMap::iterator it=_map.begin(); it!=_map.end(); ++it)