Changeset 655 for trunk

Timestamp:

12/25/08 11:23:50 (11 years ago)

Author:

Eoin

Message:

SortList? mixin coded.

Location:

trunk

Files:

• sln/Halite/Halite.vcproj (modified) (1 diff)
• src/HaliteSortListViewCtrl.hpp (modified) (6 diffs)
• src/WTLx/ListViewSortMixin.hpp (added)

trunk/sln/Halite/Halite.vcproj

@@ -1455 +1455 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\WTLx\ListViewSortMixin.hpp"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\WTLx\NTray.hpp"
                                         >

trunk/src/HaliteSortListViewCtrl.hpp

@@ -29 +29 @@
 #include "WTLx/SelectionManager.hpp"
 #include "WTLx/ListViewIterators.hpp"
+#include "WTLx/ListViewSortMixin.hpp"
 #include "HaliteUpdateLock.hpp"
 
@@ -50 +51 @@
 class CHaliteSortListViewCtrl : 
         public ATL::CWindowImpl<TBase, WTL::CListViewCtrl>,
-        public WTLx::ListViewIterators<CHaliteSortListViewCtrl<TBase, AdapterType> >
+        public WTLx::ListViewIterators<CHaliteSortListViewCtrl<TBase, AdapterType> >,
+        public WTLx::ListViewSortMixin<CHaliteSortListViewCtrl<TBase, AdapterType> >
 {
 public:
         typedef CHaliteSortListViewCtrl<TBase, AdapterType> thisClass;
         typedef ATL::CWindowImpl<TBase, WTL::CListViewCtrl> parentClass;
+        typedef WTLx::ListViewSortMixin<thisClass> listClass;
         
         class CHaliteHeaderCtrl : public CWindowImpl<CHaliteHeaderCtrl, WTL::CHeaderCtrl>
@@ -147 +150 @@
                 REFLECTED_NOTIFY_CODE_HANDLER(LVN_ITEMCHANGED, OnItemChanged)
 
+                CHAIN_MSG_MAP(listClass)
                 DEFAULT_REFLECTION_HANDLER()
-//              CHAIN_MSG_MAP(parentClass)
         END_MSG_MAP()
 
@@ -159 +162 @@
                 pT->OnAttach();
         }
-        
+
         HWND Create(HWND hWndParent, ATL::_U_RECT rect = NULL, LPCTSTR szWindowName = NULL,
                         DWORD dwStyle = 0, DWORD dwExStyle = 0,
@@ -168 +171 @@
                         
                 SetExtendedListViewStyle(WS_EX_CLIENTEDGE|LVS_EX_FULLROWSELECT|LVS_EX_HEADERDRAGDROP|LVS_EX_DOUBLEBUFFER|LVS_EX_SUBITEMIMAGES);
-//              SetSortListViewExtendedStyle(SORTLV_USESHELLBITMAPS, SORTLV_USESHELLBITMAPS);
+                SetListViewSortMixinExtendedStyle(SORTLV_USESHELLBITMAPS, SORTLV_USESHELLBITMAPS);
                 
                 return hwnd;
@@ -179 +182 @@
                         
                 SetExtendedListViewStyle(WS_EX_CLIENTEDGE|LVS_EX_FULLROWSELECT|LVS_EX_HEADERDRAGDROP|LVS_EX_DOUBLEBUFFER);
-//              SetSortListViewExtendedStyle(SORTLV_USESHELLBITMAPS, SORTLV_USESHELLBITMAPS);
+                SetListViewSortMixinExtendedStyle(SORTLV_USESHELLBITMAPS, SORTLV_USESHELLBITMAPS);
                 
                 return true;