diff --git a/MissionEditor/AITriggerTypes.cpp b/MissionEditor/AITriggerTypes.cpp index 27fc459..8e2b6fd 100644 --- a/MissionEditor/AITriggerTypes.cpp +++ b/MissionEditor/AITriggerTypes.cpp @@ -117,31 +117,31 @@ void CAITriggerTypes::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CAITriggerTypes, CDialog) //{{AFX_MSG_MAP(CAITriggerTypes) ON_CBN_SELCHANGE(IDC_AITRIGGERTYPE, OnSelchangeAitriggertype) - ON_EN_CHANGE(IDC_NAME, OnChangeName) - ON_CBN_EDITCHANGE(IDC_OWNER, OnEditchangeOwner) - ON_CBN_EDITCHANGE(IDC_TEAMTYPE1, OnEditchangeTeamtype1) - ON_CBN_EDITCHANGE(IDC_TEAMTYPE2, OnEditchangeTeamtype2) - ON_CBN_EDITCHANGE(IDC_FLAG1, OnEditchangeFlag1) - ON_CBN_EDITCHANGE(IDC_FLAG2, OnEditchangeFlag2) - ON_CBN_EDITCHANGE(IDC_UNITTYPE, OnEditchangeUnittype) - ON_CBN_EDITCHANGE(IDC_DATA, OnEditchangeData) - ON_EN_CHANGE(IDC_FLOAT1, OnChangeFloat1) - ON_EN_CHANGE(IDC_FLOAT2, OnChangeFloat2) - ON_EN_CHANGE(IDC_FLOAT3, OnChangeFloat3) - ON_EN_CHANGE(IDC_FLAG4, OnChangeFlag4) + ON_EN_KILLFOCUS(IDC_NAME, OnChangeName) + ON_CBN_KILLFOCUS(IDC_OWNER, OnEditchangeOwner) + ON_CBN_KILLFOCUS(IDC_TEAMTYPE1, OnEditchangeTeamtype1) + ON_CBN_KILLFOCUS(IDC_TEAMTYPE2, OnEditchangeTeamtype2) + ON_CBN_KILLFOCUS(IDC_FLAG1, OnEditchangeFlag1) + ON_CBN_KILLFOCUS(IDC_FLAG2, OnEditchangeFlag2) + ON_CBN_KILLFOCUS(IDC_UNITTYPE, OnEditchangeUnittype) + ON_CBN_KILLFOCUS(IDC_DATA, OnEditchangeData) + ON_EN_KILLFOCUS(IDC_FLOAT1, OnChangeFloat1) + ON_EN_KILLFOCUS(IDC_FLOAT2, OnChangeFloat2) + ON_EN_KILLFOCUS(IDC_FLOAT3, OnChangeFloat3) + ON_EN_KILLFOCUS(IDC_FLAG4, OnChangeFlag4) ON_BN_CLICKED(IDC_ENABLED, OnEnabled) ON_BN_CLICKED(IDC_ADD, OnAdd) ON_BN_CLICKED(IDC_DELETE, OnDelete) - ON_CBN_EDITCHANGE(IDC_AITRIGGERTYPE, OnEditchangeAitriggertype) + ON_CBN_KILLFOCUS(IDC_AITRIGGERTYPE, OnEditchangeAitriggertype) ON_CBN_SELCHANGE(IDC_CONDITION, OnSelchangeCondition) - ON_EN_CHANGE(IDC_NUMBER, OnChangeNumber) + ON_EN_KILLFOCUS(IDC_NUMBER, OnChangeNumber) ON_BN_CLICKED(IDC_EASY, OnEasy) ON_BN_CLICKED(IDC_MEDIUM, OnMedium) ON_BN_CLICKED(IDC_HARD, OnHard) ON_BN_CLICKED(IDC_BASEDEFENSE, OnBasedefense) ON_BN_CLICKED(IDC_SKIRMISH, OnSkirmish) - ON_CBN_EDITCHANGE(IDC_MULTISIDE, OnEditchangeMultiside) + ON_CBN_KILLFOCUS(IDC_MULTISIDE, OnEditchangeMultiside) ON_CBN_SELCHANGE(IDC_MULTISIDE, OnSelchangeMultiside) //}}AFX_MSG_MAP END_MESSAGE_MAP() diff --git a/MissionEditor/ScriptTypes.cpp b/MissionEditor/ScriptTypes.cpp index a341e00..3e9a76b 100644 --- a/MissionEditor/ScriptTypes.cpp +++ b/MissionEditor/ScriptTypes.cpp @@ -279,13 +279,13 @@ void CScriptTypes::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CScriptTypes, CDialog) //{{AFX_MSG_MAP(CScriptTypes) - ON_CBN_EDITCHANGE(IDC_SCRIPTTYPE, OnEditchangeScripttype) + ON_CBN_KILLFOCUS(IDC_SCRIPTTYPE, OnEditchangeScripttype) ON_CBN_SELCHANGE(IDC_SCRIPTTYPE, OnSelchangeScripttype) ON_LBN_SELCHANGE(IDC_ACTION, OnSelchangeAction) - ON_EN_CHANGE(IDC_NAME, OnChangeName) - ON_CBN_EDITCHANGE(IDC_TYPE, OnEditchangeType) + ON_EN_KILLFOCUS(IDC_NAME, OnChangeName) + ON_CBN_KILLFOCUS(IDC_TYPE, OnEditchangeType) ON_CBN_SELCHANGE(IDC_TYPE, OnSelchangeType) - ON_CBN_EDITCHANGE(IDC_PARAM, OnEditchangeParam) + ON_CBN_KILLFOCUS(IDC_PARAM, OnEditchangeParam) ON_CBN_SELCHANGE(IDC_PARAM, OnSelchangeParam) ON_BN_CLICKED(IDC_ADDACTION, OnAddaction) ON_BN_CLICKED(IDC_DELETEACTION, OnDeleteaction) diff --git a/MissionEditor/Tags.cpp b/MissionEditor/Tags.cpp index 36a7328..f74ea9d 100644 --- a/MissionEditor/Tags.cpp +++ b/MissionEditor/Tags.cpp @@ -66,10 +66,10 @@ void CTags::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CTags, CDialog) //{{AFX_MSG_MAP(CTags) ON_CBN_SELCHANGE(IDC_TAG, OnSelchangeTag) - ON_EN_CHANGE(IDC_NAME, OnChangeName) - ON_CBN_EDITCHANGE(IDC_REPEAT, OnEditchangeRepeat) + ON_EN_KILLFOCUS(IDC_NAME, OnChangeName) + ON_CBN_KILLFOCUS(IDC_REPEAT, OnEditchangeRepeat) ON_CBN_SELCHANGE(IDC_REPEAT, OnSelchangeRepeat) - ON_CBN_EDITCHANGE(IDC_TRIGGER, OnEditchangeTrigger) + ON_CBN_KILLFOCUS(IDC_TRIGGER, OnEditchangeTrigger) ON_CBN_SELCHANGE(IDC_TRIGGER, OnSelchangeTrigger) ON_BN_CLICKED(IDC_DELETE, OnDelete) ON_BN_CLICKED(IDC_ADD, OnAdd) diff --git a/MissionEditor/TaskForce.cpp b/MissionEditor/TaskForce.cpp index 16a1a48..40f09ee 100644 --- a/MissionEditor/TaskForce.cpp +++ b/MissionEditor/TaskForce.cpp @@ -70,18 +70,18 @@ void CTaskForce::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CTaskForce, CDialog) //{{AFX_MSG_MAP(CTaskForce) - ON_CBN_EDITCHANGE(IDC_TASKFORCES, OnEditchangeTaskforces) + ON_CBN_KILLFOCUS(IDC_TASKFORCES, OnEditchangeTaskforces) ON_CBN_SELCHANGE(IDC_TASKFORCES, OnSelchangeTaskforces) ON_LBN_SELCHANGE(IDC_UNITS, OnSelchangeUnits) ON_BN_CLICKED(IDC_DELETEUNIT, OnDeleteunit) - ON_EN_CHANGE(IDC_NUMBERUNITS, OnChangeNumberunits) - ON_EN_CHANGE(IDC_NAME, OnChangeName) - ON_CBN_EDITCHANGE(IDC_UNITTYPE, OnEditchangeUnittype) + ON_EN_KILLFOCUS(IDC_NUMBERUNITS, OnChangeNumberunits) + ON_EN_KILLFOCUS(IDC_NAME, OnChangeName) + ON_CBN_KILLFOCUS(IDC_UNITTYPE, OnEditchangeUnittype) ON_CBN_SELCHANGE(IDC_UNITTYPE, OnSelchangeUnittype) ON_BN_CLICKED(IDC_ADDUNIT, OnAddunit) ON_BN_CLICKED(IDC_DELETETASKFORCE, OnDeletetaskforce) ON_BN_CLICKED(IDC_ADDTASKFORCE, OnAddtaskforce) - ON_EN_CHANGE(IDC_GROUP, OnChangeGroup) + ON_EN_KILLFOCUS(IDC_GROUP, OnChangeGroup) //}}AFX_MSG_MAP END_MESSAGE_MAP() diff --git a/MissionEditor/TeamTypes.cpp b/MissionEditor/TeamTypes.cpp index 4d9955f..2ff70ea 100644 --- a/MissionEditor/TeamTypes.cpp +++ b/MissionEditor/TeamTypes.cpp @@ -130,17 +130,17 @@ void CTeamTypes::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CTeamTypes, CDialog) //{{AFX_MSG_MAP(CTeamTypes) ON_CBN_SELCHANGE(IDC_TEAMTYPES, OnSelchangeTeamtypes) - ON_EN_CHANGE(IDC_NAME, OnChangeName) + ON_EN_KILLFOCUS(IDC_NAME, OnChangeName) ON_BN_CLICKED(IDC_DELETETEAMTYPE, OnDeleteteamtype) - ON_CBN_EDITCHANGE(IDC_VETERANLEVEL, OnEditchangeVeteranlevel) - ON_CBN_EDITCHANGE(IDC_HOUSE, OnEditchangeHouse) - ON_EN_CHANGE(IDC_PRIORITY, OnChangePriority) - ON_EN_CHANGE(IDC_MAX, OnChangeMax) - ON_CBN_EDITCHANGE(IDC_TECHLEVEL, OnEditchangeTechlevel) - ON_CBN_EDITCHANGE(IDC_GROUP, OnEditchangeGroup) - ON_CBN_EDITCHANGE(IDC_WAYPOINT, OnEditchangeWaypoint) - ON_CBN_EDITCHANGE(IDC_SCRIPT, OnEditchangeScript) - ON_CBN_EDITCHANGE(IDC_TASKFORCE, OnEditchangeTaskforce) + ON_CBN_KILLFOCUS(IDC_VETERANLEVEL, OnEditchangeVeteranlevel) + ON_CBN_KILLFOCUS(IDC_HOUSE, OnEditchangeHouse) + ON_EN_KILLFOCUS(IDC_PRIORITY, OnChangePriority) + ON_EN_KILLFOCUS(IDC_MAX, OnChangeMax) + ON_CBN_KILLFOCUS(IDC_TECHLEVEL, OnEditchangeTechlevel) + ON_CBN_KILLFOCUS(IDC_GROUP, OnEditchangeGroup) + ON_CBN_KILLFOCUS(IDC_WAYPOINT, OnEditchangeWaypoint) + ON_CBN_KILLFOCUS(IDC_SCRIPT, OnEditchangeScript) + ON_CBN_KILLFOCUS(IDC_TASKFORCE, OnEditchangeTaskforce) ON_CBN_KILLFOCUS(IDC_VETERANLEVEL, OnKillfocusVeteranlevel) ON_CBN_KILLFOCUS(IDC_HOUSE, OnKillfocusHouse) ON_CBN_KILLFOCUS(IDC_TECHLEVEL, OnKillfocusTechlevel) @@ -170,11 +170,11 @@ BEGIN_MESSAGE_MAP(CTeamTypes, CDialog) ON_BN_CLICKED(IDC_ISBASEDEFENSE, OnIsbasedefense) ON_BN_CLICKED(IDC_ONLYTARGETHOUSEENEMY, OnOnlytargethouseenemy) ON_BN_CLICKED(IDC_NEWTEAMTYPE, OnNewteamtype) - ON_CBN_EDITCHANGE(IDC_TAG, OnEditchangeTag) + ON_CBN_KILLFOCUS(IDC_TAG, OnEditchangeTag) ON_CBN_KILLFOCUS(IDC_TAG, OnKillfocusTag) - ON_CBN_EDITCHANGE(IDC_TRANSPORTWAYPOINT, OnEditchangeTransportwaypoint) + ON_CBN_KILLFOCUS(IDC_TRANSPORTWAYPOINT, OnEditchangeTransportwaypoint) ON_CBN_KILLFOCUS(IDC_TRANSPORTWAYPOINT, OnKillfocusTransportwaypoint) - ON_CBN_EDITCHANGE(IDC_MINDCONTROLDECISION, OnEditchangeMindcontroldecision) + ON_CBN_KILLFOCUS(IDC_MINDCONTROLDECISION, OnEditchangeMindcontroldecision) ON_CBN_KILLFOCUS(IDC_MINDCONTROLDECISION, OnKillfocusMindcontroldecision) //}}AFX_MSG_MAP END_MESSAGE_MAP() diff --git a/MissionEditor/TriggerActionsDlg.cpp b/MissionEditor/TriggerActionsDlg.cpp index c1f2e20..3a45083 100644 --- a/MissionEditor/TriggerActionsDlg.cpp +++ b/MissionEditor/TriggerActionsDlg.cpp @@ -79,9 +79,9 @@ void CTriggerActionsDlg::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CTriggerActionsDlg, CDialog) //{{AFX_MSG_MAP(CTriggerActionsDlg) ON_CBN_SELCHANGE(IDC_ACTION, OnSelchangeAction) - ON_CBN_EDITCHANGE(IDC_ACTIONTYPE, OnEditchangeActiontype) + ON_CBN_KILLFOCUS(IDC_ACTIONTYPE, OnEditchangeActiontype) ON_LBN_SELCHANGE(IDC_PARAMETER, OnSelchangeParameter) - ON_CBN_EDITCHANGE(IDC_PARAMVALUE, OnEditchangeParamvalue) + ON_CBN_KILLFOCUS(IDC_PARAMVALUE, OnEditchangeParamvalue) ON_BN_CLICKED(IDC_NEWACTION, OnNewaction) ON_BN_CLICKED(IDC_DELETEACTION, OnDeleteaction) //}}AFX_MSG_MAP diff --git a/MissionEditor/TriggerEditorDlg.cpp b/MissionEditor/TriggerEditorDlg.cpp index e50af2e..44779e8 100644 --- a/MissionEditor/TriggerEditorDlg.cpp +++ b/MissionEditor/TriggerEditorDlg.cpp @@ -65,7 +65,7 @@ BEGIN_MESSAGE_MAP(CTriggerEditorDlg, CDialog) ON_BN_CLICKED(IDC_NEWTRIGGER, OnNewtrigger) ON_BN_CLICKED(IDC_DELETETRIGGER, OnDeletetrigger) ON_CBN_SELCHANGE(IDC_TRIGGER, OnSelchangeTrigger) - ON_CBN_EDITCHANGE(IDC_TRIGGER, OnEditchangeTrigger) + ON_CBN_KILLFOCUS(IDC_TRIGGER, OnEditchangeTrigger) ON_NOTIFY(TCN_SELCHANGE, IDC_TRIGGERTAB, OnSelchangeTriggertab) ON_BN_CLICKED(IDC_PLACEONMAP, OnPlaceonmap) ON_BN_CLICKED(IDC_CLONE, OnClone) diff --git a/MissionEditor/TriggerEventsDlg.cpp b/MissionEditor/TriggerEventsDlg.cpp index 79a51c9..5ef8521 100644 --- a/MissionEditor/TriggerEventsDlg.cpp +++ b/MissionEditor/TriggerEventsDlg.cpp @@ -66,9 +66,9 @@ BEGIN_MESSAGE_MAP(CTriggerEventsDlg, CDialog) ON_BN_CLICKED(IDC_NEWEVENT, OnNewevent) ON_BN_CLICKED(IDC_DELETEEVENT, OnDeleteevent) ON_CBN_SELCHANGE(IDC_EVENT, OnSelchangeEvent) - ON_CBN_EDITCHANGE(IDC_EVENTTYPE, OnEditchangeEventtype) + ON_CBN_KILLFOCUS(IDC_EVENTTYPE, OnEditchangeEventtype) ON_LBN_SELCHANGE(IDC_PARAMETER, OnSelchangeParameter) - ON_CBN_EDITCHANGE(IDC_PARAMVALUE, OnEditchangeParamvalue) + ON_CBN_KILLFOCUS(IDC_PARAMVALUE, OnEditchangeParamvalue) //}}AFX_MSG_MAP END_MESSAGE_MAP() diff --git a/MissionEditor/TriggerOptionsDlg.cpp b/MissionEditor/TriggerOptionsDlg.cpp index 3c40214..45c8f85 100644 --- a/MissionEditor/TriggerOptionsDlg.cpp +++ b/MissionEditor/TriggerOptionsDlg.cpp @@ -65,12 +65,12 @@ void CTriggerOptionsDlg::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CTriggerOptionsDlg, CDialog) //{{AFX_MSG_MAP(CTriggerOptionsDlg) - ON_EN_CHANGE(IDC_NAME, OnChangeName) - ON_CBN_EDITCHANGE(IDC_HOUSE, OnEditchangeHouse) - ON_CBN_EDITCHANGE(IDC_ATTACHEDTRIGGER, OnEditchangeAttachedtrigger) + ON_EN_KILLFOCUS(IDC_NAME, OnChangeName) + ON_CBN_KILLFOCUS(IDC_HOUSE, OnEditchangeHouse) + ON_CBN_KILLFOCUS(IDC_ATTACHEDTRIGGER, OnEditchangeAttachedtrigger) ON_EN_KILLFOCUS(IDC_NAME, OnKillfocusName) ON_WM_KILLFOCUS() - ON_CBN_EDITCHANGE(IDC_TRIGGERTYPE, OnEditchangeTriggertype) + ON_CBN_KILLFOCUS(IDC_TRIGGERTYPE, OnEditchangeTriggertype) ON_BN_CLICKED(IDC_DISABLED, OnDisabled) ON_BN_CLICKED(IDC_EASY, OnEasy) ON_BN_CLICKED(IDC_MEDIUM, OnMedium) diff --git a/MissionEditor/Triggers.cpp b/MissionEditor/Triggers.cpp index bd8137d..4d8e775 100644 --- a/MissionEditor/Triggers.cpp +++ b/MissionEditor/Triggers.cpp @@ -114,37 +114,37 @@ BEGIN_MESSAGE_MAP(CTriggers, CDialog) ON_CBN_SELCHANGE(IDC_TRIGGER, OnSelchangeTrigger) ON_CBN_SELCHANGE(IDC_EVENT, OnSelchangeEvent) ON_CBN_SELCHANGE(IDC_ACTION, OnSelchangeAction) - ON_CBN_EDITCHANGE(IDC_HOUSE, OnEditchangeHouse) + ON_CBN_KILLFOCUS(IDC_HOUSE, OnEditchangeHouse) ON_CBN_SELCHANGE(IDC_HOUSE, OnSelchangeHouse) - ON_EN_CHANGE(IDC_NAME, OnChangeName) - ON_EN_CHANGE(IDC_FLAG1, OnChangeFlag1) - ON_EN_CHANGE(IDC_FLAG2, OnChangeFlag2) - ON_EN_CHANGE(IDC_FLAG3, OnChangeFlag3) - ON_EN_CHANGE(IDC_FLAG4, OnChangeFlag4) - ON_EN_CHANGE(IDC_FLAG5, OnChangeFlag5) - ON_CBN_EDITCHANGE(IDC_TRIGGER2, OnEditchangeTrigger2) + ON_EN_KILLFOCUS(IDC_NAME, OnChangeName) + ON_EN_KILLFOCUS(IDC_FLAG1, OnChangeFlag1) + ON_EN_KILLFOCUS(IDC_FLAG2, OnChangeFlag2) + ON_EN_KILLFOCUS(IDC_FLAG3, OnChangeFlag3) + ON_EN_KILLFOCUS(IDC_FLAG4, OnChangeFlag4) + ON_EN_KILLFOCUS(IDC_FLAG5, OnChangeFlag5) + ON_CBN_KILLFOCUS(IDC_TRIGGER2, OnEditchangeTrigger2) ON_CBN_SELCHANGE(IDC_TRIGGER2, OnSelchangeTrigger2) - ON_CBN_EDITCHANGE(IDC_EVENTTYPE, OnEditchangeEventtype) + ON_CBN_KILLFOCUS(IDC_EVENTTYPE, OnEditchangeEventtype) ON_CBN_SELCHANGE(IDC_EVENTTYPE, OnSelchangeEventtype) - ON_CBN_EDITCHANGE(IDC_EVENTPARAM1, OnEditchangeEventparam1) + ON_CBN_KILLFOCUS(IDC_EVENTPARAM1, OnEditchangeEventparam1) ON_CBN_SELCHANGE(IDC_EVENTPARAM1, OnSelchangeEventparam1) - ON_CBN_EDITCHANGE(IDC_EVENTPARAM2, OnEditchangeEventparam2) + ON_CBN_KILLFOCUS(IDC_EVENTPARAM2, OnEditchangeEventparam2) ON_CBN_SELCHANGE(IDC_EVENTPARAM2, OnSelchangeEventparam2) - ON_CBN_EDITCHANGE(IDC_ACTIONTYPE, OnEditchangeActiontype) + ON_CBN_KILLFOCUS(IDC_ACTIONTYPE, OnEditchangeActiontype) ON_CBN_SELCHANGE(IDC_ACTIONTYPE, OnSelchangeActiontype) - ON_CBN_EDITCHANGE(IDC_ACTIONWAYPOINT, OnEditchangeActionwaypoint) + ON_CBN_KILLFOCUS(IDC_ACTIONWAYPOINT, OnEditchangeActionwaypoint) ON_CBN_SELCHANGE(IDC_ACTIONWAYPOINT, OnSelchangeActionwaypoint) - ON_CBN_EDITCHANGE(IDC_ACTIONPARAM1, OnEditchangeActionparam1) + ON_CBN_KILLFOCUS(IDC_ACTIONPARAM1, OnEditchangeActionparam1) ON_CBN_SELCHANGE(IDC_ACTIONPARAM1, OnSelchangeActionparam1) - ON_CBN_EDITCHANGE(IDC_ACTIONPARAM2, OnEditchangeActionparam2) + ON_CBN_KILLFOCUS(IDC_ACTIONPARAM2, OnEditchangeActionparam2) ON_CBN_SELCHANGE(IDC_ACTIONPARAM2, OnSelchangeActionparam2) - ON_CBN_EDITCHANGE(IDC_ACTIONPARAM3, OnEditchangeActionparam3) + ON_CBN_KILLFOCUS(IDC_ACTIONPARAM3, OnEditchangeActionparam3) ON_CBN_SELCHANGE(IDC_ACTIONPARAM3, OnSelchangeActionparam3) - ON_CBN_EDITCHANGE(IDC_ACTIONPARAM4, OnEditchangeActionparam4) + ON_CBN_KILLFOCUS(IDC_ACTIONPARAM4, OnEditchangeActionparam4) ON_CBN_SELCHANGE(IDC_ACTIONPARAM4, OnSelchangeActionparam4) - ON_CBN_EDITCHANGE(IDC_ACTIONPARAM5, OnEditchangeActionparam5) + ON_CBN_KILLFOCUS(IDC_ACTIONPARAM5, OnEditchangeActionparam5) ON_CBN_SELCHANGE(IDC_ACTIONPARAM5, OnSelchangeActionparam5) - ON_CBN_EDITCHANGE(IDC_ACTIONPARAM6, OnEditchangeActionparam6) + ON_CBN_KILLFOCUS(IDC_ACTIONPARAM6, OnEditchangeActionparam6) ON_CBN_SELCHANGE(IDC_ACTIONPARAM6, OnSelchangeActionparam6) ON_BN_CLICKED(IDC_ADDEVENT, OnAddevent) ON_BN_CLICKED(IDC_DELETEEVENT, OnDeleteevent)