From 1ac8a2e1820e63c723629a88a250ad6b104ad2ce Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Wed, 6 Jan 2016 17:49:47 +0000 Subject: [PATCH] Enhanced code for IMPP in frmContactEditor and frmContactEditorIM. --- source/contacteditor/frmContactEditor-General.cpp | 15 ++++++++++----- source/contacteditor/frmContactEditor-Load.cpp | 12 ++++++------ source/contacteditor/frmContactEditorIM.h | 4 +++- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/source/contacteditor/frmContactEditor-General.cpp b/source/contacteditor/frmContactEditor-General.cpp index f02eb83..65e933b 100644 --- a/source/contacteditor/frmContactEditor-General.cpp +++ b/source/contacteditor/frmContactEditor-General.cpp @@ -282,6 +282,7 @@ void frmContactEditor::AddGeneralIM( wxCommandEvent& event ) &ContactEditorData.GeneralIMListAltID, &ContactEditorData.GeneralIMListPID, &ContactEditorData.GeneralIMListType, + &ContactEditorData.GeneralIMListTypeInfo, &ContactEditorData.GeneralIMListTokens, &ContactEditorData.GeneralIMListMediatype, &ContactEditorData.GeneralIMListPref, @@ -302,12 +303,13 @@ void frmContactEditor::ModifyGeneralIM( wxCommandEvent& event ) &intSelectedData)){ return; } - + frmContactEditorIM *frameCEIM = new frmContactEditorIM ( this ); frameCEIM->SetupPointers(&ContactEditorData.GeneralIMList, &ContactEditorData.GeneralIMListAltID, &ContactEditorData.GeneralIMListPID, &ContactEditorData.GeneralIMListType, + &ContactEditorData.GeneralIMListTypeInfo, &ContactEditorData.GeneralIMListTokens, &ContactEditorData.GeneralIMListMediatype, &ContactEditorData.GeneralIMListPref, @@ -334,8 +336,9 @@ void frmContactEditor::DeleteGeneralIM( wxCommandEvent& event ) DeleteMapData(intSelectedData, &ContactEditorData.GeneralIMList, &ContactEditorData.GeneralIMListAltID, &ContactEditorData.GeneralIMListPID, - &ContactEditorData.GeneralIMListType, &ContactEditorData.GeneralIMListTokens, - &ContactEditorData.GeneralIMListMediatype, &ContactEditorData.GeneralIMListPref); + &ContactEditorData.GeneralIMListType, &ContactEditorData.GeneralIMListTypeInfo, + &ContactEditorData.GeneralIMListTokens, &ContactEditorData.GeneralIMListMediatype, + &ContactEditorData.GeneralIMListPref); } @@ -350,6 +353,7 @@ void frmContactEditor::AddGeneralTelephone( wxCommandEvent& event ) &ContactEditorData.GeneralTelephoneListAltID, &ContactEditorData.GeneralTelephoneListPID, &ContactEditorData.GeneralTelephoneListType, + &ContactEditorData.GeneralTelephoneListTypeInfo, &ContactEditorData.GeneralTelephoneListTokens, &ContactEditorData.GeneralTelephoneListPref, lboTelephone, @@ -375,6 +379,7 @@ void frmContactEditor::ModifyGeneralTelephone( wxCommandEvent& event ) &ContactEditorData.GeneralTelephoneListAltID, &ContactEditorData.GeneralTelephoneListPID, &ContactEditorData.GeneralTelephoneListType, + &ContactEditorData.GeneralTelephoneListTypeInfo, &ContactEditorData.GeneralTelephoneListTokens, &ContactEditorData.GeneralTelephoneListPref, lboTelephone, @@ -400,8 +405,8 @@ void frmContactEditor::DeleteGeneralTelephone( wxCommandEvent& event ) DeleteMapData(intSelectedData, &ContactEditorData.GeneralTelephoneList, &ContactEditorData.GeneralTelephoneListAltID, &ContactEditorData.GeneralTelephoneListPID, - &ContactEditorData.GeneralTelephoneListType, &ContactEditorData.GeneralTelephoneListTokens, - &ContactEditorData.GeneralTelephoneListPref); + &ContactEditorData.GeneralTelephoneListType, &ContactEditorData.GeneralTelephoneListTypeInfo, + &ContactEditorData.GeneralTelephoneListTokens, &ContactEditorData.GeneralTelephoneListPref); } diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp index 57ebb01..92990a9 100644 --- a/source/contacteditor/frmContactEditor-Load.cpp +++ b/source/contacteditor/frmContactEditor-Load.cpp @@ -374,17 +374,17 @@ bool frmContactEditor::LoadContact(wxString Filename){ // Process the instant messaging (IMPP). - LoadData(&ContactEditorData.GeneralIMList, + LoadData(&ContactEditorData.GeneralIMListTypeInfo, &ContactEditorData.GeneralIMListPref, - &ContactEditorData.GeneralIMListTypeInfo, + &ContactEditorData.GeneralIMList, lboIM, - &ContactEditorData.HomeIMList, - &ContactEditorData.HomeIMListPref, &ContactEditorData.HomeIMListTypeInfo, + &ContactEditorData.HomeIMListPref, + &ContactEditorData.HomeIMList, lboHomeIM, - &ContactEditorData.BusinessIMList, - &ContactEditorData.BusinessIMListPref, &ContactEditorData.BusinessIMListTypeInfo, + &ContactEditorData.BusinessIMListPref, + &ContactEditorData.BusinessIMList, lboBusinessIM, &IMPPCount); diff --git a/source/contacteditor/frmContactEditorIM.h b/source/contacteditor/frmContactEditorIM.h index 1245951..d69772b 100644 --- a/source/contacteditor/frmContactEditorIM.h +++ b/source/contacteditor/frmContactEditorIM.h @@ -47,6 +47,7 @@ class frmContactEditorIM : public frmContactEditorIMADT std::map *IMListAltID, std::map *IMListPID, std::map *IMListType, + std::map *IMListTypeInfo, std::map *IMListTokens, std::map *IMListMediatype, std::map *IMListPref, @@ -60,11 +61,12 @@ class frmContactEditorIM : public frmContactEditorIMADT std::map *IMListAltIDPtr; std::map *IMListPIDPtr; std::map *IMListTypePtr; + std::map *IMListTypeInfoPtr; std::map *IMListTokensPtr; std::map *IMListMediatypePtr; std::map *IMListPrefPtr; wxListCtrl *IMListCtrlPtr; - int IMListIndex; + int IMListIndex = 0; SectionType EditSectionType; }; -- 2.39.5