ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UI: Allow combo to have no auto selected value

This commit is contained in:
zilmar 2012-11-13 16:07:23 +11:00
parent 8401f62336
commit 1383699fac
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Project64/User Interface/Settings/Settings Page.h
View File

@ -183,7 +183,7 @@ protected:
return item->second;
}
CModifiedComboBox * ComboBox = new CModifiedComboBox;
CModifiedComboBox * ComboBox = new CModifiedComboBox(_Settings->LoadDefaultDword(Type),NULL,false);
if (ComboBox == NULL)
{
return NULL;
@ -201,7 +201,7 @@ protected:
return item->second;
}
CModifiedComboBoxTxt * ComboBox = new CModifiedComboBoxTxt;
CModifiedComboBoxTxt * ComboBox = new CModifiedComboBoxTxt(_Settings->LoadDefaultString(Type));
if (ComboBox == NULL)
{
return NULL;

30
Source/Project64/User Interface/WTL Controls/ModifiedComboBox.h
View File

@ -6,18 +6,12 @@ class CModifiedComboBoxT :
{
typedef std::list<TParam *> TParamList;
bool m_Changed;
bool m_Reset;
TParam m_defaultValue;
HFONT m_BoldFont;
HFONT m_OriginalFont;
HWND m_TextField;
TParamList m_ParamList;
public:
// Constructors
CModifiedComboBoxT(HWND hWnd = NULL) :
CModifiedComboBoxT(TParam defaultValue, HWND hWnd = NULL, bool AllwaysSelected = true) :
CComboBox(hWnd),
m_defaultValue(defaultValue),
m_AllwaysSelected(AllwaysSelected),
m_Changed(false),
m_Reset(false),
m_BoldFont(NULL),
@ -48,7 +42,7 @@ public:
TParam * Value = new TParam(lParam);
SetItemData(indx,(DWORD_PTR)(Value));
m_ParamList.push_back(Value);
if (GetCount() == 1 || m_defaultValue == lParam)
if ((m_AllwaysSelected && GetCount() == 1) || m_defaultValue == lParam)
{
SetCurSel(indx);
}
@ -137,6 +131,22 @@ public:
return m_Reset;
}
private:
CModifiedComboBoxT(void); // Disable default constructor
CModifiedComboBoxT(const CModifiedComboBoxT&); // Disable copy constructor
CModifiedComboBoxT& operator=(const CModifiedComboBoxT&); // Disable assignment
bool m_Changed;
bool m_Reset;
TParam m_defaultValue;
HFONT m_BoldFont;
HFONT m_OriginalFont;
HWND m_TextField;
bool m_AllwaysSelected;
TParamList m_ParamList;
};
typedef CModifiedComboBoxT<WPARAM> CModifiedComboBox;