m_pList->SetImageList(&m_imageList, LVSIL_SMALL);
// Load the icons used for the list view (expanded/collapsed state icons)
- VERIFY(m_imageState.Create(IDB_TREE_STATE, 16, 1, RGB(255, 0, 255)));
+ VERIFY(m_imageState.Create(iconCX, iconCY, ILC_COLOR32 | ILC_MASK, 15, 1));
+ for (auto id : { IDI_TREE_STATE_COLLAPSED, IDI_TREE_STATE_EXPANDED })
+ VERIFY(-1 != m_imageState.Add((HICON)LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(id), IMAGE_ICON, iconCX, iconCY, 0)));
// Restore column orders as they had them last time they ran
m_pColItems->LoadColumnOrders(
IDI_NOTEQUALTEXTFILE ICON "res\\notequaltextfile.ico"
IDI_EQUALIMAGE ICON "res\\equalimage.ico"
IDI_NOTEQUALIMAGE ICON "res\\notequalimage.ico"
+IDI_TREE_STATE_COLLAPSED ICON "res\\treestate_collapsed.ico"
+IDI_TREE_STATE_EXPANDED ICON "res\\treestate_expanded.ico"
/////////////////////////////////////////////////////////////////////////////
IDB_MOVE_RIGHT_TO_BROWSE BITMAP "res\\move_right_to_browse.bmp"
IDB_VIEW_ZOOMIN BITMAP "res\\zoom_in.bmp"
IDB_VIEW_ZOOMOUT BITMAP "res\\zoom_out.bmp"
-IDB_TREE_STATE BITMAP "res\\treestate.bmp"
IDB_FILE_OPENCONFLICT BITMAP "res\\open_conflict.bmp"
IDB_PLUGINS_LIST BITMAP "res\\plugins.bmp"
IDB_MERGE_COMPARE BITMAP "res\\compare.bmp"
#define IDB_TOOLBAR_ENABLED32 365\r
#define IDB_VIEW_ZOOMIN 366\r
#define IDB_VIEW_ZOOMOUT 367\r
-#define IDB_TREE_STATE 368\r
#define IDB_FILE_OPENCONFLICT 369\r
#define IDB_PLUGINS_LIST 370\r
#define IDB_MERGE_COMPARE 371\r
#define IDI_NOTEQUALTEXTFILE 529\r
#define IDI_EQUALIMAGE 530\r
#define IDI_NOTEQUALIMAGE 531\r
+#define IDI_TREE_STATE_COLLAPSED 532\r
+#define IDI_TREE_STATE_EXPANDED 533\r
#define IDC_PATH0_BUTTON 1001\r
#define IDC_PATH1_BUTTON 1002\r
#define IDC_PATH2_BUTTON 1003\r