Index: src/ch/ComboDataWrapper.h
===================================================================
diff -u -N -r3aa1103497018be2a7494e79e03c5f4c674485be -rcbf79189791d3aa83af689b2b52813144da0acd7
--- src/ch/ComboDataWrapper.h	(.../ComboDataWrapper.h)	(revision 3aa1103497018be2a7494e79e03c5f4c674485be)
+++ src/ch/ComboDataWrapper.h	(.../ComboDataWrapper.h)	(revision cbf79189791d3aa83af689b2b52813144da0acd7)
@@ -36,7 +36,7 @@
 			return m_defaultValue;
 
 		DWORD_PTR dwData = m_rCombo.GetItemData(iSel);
-		if(dwData < m_lastValue)
+		if((T)dwData < m_lastValue)
 			return (T)dwData;
 
 		return m_defaultValue;
@@ -47,7 +47,7 @@
 		for(int iIndex = 0; iIndex < m_rCombo.GetCount(); ++iIndex)
 		{
 			DWORD_PTR dwData = m_rCombo.GetItemData(iIndex);
-			if(dwData == value)
+			if((T)dwData == value)
 			{
 				m_rCombo.SetCurSel(iIndex);
 				return;