X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-General.cpp;h=2fe3b1d0c6c52bed22aa1077c81f9e1ff45ffd18;hb=04a1ebb415bc0291b376d649d0d1ff680f4c6c7c;hp=eb30a3eb6215d2c4d390eeed45769eaed160cad1;hpb=5b2b2bcea1ab1dfd2b74589573cd16ee9326c4b9;p=xestiaab%2F.git diff --git a/source/contacteditor/frmContactEditor-General.cpp b/source/contacteditor/frmContactEditor-General.cpp index eb30a3e..2fe3b1d 100644 --- a/source/contacteditor/frmContactEditor-General.cpp +++ b/source/contacteditor/frmContactEditor-General.cpp @@ -1,3 +1,21 @@ +// frmContactEditor-General.cpp - frmContactEditor General tab subroutines. +// +// (c) 2012-2016 Xestia Software Development. +// +// This file is part of Xestia Address Book. +// +// Xestia Address Book is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by the +// Free Software Foundation, version 3 of the license. +// +// Xestia Address Book is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with Xestia Address Book. If not, see + #include "frmContactEditor.h" #include "frmContactEditorNickname.h" #include "frmContactEditorAddress.h" @@ -21,14 +39,14 @@ void frmContactEditor::AddGeneralNickname( wxCommandEvent& event ) frmContactEditorNickname *frameCENickname = new frmContactEditorNickname ( this ); frameCENickname->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&GeneralNicknamesList); - frameCENickname->SetupPointers(&GeneralNicknamesList, - &GeneralNicknamesListAltID, - &GeneralNicknamesListPID, - &GeneralNicknamesListType, - &GeneralNicknamesListLanguage, - &GeneralNicknamesListTokens, - &GeneralNicknamesListPref, + intResult = GetLastInt(&ContactEditorData.GeneralNicknamesList); + frameCENickname->SetupPointers(&ContactEditorData.GeneralNicknamesList, + &ContactEditorData.GeneralNicknamesListAltID, + &ContactEditorData.GeneralNicknamesListPID, + &ContactEditorData.GeneralNicknamesListType, + &ContactEditorData.GeneralNicknamesListLanguage, + &ContactEditorData.GeneralNicknamesListTokens, + &ContactEditorData.GeneralNicknamesListPref, lboNicknames, (intValueSeek)); frameCENickname->ShowModal(); @@ -49,13 +67,13 @@ void frmContactEditor::ModifyGeneralNickname( wxCommandEvent& event ) } frmContactEditorNickname *frameCENickname = new frmContactEditorNickname ( this ); - frameCENickname->SetupPointers(&GeneralNicknamesList, - &GeneralNicknamesListAltID, - &GeneralNicknamesListPID, - &GeneralNicknamesListType, - &GeneralNicknamesListLanguage, - &GeneralNicknamesListTokens, - &GeneralNicknamesListPref, + frameCENickname->SetupPointers(&ContactEditorData.GeneralNicknamesList, + &ContactEditorData.GeneralNicknamesListAltID, + &ContactEditorData.GeneralNicknamesListPID, + &ContactEditorData.GeneralNicknamesListType, + &ContactEditorData.GeneralNicknamesListLanguage, + &ContactEditorData.GeneralNicknamesListTokens, + &ContactEditorData.GeneralNicknamesListPref, lboNicknames, intSelectedData); frameCENickname->SetEditorMode(TRUE, CE_GENERAL); @@ -80,13 +98,13 @@ void frmContactEditor::DeleteGeneralNickname( wxCommandEvent& event ) lboNicknames->DeleteItem(longSelected); DeleteMapData(intSelectedData, - &GeneralNicknamesList, - &GeneralNicknamesListLanguage, - &GeneralNicknamesListAltID, - &GeneralNicknamesListPID, - &GeneralNicknamesListTokens, - &GeneralNicknamesListType, - &GeneralNicknamesListPref); + &ContactEditorData.GeneralNicknamesList, + &ContactEditorData.GeneralNicknamesListLanguage, + &ContactEditorData.GeneralNicknamesListAltID, + &ContactEditorData.GeneralNicknamesListPID, + &ContactEditorData.GeneralNicknamesListTokens, + &ContactEditorData.GeneralNicknamesListType, + &ContactEditorData.GeneralNicknamesListPref); } @@ -97,22 +115,22 @@ void frmContactEditor::AddGeneralAddress( wxCommandEvent& event ) frmContactEditorAddress *frameCEAddress = new frmContactEditorAddress ( this ); frameCEAddress->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&GeneralAddressList); - frameCEAddress->SetupPointers(&GeneralAddressList, - &GeneralAddressListTown, - &GeneralAddressListCounty, - &GeneralAddressListPostCode, - &GeneralAddressListCountry, - &GeneralAddressListLabel, - &GeneralAddressListLang, - &GeneralAddressListAltID, - &GeneralAddressListPID, - &GeneralAddressListTokens, - &GeneralAddressListGeo, - &GeneralAddressListTimezone, - &GeneralAddressListType, - &GeneralAddressListMediatype, - &GeneralAddressListPref, + intResult = GetLastInt(&ContactEditorData.GeneralAddressList); + frameCEAddress->SetupPointers(&ContactEditorData.GeneralAddressList, + &ContactEditorData.GeneralAddressListTown, + &ContactEditorData.GeneralAddressListCounty, + &ContactEditorData.GeneralAddressListPostCode, + &ContactEditorData.GeneralAddressListCountry, + &ContactEditorData.GeneralAddressListLabel, + &ContactEditorData.GeneralAddressListLang, + &ContactEditorData.GeneralAddressListAltID, + &ContactEditorData.GeneralAddressListPID, + &ContactEditorData.GeneralAddressListTokens, + &ContactEditorData.GeneralAddressListGeo, + &ContactEditorData.GeneralAddressListTimezone, + &ContactEditorData.GeneralAddressListType, + &ContactEditorData.GeneralAddressListMediatype, + &ContactEditorData.GeneralAddressListPref, lboAddresses, (intValueSeek)); frameCEAddress->ShowModal(); @@ -137,21 +155,21 @@ void frmContactEditor::ModifyGeneralAddress( wxCommandEvent& event ) } frmContactEditorAddress *frameCEAddress = new frmContactEditorAddress ( this ); - frameCEAddress->SetupPointers(&GeneralAddressList, - &GeneralAddressListTown, - &GeneralAddressListCounty, - &GeneralAddressListPostCode, - &GeneralAddressListCountry, - &GeneralAddressListLabel, - &GeneralAddressListLang, - &GeneralAddressListAltID, - &GeneralAddressListPID, - &GeneralAddressListTokens, - &GeneralAddressListGeo, - &GeneralAddressListTimezone, - &GeneralAddressListType, - &GeneralAddressListMediatype, - &GeneralAddressListPref, + frameCEAddress->SetupPointers(&ContactEditorData.GeneralAddressList, + &ContactEditorData.GeneralAddressListTown, + &ContactEditorData.GeneralAddressListCounty, + &ContactEditorData.GeneralAddressListPostCode, + &ContactEditorData.GeneralAddressListCountry, + &ContactEditorData.GeneralAddressListLabel, + &ContactEditorData.GeneralAddressListLang, + &ContactEditorData.GeneralAddressListAltID, + &ContactEditorData.GeneralAddressListPID, + &ContactEditorData.GeneralAddressListTokens, + &ContactEditorData.GeneralAddressListGeo, + &ContactEditorData.GeneralAddressListTimezone, + &ContactEditorData.GeneralAddressListType, + &ContactEditorData.GeneralAddressListMediatype, + &ContactEditorData.GeneralAddressListPref, lboAddresses, intSelectedData); frameCEAddress->SetEditorMode(TRUE, CE_GENERAL); @@ -175,15 +193,15 @@ void frmContactEditor::DeleteGeneralAddress( wxCommandEvent& event ) lboAddresses->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &GeneralAddressList, - &GeneralAddressListTown, &GeneralAddressListCounty, - &GeneralAddressListPostCode, &GeneralAddressListCountry, - &GeneralAddressList, &GeneralAddressListLabel, - &GeneralAddressListLang, &GeneralAddressListAltID, - &GeneralAddressListPID, &GeneralAddressListTokens, - &GeneralAddressListGeo, &GeneralAddressListTimezone, - &GeneralAddressListType, &GeneralAddressListMediatype, - &GeneralAddressListPref); + DeleteMapData(intSelectedData, &ContactEditorData.GeneralAddressList, + &ContactEditorData.GeneralAddressListTown, &ContactEditorData.GeneralAddressListCounty, + &ContactEditorData.GeneralAddressListPostCode, &ContactEditorData.GeneralAddressListCountry, + &ContactEditorData.GeneralAddressList, &ContactEditorData.GeneralAddressListLabel, + &ContactEditorData.GeneralAddressListLang, &ContactEditorData.GeneralAddressListAltID, + &ContactEditorData.GeneralAddressListPID, &ContactEditorData.GeneralAddressListTokens, + &ContactEditorData.GeneralAddressListGeo, &ContactEditorData.GeneralAddressListTimezone, + &ContactEditorData.GeneralAddressListType, &ContactEditorData.GeneralAddressListMediatype, + &ContactEditorData.GeneralAddressListPref); } @@ -193,13 +211,13 @@ void frmContactEditor::AddGeneralEmail( wxCommandEvent& event ) frmContactEditorEmail *frameCEEmail = new frmContactEditorEmail ( this ); frameCEEmail->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&GeneralAddressList); - frameCEEmail->SetupPointers(&GeneralEmailList, - &GeneralEmailListAltID, - &GeneralEmailListPID, - &GeneralEmailListType, - &GeneralEmailListTokens, - &GeneralEmailListPref, + intResult = GetLastInt(&ContactEditorData.GeneralAddressList); + frameCEEmail->SetupPointers(&ContactEditorData.GeneralEmailList, + &ContactEditorData.GeneralEmailListAltID, + &ContactEditorData.GeneralEmailListPID, + &ContactEditorData.GeneralEmailListType, + &ContactEditorData.GeneralEmailListTokens, + &ContactEditorData.GeneralEmailListPref, lboEmails, (intValueSeek)); frameCEEmail->ShowModal(); @@ -219,12 +237,12 @@ void frmContactEditor::ModifyGeneralEmail( wxCommandEvent& event ) } frmContactEditorEmail *frameCEEmail = new frmContactEditorEmail ( this ); - frameCEEmail->SetupPointers(&GeneralEmailList, - &GeneralEmailListAltID, - &GeneralEmailListPID, - &GeneralEmailListType, - &GeneralEmailListTokens, - &GeneralEmailListPref, + frameCEEmail->SetupPointers(&ContactEditorData.GeneralEmailList, + &ContactEditorData.GeneralEmailListAltID, + &ContactEditorData.GeneralEmailListPID, + &ContactEditorData.GeneralEmailListType, + &ContactEditorData.GeneralEmailListTokens, + &ContactEditorData.GeneralEmailListPref, lboEmails, intSelectedData); frameCEEmail->SetEditorMode(TRUE, CE_GENERAL); @@ -246,10 +264,10 @@ void frmContactEditor::DeleteGeneralEmail( wxCommandEvent& event ) lboEmails->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &GeneralEmailList, - &GeneralEmailListAltID, &GeneralEmailListPID, - &GeneralEmailListType, &GeneralEmailListTokens, - &GeneralEmailListPref); + DeleteMapData(intSelectedData, &ContactEditorData.GeneralEmailList, + &ContactEditorData.GeneralEmailListAltID, &ContactEditorData.GeneralEmailListPID, + &ContactEditorData.GeneralEmailListType, &ContactEditorData.GeneralEmailListTokens, + &ContactEditorData.GeneralEmailListPref); } @@ -259,14 +277,15 @@ void frmContactEditor::AddGeneralIM( wxCommandEvent& event ) frmContactEditorIM *frameCEIM = new frmContactEditorIM ( this ); frameCEIM->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&GeneralIMList); - frameCEIM->SetupPointers(&GeneralIMList, - &GeneralIMListAltID, - &GeneralIMListPID, - &GeneralIMListType, - &GeneralIMListTokens, - &GeneralIMListMediatype, - &GeneralIMListPref, + intResult = GetLastInt(&ContactEditorData.GeneralIMList); + frameCEIM->SetupPointers(&ContactEditorData.GeneralIMList, + &ContactEditorData.GeneralIMListAltID, + &ContactEditorData.GeneralIMListPID, + &ContactEditorData.GeneralIMListType, + &ContactEditorData.GeneralIMListTypeInfo, + &ContactEditorData.GeneralIMListTokens, + &ContactEditorData.GeneralIMListMediatype, + &ContactEditorData.GeneralIMListPref, lboIM, (intValueSeek)); frameCEIM->ShowModal(); @@ -284,15 +303,16 @@ void frmContactEditor::ModifyGeneralIM( wxCommandEvent& event ) &intSelectedData)){ return; } - + frmContactEditorIM *frameCEIM = new frmContactEditorIM ( this ); - frameCEIM->SetupPointers(&GeneralIMList, - &GeneralIMListAltID, - &GeneralIMListPID, - &GeneralIMListType, - &GeneralIMListTokens, - &GeneralIMListMediatype, - &GeneralIMListPref, + frameCEIM->SetupPointers(&ContactEditorData.GeneralIMList, + &ContactEditorData.GeneralIMListAltID, + &ContactEditorData.GeneralIMListPID, + &ContactEditorData.GeneralIMListType, + &ContactEditorData.GeneralIMListTypeInfo, + &ContactEditorData.GeneralIMListTokens, + &ContactEditorData.GeneralIMListMediatype, + &ContactEditorData.GeneralIMListPref, lboIM, intSelectedData); frameCEIM->SetEditorMode(TRUE, CE_GENERAL); @@ -314,10 +334,11 @@ void frmContactEditor::DeleteGeneralIM( wxCommandEvent& event ) lboIM->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &GeneralIMList, - &GeneralIMListAltID, &GeneralIMListPID, - &GeneralIMListType, &GeneralIMListTokens, - &GeneralIMListMediatype, &GeneralIMListPref); + DeleteMapData(intSelectedData, &ContactEditorData.GeneralIMList, + &ContactEditorData.GeneralIMListAltID, &ContactEditorData.GeneralIMListPID, + &ContactEditorData.GeneralIMListType, &ContactEditorData.GeneralIMListTypeInfo, + &ContactEditorData.GeneralIMListTokens, &ContactEditorData.GeneralIMListMediatype, + &ContactEditorData.GeneralIMListPref); } @@ -327,13 +348,14 @@ void frmContactEditor::AddGeneralTelephone( wxCommandEvent& event ) frmContactEditorTelephone *frameCETel = new frmContactEditorTelephone ( this ); frameCETel->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&GeneralTelephoneList); - frameCETel->SetupPointers(&GeneralTelephoneList, - &GeneralTelephoneListAltID, - &GeneralTelephoneListPID, - &GeneralTelephoneListType, - &GeneralTelephoneListTokens, - &GeneralTelephoneListPref, + intResult = GetLastInt(&ContactEditorData.GeneralTelephoneList); + frameCETel->SetupPointers(&ContactEditorData.GeneralTelephoneList, + &ContactEditorData.GeneralTelephoneListAltID, + &ContactEditorData.GeneralTelephoneListPID, + &ContactEditorData.GeneralTelephoneListType, + &ContactEditorData.GeneralTelephoneListTypeInfo, + &ContactEditorData.GeneralTelephoneListTokens, + &ContactEditorData.GeneralTelephoneListPref, lboTelephone, (intValueSeek)); frameCETel->ShowModal(); @@ -353,12 +375,13 @@ void frmContactEditor::ModifyGeneralTelephone( wxCommandEvent& event ) } frmContactEditorTelephone *frameCETel = new frmContactEditorTelephone ( this ); - frameCETel->SetupPointers(&GeneralTelephoneList, - &GeneralTelephoneListAltID, - &GeneralTelephoneListPID, - &GeneralTelephoneListType, - &GeneralTelephoneListTokens, - &GeneralTelephoneListPref, + frameCETel->SetupPointers(&ContactEditorData.GeneralTelephoneList, + &ContactEditorData.GeneralTelephoneListAltID, + &ContactEditorData.GeneralTelephoneListPID, + &ContactEditorData.GeneralTelephoneListType, + &ContactEditorData.GeneralTelephoneListTypeInfo, + &ContactEditorData.GeneralTelephoneListTokens, + &ContactEditorData.GeneralTelephoneListPref, lboTelephone, intSelectedData); frameCETel->SetEditorMode(TRUE, CE_GENERAL); @@ -380,10 +403,10 @@ void frmContactEditor::DeleteGeneralTelephone( wxCommandEvent& event ) lboTelephone->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &GeneralTelephoneList, - &GeneralTelephoneListAltID, &GeneralTelephoneListPID, - &GeneralTelephoneListType, &GeneralTelephoneListTokens, - &GeneralTelephoneListPref); + DeleteMapData(intSelectedData, &ContactEditorData.GeneralTelephoneList, + &ContactEditorData.GeneralTelephoneListAltID, &ContactEditorData.GeneralTelephoneListPID, + &ContactEditorData.GeneralTelephoneListType, &ContactEditorData.GeneralTelephoneListTypeInfo, + &ContactEditorData.GeneralTelephoneListTokens, &ContactEditorData.GeneralTelephoneListPref); } @@ -393,13 +416,13 @@ void frmContactEditor::AddGeneralLanguages( wxCommandEvent& event ) frmContactEditorLanguages *frameCELang = new frmContactEditorLanguages ( this ); frameCELang->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&GeneralLanguageList); - frameCELang->SetupPointers(&GeneralLanguageList, - &GeneralLanguageListAltID, - &GeneralLanguageListPID, - &GeneralLanguageListType, - &GeneralLanguageListTokens, - &GeneralLanguageListPref, + intResult = GetLastInt(&ContactEditorData.GeneralLanguageList); + frameCELang->SetupPointers(&ContactEditorData.GeneralLanguageList, + &ContactEditorData.GeneralLanguageListAltID, + &ContactEditorData.GeneralLanguageListPID, + &ContactEditorData.GeneralLanguageListType, + &ContactEditorData.GeneralLanguageListTokens, + &ContactEditorData.GeneralLanguageListPref, lboLanguages, (intValueSeek)); frameCELang->ShowModal(); @@ -419,12 +442,12 @@ void frmContactEditor::ModifyGeneralLanguages( wxCommandEvent& event ) } frmContactEditorLanguages *frameCELang = new frmContactEditorLanguages ( this ); - frameCELang->SetupPointers(&GeneralLanguageList, - &GeneralLanguageListAltID, - &GeneralLanguageListPID, - &GeneralLanguageListType, - &GeneralLanguageListTokens, - &GeneralLanguageListPref, + frameCELang->SetupPointers(&ContactEditorData.GeneralLanguageList, + &ContactEditorData.GeneralLanguageListAltID, + &ContactEditorData.GeneralLanguageListPID, + &ContactEditorData.GeneralLanguageListType, + &ContactEditorData.GeneralLanguageListTokens, + &ContactEditorData.GeneralLanguageListPref, lboLanguages, intSelectedData); frameCELang->SetEditorMode(TRUE, CE_GENERAL); @@ -446,10 +469,10 @@ void frmContactEditor::DeleteGeneralLanguage( wxCommandEvent& event ) lboLanguages->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &GeneralLanguageList, - &GeneralLanguageListAltID, &GeneralLanguageListPID, - &GeneralLanguageListType, &GeneralLanguageListTokens, - &GeneralLanguageListPref); + DeleteMapData(intSelectedData, &ContactEditorData.GeneralLanguageList, + &ContactEditorData.GeneralLanguageListAltID, &ContactEditorData.GeneralLanguageListPID, + &ContactEditorData.GeneralLanguageListType, &ContactEditorData.GeneralLanguageListTokens, + &ContactEditorData.GeneralLanguageListPref); } @@ -459,14 +482,14 @@ void frmContactEditor::AddGeneralTimezone( wxCommandEvent& event ) frmContactEditorTimezones *frameCETZ = new frmContactEditorTimezones ( this ); frameCETZ->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&GeneralTZList); - frameCETZ->SetupPointers(&GeneralTZList, - &GeneralTZListAltID, - &GeneralTZListPID, - &GeneralTZListType, - &GeneralTZListTokens, - &GeneralTZListMediatype, - &GeneralTZListPref, + intResult = GetLastInt(&ContactEditorData.GeneralTZList); + frameCETZ->SetupPointers(&ContactEditorData.GeneralTZList, + &ContactEditorData.GeneralTZListAltID, + &ContactEditorData.GeneralTZListPID, + &ContactEditorData.GeneralTZListType, + &ContactEditorData.GeneralTZListTokens, + &ContactEditorData.GeneralTZListMediatype, + &ContactEditorData.GeneralTZListPref, lboTimezones, (intValueSeek)); frameCETZ->ShowModal(); @@ -486,13 +509,13 @@ void frmContactEditor::ModifyGeneralTimezone( wxCommandEvent& event ) } frmContactEditorTimezones *frameCETZ = new frmContactEditorTimezones ( this ); - frameCETZ->SetupPointers(&GeneralTZList, - &GeneralTZListAltID, - &GeneralTZListPID, - &GeneralTZListType, - &GeneralTZListTokens, - &GeneralTZListMediatype, - &GeneralTZListPref, + frameCETZ->SetupPointers(&ContactEditorData.GeneralTZList, + &ContactEditorData.GeneralTZListAltID, + &ContactEditorData.GeneralTZListPID, + &ContactEditorData.GeneralTZListType, + &ContactEditorData.GeneralTZListTokens, + &ContactEditorData.GeneralTZListMediatype, + &ContactEditorData.GeneralTZListPref, lboTimezones, intSelectedData); frameCETZ->SetEditorMode(TRUE, CE_GENERAL); @@ -514,10 +537,10 @@ void frmContactEditor::DeleteGeneralTimezone( wxCommandEvent& event ) lboTimezones->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &GeneralTZList, - &GeneralTZListAltID, &GeneralTZListPID, - &GeneralTZListType, &GeneralTZListTokens, - &GeneralTZListMediatype, &GeneralTZListPref); + DeleteMapData(intSelectedData, &ContactEditorData.GeneralTZList, + &ContactEditorData.GeneralTZListAltID, &ContactEditorData.GeneralTZListPID, + &ContactEditorData.GeneralTZListType, &ContactEditorData.GeneralTZListTokens, + &ContactEditorData.GeneralTZListMediatype, &ContactEditorData.GeneralTZListPref); } @@ -527,14 +550,15 @@ void frmContactEditor::AddGeneralGeoposition( wxCommandEvent& event ) frmContactEditorGeoposition *frameCEGeo = new frmContactEditorGeoposition ( this ); frameCEGeo->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&GeneralGeographyList); - frameCEGeo->SetupPointers(&GeneralGeographyList, - &GeneralGeographyListAltID, - &GeneralGeographyListPID, - &GeneralGeographyListType, - &GeneralGeographyListTokens, - &GeneralGeographyListMediatype, - &GeneralGeographyListPref, + intResult = GetLastInt(&ContactEditorData.GeneralGeographyList); + frameCEGeo->SetupPointers(&ContactEditorData.GeneralGeographyList, + &ContactEditorData.GeneralGeographyListAltID, + &ContactEditorData.GeneralGeographyListPID, + &ContactEditorData.GeneralGeographyListType, + &ContactEditorData.GeneralGeographyListDataType, + &ContactEditorData.GeneralGeographyListTokens, + &ContactEditorData.GeneralGeographyListMediatype, + &ContactEditorData.GeneralGeographyListPref, lboGeoposition, (intValueSeek)); frameCEGeo->ShowModal(); @@ -554,13 +578,14 @@ void frmContactEditor::ModifyGeneralGeoposition( wxCommandEvent& event ) } frmContactEditorGeoposition *frameCEGeo = new frmContactEditorGeoposition ( this ); - frameCEGeo->SetupPointers(&GeneralGeographyList, - &GeneralGeographyListAltID, - &GeneralGeographyListPID, - &GeneralGeographyListType, - &GeneralGeographyListTokens, - &GeneralGeographyListMediatype, - &GeneralGeographyListPref, + frameCEGeo->SetupPointers(&ContactEditorData.GeneralGeographyList, + &ContactEditorData.GeneralGeographyListAltID, + &ContactEditorData.GeneralGeographyListPID, + &ContactEditorData.GeneralGeographyListType, + &ContactEditorData.GeneralGeographyListDataType, + &ContactEditorData.GeneralGeographyListTokens, + &ContactEditorData.GeneralGeographyListMediatype, + &ContactEditorData.GeneralGeographyListPref, lboGeoposition, intSelectedData); frameCEGeo->SetEditorMode(TRUE, CE_GENERAL); @@ -582,10 +607,11 @@ void frmContactEditor::DeleteGeneralGeoposition( wxCommandEvent& event ) lboGeoposition->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &GeneralGeographyList, - &GeneralGeographyListAltID, &GeneralGeographyListPID, - &GeneralGeographyListType, &GeneralGeographyListTokens, - &GeneralGeographyListMediatype, &GeneralGeographyListPref); + DeleteMapData(intSelectedData, &ContactEditorData.GeneralGeographyList, + &ContactEditorData.GeneralGeographyListAltID, &ContactEditorData.GeneralGeographyListPID, + &ContactEditorData.GeneralGeographyListType, &ContactEditorData.GeneralGeographyListDataType, + &ContactEditorData.GeneralGeographyListTokens, &ContactEditorData.GeneralGeographyListMediatype, + &ContactEditorData.GeneralGeographyListPref); } @@ -595,14 +621,14 @@ void frmContactEditor::AddGeneralRelated( wxCommandEvent& event ) frmContactEditorRelated *frameCERel = new frmContactEditorRelated ( this ); frameCERel->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&GeneralRelatedList); - frameCERel->SetupPointers(&GeneralRelatedList, - &GeneralRelatedListRelType, - &GeneralRelatedListAltID, - &GeneralRelatedListPID, - &GeneralRelatedListType, - &GeneralRelatedListTokens, - &GeneralRelatedListPref, + intResult = GetLastInt(&ContactEditorData.GeneralRelatedList); + frameCERel->SetupPointers(&ContactEditorData.GeneralRelatedList, + &ContactEditorData.GeneralRelatedListRelType, + &ContactEditorData.GeneralRelatedListAltID, + &ContactEditorData.GeneralRelatedListPID, + &ContactEditorData.GeneralRelatedListType, + &ContactEditorData.GeneralRelatedListTokens, + &ContactEditorData.GeneralRelatedListPref, lboRelated, (intValueSeek)); frameCERel->ShowModal(); @@ -622,13 +648,13 @@ void frmContactEditor::ModifyGeneralRelated( wxCommandEvent& event ) } frmContactEditorRelated *frameCERel = new frmContactEditorRelated ( this ); - frameCERel->SetupPointers(&GeneralRelatedList, - &GeneralRelatedListRelType, - &GeneralRelatedListAltID, - &GeneralRelatedListPID, - &GeneralRelatedListType, - &GeneralRelatedListTokens, - &GeneralRelatedListPref, + frameCERel->SetupPointers(&ContactEditorData.GeneralRelatedList, + &ContactEditorData.GeneralRelatedListRelType, + &ContactEditorData.GeneralRelatedListAltID, + &ContactEditorData.GeneralRelatedListPID, + &ContactEditorData.GeneralRelatedListType, + &ContactEditorData.GeneralRelatedListTokens, + &ContactEditorData.GeneralRelatedListPref, lboRelated, intSelectedData); frameCERel->SetEditorMode(TRUE, CE_GENERAL); @@ -650,13 +676,11 @@ void frmContactEditor::DeleteGeneralRelated( wxCommandEvent& event ) lboRelated->DeleteItem(longSelected); - GeneralRelatedList.erase(intSelectedData); - GeneralRelatedListRelType.erase(intSelectedData); - GeneralRelatedListAltID.erase(intSelectedData); - GeneralRelatedListPID.erase(intSelectedData); - GeneralRelatedListType.erase(intSelectedData); - GeneralRelatedListTokens.erase(intSelectedData); - GeneralRelatedListPref.erase(intSelectedData); + DeleteMapData(intSelectedData, &ContactEditorData.GeneralRelatedList, + &ContactEditorData.GeneralRelatedListRelType, &ContactEditorData.GeneralRelatedListAltID, + &ContactEditorData.GeneralRelatedListPID, &ContactEditorData.GeneralRelatedListType, + &ContactEditorData.GeneralRelatedListTokens, &ContactEditorData.GeneralRelatedListPref); + } void frmContactEditor::AddGeneralWebsite( wxCommandEvent& event ) @@ -665,14 +689,14 @@ void frmContactEditor::AddGeneralWebsite( wxCommandEvent& event ) frmContactEditorWebsites *frameCEWeb = new frmContactEditorWebsites ( this ); frameCEWeb->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&GeneralWebsiteList); - frameCEWeb->SetupPointers(&GeneralWebsiteList, - &GeneralWebsiteListAltID, - &GeneralWebsiteListPID, - &GeneralWebsiteListType, - &GeneralWebsiteListTokens, - &GeneralWebsiteListMediatype, - &GeneralWebsiteListPref, + intResult = GetLastInt(&ContactEditorData.GeneralWebsiteList); + frameCEWeb->SetupPointers(&ContactEditorData.GeneralWebsiteList, + &ContactEditorData.GeneralWebsiteListAltID, + &ContactEditorData.GeneralWebsiteListPID, + &ContactEditorData.GeneralWebsiteListType, + &ContactEditorData.GeneralWebsiteListTokens, + &ContactEditorData.GeneralWebsiteListMediatype, + &ContactEditorData.GeneralWebsiteListPref, lboWebsites, (intValueSeek)); frameCEWeb->ShowModal(); @@ -692,13 +716,13 @@ void frmContactEditor::ModifyGeneralWebsite( wxCommandEvent& event ) } frmContactEditorWebsites *frameCEWeb = new frmContactEditorWebsites ( this ); - frameCEWeb->SetupPointers(&GeneralWebsiteList, - &GeneralWebsiteListAltID, - &GeneralWebsiteListPID, - &GeneralWebsiteListType, - &GeneralWebsiteListTokens, - &GeneralWebsiteListMediatype, - &GeneralWebsiteListPref, + frameCEWeb->SetupPointers(&ContactEditorData.GeneralWebsiteList, + &ContactEditorData.GeneralWebsiteListAltID, + &ContactEditorData.GeneralWebsiteListPID, + &ContactEditorData.GeneralWebsiteListType, + &ContactEditorData.GeneralWebsiteListTokens, + &ContactEditorData.GeneralWebsiteListMediatype, + &ContactEditorData.GeneralWebsiteListPref, lboWebsites, intSelectedData); frameCEWeb->SetEditorMode(TRUE, CE_GENERAL); @@ -720,10 +744,10 @@ void frmContactEditor::DeleteGeneralWebsite( wxCommandEvent& event ) lboWebsites->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &GeneralWebsiteList, - &GeneralWebsiteListAltID, &GeneralWebsiteListPID, - &GeneralWebsiteListType, &GeneralWebsiteListTokens, - &GeneralWebsiteListMediatype, &GeneralWebsiteListPref); + DeleteMapData(intSelectedData, &ContactEditorData.GeneralWebsiteList, + &ContactEditorData.GeneralWebsiteListAltID, &ContactEditorData.GeneralWebsiteListPID, + &ContactEditorData.GeneralWebsiteListType, &ContactEditorData.GeneralWebsiteListTokens, + &ContactEditorData.GeneralWebsiteListMediatype, &ContactEditorData.GeneralWebsiteListPref); } @@ -733,14 +757,14 @@ void frmContactEditor::AddGeneralTitle( wxCommandEvent& event ) frmContactEditorTitles *frameCETitle = new frmContactEditorTitles ( this ); frameCETitle->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&GeneralTitleList); - frameCETitle->SetupPointers(&GeneralTitleList, - &GeneralTitleListLanguage, - &GeneralTitleListAltID, - &GeneralTitleListPID, - &GeneralTitleListType, - &GeneralTitleListTokens, - &GeneralTitleListPref, + intResult = GetLastInt(&ContactEditorData.GeneralTitleList); + frameCETitle->SetupPointers(&ContactEditorData.GeneralTitleList, + &ContactEditorData.GeneralTitleListLanguage, + &ContactEditorData.GeneralTitleListAltID, + &ContactEditorData.GeneralTitleListPID, + &ContactEditorData.GeneralTitleListType, + &ContactEditorData.GeneralTitleListTokens, + &ContactEditorData.GeneralTitleListPref, lboTitles, (intValueSeek)); frameCETitle->ShowModal(); @@ -760,13 +784,13 @@ void frmContactEditor::ModifyGeneralTitle( wxCommandEvent& event ) } frmContactEditorTitles *frameCETitle = new frmContactEditorTitles ( this ); - frameCETitle->SetupPointers(&GeneralTitleList, - &GeneralTitleListLanguage, - &GeneralTitleListAltID, - &GeneralTitleListPID, - &GeneralTitleListType, - &GeneralTitleListTokens, - &GeneralTitleListPref, + frameCETitle->SetupPointers(&ContactEditorData.GeneralTitleList, + &ContactEditorData.GeneralTitleListLanguage, + &ContactEditorData.GeneralTitleListAltID, + &ContactEditorData.GeneralTitleListPID, + &ContactEditorData.GeneralTitleListType, + &ContactEditorData.GeneralTitleListTokens, + &ContactEditorData.GeneralTitleListPref, lboTitles, intSelectedData); frameCETitle->SetEditorMode(TRUE, CE_GENERAL); @@ -788,10 +812,10 @@ void frmContactEditor::DeleteGeneralTitle( wxCommandEvent& event ) lboTitles->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &GeneralTitleList, - &GeneralTitleListLanguage, &GeneralTitleListAltID, - &GeneralTitleListPID, &GeneralTitleListType, - &GeneralTitleListTokens, &GeneralTitleListPref); + DeleteMapData(intSelectedData, &ContactEditorData.GeneralTitleList, + &ContactEditorData.GeneralTitleListLanguage, &ContactEditorData.GeneralTitleListAltID, + &ContactEditorData.GeneralTitleListPID, &ContactEditorData.GeneralTitleListType, + &ContactEditorData.GeneralTitleListTokens, &ContactEditorData.GeneralTitleListPref); } @@ -801,14 +825,14 @@ void frmContactEditor::AddGeneralRole( wxCommandEvent& event ) frmContactEditorRoles *frameCERole = new frmContactEditorRoles ( this ); frameCERole->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&GeneralRoleList); - frameCERole->SetupPointers(&GeneralRoleList, - &GeneralRoleListLanguage, - &GeneralRoleListAltID, - &GeneralRoleListPID, - &GeneralRoleListType, - &GeneralRoleListTokens, - &GeneralRoleListPref, + intResult = GetLastInt(&ContactEditorData.GeneralRoleList); + frameCERole->SetupPointers(&ContactEditorData.GeneralRoleList, + &ContactEditorData.GeneralRoleListLanguage, + &ContactEditorData.GeneralRoleListAltID, + &ContactEditorData.GeneralRoleListPID, + &ContactEditorData.GeneralRoleListType, + &ContactEditorData.GeneralRoleListTokens, + &ContactEditorData.GeneralRoleListPref, lboRoles, (intValueSeek)); frameCERole->ShowModal(); @@ -828,13 +852,13 @@ void frmContactEditor::ModifyGeneralRole( wxCommandEvent& event ) } frmContactEditorRoles *frameCERole = new frmContactEditorRoles ( this ); - frameCERole->SetupPointers(&GeneralRoleList, - &GeneralRoleListLanguage, - &GeneralRoleListAltID, - &GeneralRoleListPID, - &GeneralRoleListType, - &GeneralRoleListTokens, - &GeneralRoleListPref, + frameCERole->SetupPointers(&ContactEditorData.GeneralRoleList, + &ContactEditorData.GeneralRoleListLanguage, + &ContactEditorData.GeneralRoleListAltID, + &ContactEditorData.GeneralRoleListPID, + &ContactEditorData.GeneralRoleListType, + &ContactEditorData.GeneralRoleListTokens, + &ContactEditorData.GeneralRoleListPref, lboRoles, intSelectedData); frameCERole->SetEditorMode(TRUE, CE_GENERAL); @@ -856,10 +880,10 @@ void frmContactEditor::DeleteGeneralRole( wxCommandEvent& event ) lboRoles->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &GeneralRoleList, - &GeneralRoleListLanguage, &GeneralRoleListAltID, - &GeneralRoleListPID, &GeneralRoleListType, - &GeneralRoleListTokens, &GeneralRoleListPref); + DeleteMapData(intSelectedData, &ContactEditorData.GeneralRoleList, + &ContactEditorData.GeneralRoleListLanguage, &ContactEditorData.GeneralRoleListAltID, + &ContactEditorData.GeneralRoleListPID, &ContactEditorData.GeneralRoleListType, + &ContactEditorData.GeneralRoleListTokens, &ContactEditorData.GeneralRoleListPref); } @@ -869,15 +893,15 @@ void frmContactEditor::AddGeneralOrganisation( wxCommandEvent& event ) frmContactEditorOrganisations *frameCEOrg = new frmContactEditorOrganisations ( this ); frameCEOrg->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&GeneralOrganisationsList); - frameCEOrg->SetupPointers(&GeneralOrganisationsList, - &GeneralOrganisationsListLanguage, - &GeneralOrganisationsListSortAs, - &GeneralOrganisationsListAltID, - &GeneralOrganisationsListPID, - &GeneralOrganisationsListType, - &GeneralOrganisationsListTokens, - &GeneralOrganisationsListPref, + intResult = GetLastInt(&ContactEditorData.GeneralOrganisationsList); + frameCEOrg->SetupPointers(&ContactEditorData.GeneralOrganisationsList, + &ContactEditorData.GeneralOrganisationsListLanguage, + &ContactEditorData.GeneralOrganisationsListSortAs, + &ContactEditorData.GeneralOrganisationsListAltID, + &ContactEditorData.GeneralOrganisationsListPID, + &ContactEditorData.GeneralOrganisationsListType, + &ContactEditorData.GeneralOrganisationsListTokens, + &ContactEditorData.GeneralOrganisationsListPref, lboOrganisations, (intValueSeek)); frameCEOrg->ShowModal(); @@ -897,14 +921,14 @@ void frmContactEditor::ModifyGeneralOrganisation( wxCommandEvent& event ) } frmContactEditorOrganisations *frameCEOrg = new frmContactEditorOrganisations ( this ); - frameCEOrg->SetupPointers(&GeneralOrganisationsList, - &GeneralOrganisationsListLanguage, - &GeneralOrganisationsListSortAs, - &GeneralOrganisationsListAltID, - &GeneralOrganisationsListPID, - &GeneralOrganisationsListType, - &GeneralOrganisationsListTokens, - &GeneralOrganisationsListPref, + frameCEOrg->SetupPointers(&ContactEditorData.GeneralOrganisationsList, + &ContactEditorData.GeneralOrganisationsListLanguage, + &ContactEditorData.GeneralOrganisationsListSortAs, + &ContactEditorData.GeneralOrganisationsListAltID, + &ContactEditorData.GeneralOrganisationsListPID, + &ContactEditorData.GeneralOrganisationsListType, + &ContactEditorData.GeneralOrganisationsListTokens, + &ContactEditorData.GeneralOrganisationsListPref, lboOrganisations, intSelectedData); frameCEOrg->SetEditorMode(TRUE, CE_GENERAL); @@ -926,11 +950,11 @@ void frmContactEditor::DeleteGeneralOrganisation( wxCommandEvent& event ) lboOrganisations->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &GeneralOrganisationsList, - &GeneralOrganisationsListLanguage, &GeneralOrganisationsListSortAs, - &GeneralOrganisationsListAltID, &GeneralOrganisationsListPID, - &GeneralOrganisationsListType, &GeneralOrganisationsListTokens, - &GeneralOrganisationsListPref); + DeleteMapData(intSelectedData, &ContactEditorData.GeneralOrganisationsList, + &ContactEditorData.GeneralOrganisationsListLanguage, &ContactEditorData.GeneralOrganisationsListSortAs, + &ContactEditorData.GeneralOrganisationsListAltID, &ContactEditorData.GeneralOrganisationsListPID, + &ContactEditorData.GeneralOrganisationsListType, &ContactEditorData.GeneralOrganisationsListTokens, + &ContactEditorData.GeneralOrganisationsListPref); } @@ -940,14 +964,14 @@ void frmContactEditor::AddGeneralNote( wxCommandEvent& event ) frmContactEditorNotes *frameCENote = new frmContactEditorNotes ( this ); frameCENote->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&GeneralNoteList); - frameCENote->SetupPointers(&GeneralNoteList, - &GeneralNoteListLanguage, - &GeneralNoteListAltID, - &GeneralNoteListPID, - &GeneralNoteListType, - &GeneralNoteListTokens, - &GeneralNoteListPref, + intResult = GetLastInt(&ContactEditorData.GeneralNoteList); + frameCENote->SetupPointers(&ContactEditorData.GeneralNoteList, + &ContactEditorData.GeneralNoteListLanguage, + &ContactEditorData.GeneralNoteListAltID, + &ContactEditorData.GeneralNoteListPID, + &ContactEditorData.GeneralNoteListType, + &ContactEditorData.GeneralNoteListTokens, + &ContactEditorData.GeneralNoteListPref, lboNotes, (intValueSeek)); frameCENote->ShowModal(); @@ -967,13 +991,13 @@ void frmContactEditor::ModifyGeneralNote( wxCommandEvent& event ) } frmContactEditorNotes *frameCENote = new frmContactEditorNotes ( this ); - frameCENote->SetupPointers(&GeneralNoteList, - &GeneralNoteListLanguage, - &GeneralNoteListAltID, - &GeneralNoteListPID, - &GeneralNoteListType, - &GeneralNoteListTokens, - &GeneralNoteListPref, + frameCENote->SetupPointers(&ContactEditorData.GeneralNoteList, + &ContactEditorData.GeneralNoteListLanguage, + &ContactEditorData.GeneralNoteListAltID, + &ContactEditorData.GeneralNoteListPID, + &ContactEditorData.GeneralNoteListType, + &ContactEditorData.GeneralNoteListTokens, + &ContactEditorData.GeneralNoteListPref, lboNotes, intSelectedData); frameCENote->SetEditorMode(TRUE, CE_GENERAL); @@ -995,9 +1019,9 @@ void frmContactEditor::DeleteGeneralNote( wxCommandEvent& event ) lboNotes->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &GeneralNoteList, - &GeneralNoteListLanguage, &GeneralNoteListAltID, - &GeneralNoteListPID, &GeneralNoteListType, - &GeneralNoteListTokens, &GeneralNoteListPref); + DeleteMapData(intSelectedData, &ContactEditorData.GeneralNoteList, + &ContactEditorData.GeneralNoteListLanguage, &ContactEditorData.GeneralNoteListAltID, + &ContactEditorData.GeneralNoteListPID, &ContactEditorData.GeneralNoteListType, + &ContactEditorData.GeneralNoteListTokens, &ContactEditorData.GeneralNoteListPref); }