reactos/subsys/system/explorer/desktop
diff -u -r1.59 -r1.60
--- desktop.cpp 28 Mar 2004 20:32:21 -0000 1.59
+++ desktop.cpp 4 Apr 2004 23:13:11 -0000 1.60
@@ -275,7 +275,9 @@
return TRUE;
case WM_MBUTTONDBLCLK:
- explorer_show_frame(SW_SHOWNORMAL);
+ /* Imagelist icons are missing if MainFrame::Create() is called directly from here!
+ explorer_show_frame(SW_SHOWNORMAL); */
+ PostMessage(g_Globals._hwndDesktop, nmsg, wparam, lparam);
break;
case PM_DISPLAY_VERSION:
reactos/subsys/system/explorer/shell
diff -u -r1.54 -r1.55
--- mainframe.cpp 4 Apr 2004 20:23:51 -0000 1.54
+++ mainframe.cpp 4 Apr 2004 23:13:11 -0000 1.55
@@ -1046,7 +1046,8 @@
TreeView_DeleteAllItems(_hsidebar);
- g_Globals._favorites.fill_tree(_hsidebar, TVI_ROOT, _himl);
+ WindowCanvas canvas(_hwnd);
+ g_Globals._favorites.fill_tree(_hsidebar, TVI_ROOT, _himl, canvas);
}
#endif
reactos/subsys/system/explorer/taskbar
diff -u -r1.38 -r1.39
--- desktopbar.cpp 28 Mar 2004 14:55:18 -0000 1.38
+++ desktopbar.cpp 4 Apr 2004 23:13:11 -0000 1.39
@@ -173,7 +173,9 @@
void DesktopBar::ProcessHotKey(int id_hotkey)
{
switch(id_hotkey) {
- case 0: explorer_show_frame(SW_SHOWNORMAL); break;
+ case 0: explorer_show_frame(SW_SHOWNORMAL);
+ break;
+
///@todo implement all common hotkeys
}
}
reactos/subsys/system/explorer/taskbar
diff -u -r1.5 -r1.6
--- favorites.cpp 4 Apr 2004 21:05:32 -0000 1.5
+++ favorites.cpp 4 Apr 2004 23:13:11 -0000 1.6
@@ -254,10 +254,8 @@
/// fill treeview control with bookmark tree content
-void BookmarkList::fill_tree(HWND hwnd, HTREEITEM parent, HIMAGELIST himagelist) const
+void BookmarkList::fill_tree(HWND hwnd, HTREEITEM parent, HIMAGELIST himagelist, HDC hdc_wnd) const
{
- HDC hdc = GetDC(hwnd);
-
TV_INSERTSTRUCT tvi;
tvi.hParent = parent;
@@ -279,7 +277,7 @@
tv.iSelectedImage = 4;
HTREEITEM hitem = TreeView_InsertItem(hwnd, &tvi);
- folder._bookmarks.fill_tree(hwnd, hitem, himagelist);
+ folder._bookmarks.fill_tree(hwnd, hitem, himagelist, hdc_wnd);
} else {
const Bookmark& bookmark = *node._pbookmark;
@@ -292,14 +290,12 @@
const Icon& icon = g_Globals._icon_cache.extract(bookmark._icon_path, bookmark._icon_idx);
if ((ICON_ID)icon != ICID_NONE)
- tv.iImage = tv.iSelectedImage = ImageList_Add(himagelist, icon.create_bitmap(RGB(255,255,255), GetStockBrush(WHITE_BRUSH), hdc), 0);
+ tv.iImage = tv.iSelectedImage = ImageList_Add(himagelist, icon.create_bitmap(RGB(255,255,255), GetStockBrush(WHITE_BRUSH), hdc_wnd), 0);
}
TreeView_InsertItem(hwnd, &tvi);
}
}
-
- ReleaseDC(hwnd, hdc);
}
reactos/subsys/system/explorer/taskbar
diff -u -r1.4 -r1.5
--- favorites.h 4 Apr 2004 20:23:51 -0000 1.4
+++ favorites.h 4 Apr 2004 23:13:11 -0000 1.5
@@ -69,7 +69,7 @@
void read(const_XMLPos& pos);
void write(XMLPos& pos) const;
- void fill_tree(HWND hwnd, HTREEITEM parent, HIMAGELIST) const;
+ void fill_tree(HWND hwnd, HTREEITEM parent, HIMAGELIST, HDC hdc_wnd) const;
};
struct BookmarkFolder