Clone
ixen
committed
on 05 Dec 20
Fixed 32-bit build.
src/ch/ComboDataWrapper.h (+2 -2)
19 19 #pragma once
20 20
21 21 template<class T>
22 22 class ComboDataWrapper
23 23 {
24 24 public:
25 25         ComboDataWrapper(CComboBox& rCombo, T defaultValue, T lastValue) :
26 26                 m_rCombo(rCombo),
27 27                 m_defaultValue(defaultValue),
28 28                 m_lastValue(lastValue)
29 29         {
30 30         }
31 31
32 32         T GetSelectedValue() const
33 33         {
34 34                 int iSel = m_rCombo.GetCurSel();
35 35                 if(iSel < 0)
36 36                         return m_defaultValue;
37 37
38 38                 DWORD_PTR dwData = m_rCombo.GetItemData(iSel);
39                   if(dwData < m_lastValue)
  39                 if((T)dwData < m_lastValue)
40 40                         return (T)dwData;
41 41
42 42                 return m_defaultValue;
43 43         }
44 44
45 45         void SelectComboResult(T value)
46 46         {
47 47                 for(int iIndex = 0; iIndex < m_rCombo.GetCount(); ++iIndex)
48 48                 {
49 49                         DWORD_PTR dwData = m_rCombo.GetItemData(iIndex);
50                           if(dwData == value)
  50                         if((T)dwData == value)
51 51                         {
52 52                                 m_rCombo.SetCurSel(iIndex);
53 53                                 return;
54 54                         }
55 55                 }
56 56         }
57 57
58 58 private:
59 59         CComboBox& m_rCombo;
60 60         T m_defaultValue;
61 61         T m_lastValue;
62 62 };