From 93897f7025c7ba2f1fb06f072d0eeb41662a46b2 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Fri, 1 Jan 2016 13:56:57 +0000 Subject: [PATCH] All items in the Business tab of the contact editor now use ContactDataObject. --- .../frmContactEditor-Business.cpp | 534 +++++++++--------- 1 file changed, 267 insertions(+), 267 deletions(-) diff --git a/source/contacteditor/frmContactEditor-Business.cpp b/source/contacteditor/frmContactEditor-Business.cpp index 1ad5f8e..81ce5cd 100644 --- a/source/contacteditor/frmContactEditor-Business.cpp +++ b/source/contacteditor/frmContactEditor-Business.cpp @@ -1,6 +1,6 @@ // frmContactEditorBusiness.cpp - frmContactEditor Business tab subroutines. // -// (c) 2012-2015 Xestia Software Development. +// (c) 2012-2016 Xestia Software Development. // // This file is part of Xestia Address Book. // @@ -39,14 +39,14 @@ void frmContactEditor::AddBusinessNickname( wxCommandEvent& event ) frmContactEditorNickname *frameCENickname = new frmContactEditorNickname ( this ); frameCENickname->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&BusinessNicknamesList); - frameCENickname->SetupPointers(&BusinessNicknamesList, - &BusinessNicknamesListAltID, - &BusinessNicknamesListPID, - &BusinessNicknamesListType, - &BusinessNicknamesListLanguage, - &BusinessNicknamesListTokens, - &BusinessNicknamesListPref, + intResult = GetLastInt(&ContactEditorData.BusinessNicknamesList); + frameCENickname->SetupPointers(&ContactEditorData.BusinessNicknamesList, + &ContactEditorData.BusinessNicknamesListAltID, + &ContactEditorData.BusinessNicknamesListPID, + &ContactEditorData.BusinessNicknamesListType, + &ContactEditorData.BusinessNicknamesListLanguage, + &ContactEditorData.BusinessNicknamesListTokens, + &ContactEditorData.BusinessNicknamesListPref, lboBusinessNicknames, (intValueSeek)); frameCENickname->ShowModal(); @@ -66,13 +66,13 @@ void frmContactEditor::ModifyBusinessNickname( wxCommandEvent& event ) } frmContactEditorNickname *frameCENickname = new frmContactEditorNickname ( this ); - frameCENickname->SetupPointers(&BusinessNicknamesList, - &BusinessNicknamesListAltID, - &BusinessNicknamesListPID, - &BusinessNicknamesListType, - &BusinessNicknamesListLanguage, - &BusinessNicknamesListTokens, - &BusinessNicknamesListPref, + frameCENickname->SetupPointers(&ContactEditorData.BusinessNicknamesList, + &ContactEditorData.BusinessNicknamesListAltID, + &ContactEditorData.BusinessNicknamesListPID, + &ContactEditorData.BusinessNicknamesListType, + &ContactEditorData.BusinessNicknamesListLanguage, + &ContactEditorData.BusinessNicknamesListTokens, + &ContactEditorData.BusinessNicknamesListPref, lboBusinessNicknames, intSelectedData); frameCENickname->SetEditorMode(TRUE, CE_WORK); @@ -95,13 +95,13 @@ void frmContactEditor::DeleteBusinessNickname( wxCommandEvent& event ) lboBusinessNicknames->DeleteItem(longSelected); DeleteMapData(intSelectedData, - &BusinessNicknamesList, - &BusinessNicknamesListLanguage, - &BusinessNicknamesListAltID, - &BusinessNicknamesListPID, - &BusinessNicknamesListTokens, - &BusinessNicknamesListType, - &BusinessNicknamesListPref); + &ContactEditorData.BusinessNicknamesList, + &ContactEditorData.BusinessNicknamesListLanguage, + &ContactEditorData.BusinessNicknamesListAltID, + &ContactEditorData.BusinessNicknamesListPID, + &ContactEditorData.BusinessNicknamesListTokens, + &ContactEditorData.BusinessNicknamesListType, + &ContactEditorData.BusinessNicknamesListPref); } void frmContactEditor::AddBusinessAddress( wxCommandEvent& event ) @@ -110,22 +110,22 @@ void frmContactEditor::AddBusinessAddress( wxCommandEvent& event ) frmContactEditorAddress *frameCEAddress = new frmContactEditorAddress ( this ); frameCEAddress->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&BusinessAddressList); - frameCEAddress->SetupPointers(&BusinessAddressList, - &BusinessAddressListTown, - &BusinessAddressListCounty, - &BusinessAddressListPostCode, - &BusinessAddressListCountry, - &BusinessAddressListLabel, - &BusinessAddressListLang, - &BusinessAddressListAltID, - &BusinessAddressListPID, - &BusinessAddressListTokens, - &BusinessAddressListGeo, - &BusinessAddressListTimezone, - &BusinessAddressListType, - &BusinessAddressListMediatype, - &BusinessAddressListPref, + intResult = GetLastInt(&ContactEditorData.BusinessAddressList); + frameCEAddress->SetupPointers(&ContactEditorData.BusinessAddressList, + &ContactEditorData.BusinessAddressListTown, + &ContactEditorData.BusinessAddressListCounty, + &ContactEditorData.BusinessAddressListPostCode, + &ContactEditorData.BusinessAddressListCountry, + &ContactEditorData.BusinessAddressListLabel, + &ContactEditorData.BusinessAddressListLang, + &ContactEditorData.BusinessAddressListAltID, + &ContactEditorData.BusinessAddressListPID, + &ContactEditorData.BusinessAddressListTokens, + &ContactEditorData.BusinessAddressListGeo, + &ContactEditorData.BusinessAddressListTimezone, + &ContactEditorData.BusinessAddressListType, + &ContactEditorData.BusinessAddressListMediatype, + &ContactEditorData.BusinessAddressListPref, lboBusinessAddresses, (intValueSeek)); frameCEAddress->ShowModal(); @@ -145,21 +145,21 @@ void frmContactEditor::ModifyBusinessAddress( wxCommandEvent& event ) } frmContactEditorAddress *frameCEAddress = new frmContactEditorAddress ( this ); - frameCEAddress->SetupPointers(&BusinessAddressList, - &BusinessAddressListTown, - &BusinessAddressListCounty, - &BusinessAddressListPostCode, - &BusinessAddressListCountry, - &BusinessAddressListLabel, - &BusinessAddressListLang, - &BusinessAddressListAltID, - &BusinessAddressListPID, - &BusinessAddressListTokens, - &BusinessAddressListGeo, - &BusinessAddressListTimezone, - &BusinessAddressListType, - &BusinessAddressListMediatype, - &BusinessAddressListPref, + frameCEAddress->SetupPointers(&ContactEditorData.BusinessAddressList, + &ContactEditorData.BusinessAddressListTown, + &ContactEditorData.BusinessAddressListCounty, + &ContactEditorData.BusinessAddressListPostCode, + &ContactEditorData.BusinessAddressListCountry, + &ContactEditorData.BusinessAddressListLabel, + &ContactEditorData.BusinessAddressListLang, + &ContactEditorData.BusinessAddressListAltID, + &ContactEditorData.BusinessAddressListPID, + &ContactEditorData.BusinessAddressListTokens, + &ContactEditorData.BusinessAddressListGeo, + &ContactEditorData.BusinessAddressListTimezone, + &ContactEditorData.BusinessAddressListType, + &ContactEditorData.BusinessAddressListMediatype, + &ContactEditorData.BusinessAddressListPref, lboBusinessAddresses, intSelectedData); frameCEAddress->SetEditorMode(TRUE, CE_WORK); @@ -180,15 +180,15 @@ void frmContactEditor::DeleteBusinessAddress( wxCommandEvent& event ) } lboBusinessAddresses->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &BusinessAddressList, - &BusinessAddressListTown, &BusinessAddressListCounty, - &BusinessAddressListPostCode, &BusinessAddressListCountry, - &BusinessAddressList, &BusinessAddressListLabel, - &BusinessAddressListLang, &BusinessAddressListAltID, - &BusinessAddressListPID, &BusinessAddressListTokens, - &BusinessAddressListGeo, &BusinessAddressListTimezone, - &BusinessAddressListType, &BusinessAddressListMediatype, - &BusinessAddressListPref); + DeleteMapData(intSelectedData, &ContactEditorData.BusinessAddressList, + &ContactEditorData.BusinessAddressListTown, &ContactEditorData.BusinessAddressListCounty, + &ContactEditorData.BusinessAddressListPostCode, &ContactEditorData.BusinessAddressListCountry, + &ContactEditorData.BusinessAddressList, &ContactEditorData.BusinessAddressListLabel, + &ContactEditorData.BusinessAddressListLang, &ContactEditorData.BusinessAddressListAltID, + &ContactEditorData.BusinessAddressListPID, &ContactEditorData.BusinessAddressListTokens, + &ContactEditorData.BusinessAddressListGeo, &ContactEditorData.BusinessAddressListTimezone, + &ContactEditorData.BusinessAddressListType, &ContactEditorData.BusinessAddressListMediatype, + &ContactEditorData.BusinessAddressListPref); } @@ -198,13 +198,13 @@ void frmContactEditor::AddBusinessEmail( wxCommandEvent& event ) frmContactEditorEmail *frameCEEmail = new frmContactEditorEmail ( this ); frameCEEmail->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&BusinessAddressList); - frameCEEmail->SetupPointers(&BusinessEmailList, - &BusinessEmailListAltID, - &BusinessEmailListPID, - &BusinessEmailListType, - &BusinessEmailListTokens, - &BusinessEmailListPref, + intResult = GetLastInt(&ContactEditorData.BusinessAddressList); + frameCEEmail->SetupPointers(&ContactEditorData.BusinessEmailList, + &ContactEditorData.BusinessEmailListAltID, + &ContactEditorData.BusinessEmailListPID, + &ContactEditorData.BusinessEmailListType, + &ContactEditorData.BusinessEmailListTokens, + &ContactEditorData.BusinessEmailListPref, lboBusinessEmail, (intValueSeek)); frameCEEmail->ShowModal(); @@ -224,12 +224,12 @@ void frmContactEditor::ModifyBusinessEmail( wxCommandEvent& event ) } frmContactEditorEmail *frameCEEmail = new frmContactEditorEmail ( this ); - frameCEEmail->SetupPointers(&BusinessEmailList, - &BusinessEmailListAltID, - &BusinessEmailListPID, - &BusinessEmailListType, - &BusinessEmailListTokens, - &BusinessEmailListPref, + frameCEEmail->SetupPointers(&ContactEditorData.BusinessEmailList, + &ContactEditorData.BusinessEmailListAltID, + &ContactEditorData.BusinessEmailListPID, + &ContactEditorData.BusinessEmailListType, + &ContactEditorData.BusinessEmailListTokens, + &ContactEditorData.BusinessEmailListPref, lboBusinessEmail, intSelectedData); frameCEEmail->SetEditorMode(TRUE, CE_WORK); @@ -251,10 +251,10 @@ void frmContactEditor::DeleteBusinessEmail( wxCommandEvent& event ) lboBusinessEmail->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &BusinessEmailList, - &BusinessEmailListAltID, &BusinessEmailListPID, - &BusinessEmailListType, &BusinessEmailListTokens, - &BusinessEmailListPref); + DeleteMapData(intSelectedData, &ContactEditorData.BusinessEmailList, + &ContactEditorData.BusinessEmailListAltID, &ContactEditorData.BusinessEmailListPID, + &ContactEditorData.BusinessEmailListType, &ContactEditorData.BusinessEmailListTokens, + &ContactEditorData.BusinessEmailListPref); } @@ -264,14 +264,14 @@ void frmContactEditor::AddBusinessIM( wxCommandEvent& event ) frmContactEditorIM *frameCEIM = new frmContactEditorIM ( this ); frameCEIM->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&BusinessIMList); - frameCEIM->SetupPointers(&BusinessIMList, - &BusinessIMListAltID, - &BusinessIMListPID, - &BusinessIMListType, - &BusinessIMListTokens, - &BusinessIMListMediatype, - &BusinessIMListPref, + intResult = GetLastInt(&ContactEditorData.BusinessIMList); + frameCEIM->SetupPointers(&ContactEditorData.BusinessIMList, + &ContactEditorData.BusinessIMListAltID, + &ContactEditorData.BusinessIMListPID, + &ContactEditorData.BusinessIMListType, + &ContactEditorData.BusinessIMListTokens, + &ContactEditorData.BusinessIMListMediatype, + &ContactEditorData.BusinessIMListPref, lboBusinessIM, (intValueSeek)); frameCEIM->ShowModal(); @@ -291,13 +291,13 @@ void frmContactEditor::ModifyBusinessIM( wxCommandEvent& event ) } frmContactEditorIM *frameCEIM = new frmContactEditorIM ( this ); - frameCEIM->SetupPointers(&BusinessIMList, - &BusinessIMListAltID, - &BusinessIMListPID, - &BusinessIMListType, - &BusinessIMListTokens, - &BusinessIMListMediatype, - &BusinessIMListPref, + frameCEIM->SetupPointers(&ContactEditorData.BusinessIMList, + &ContactEditorData.BusinessIMListAltID, + &ContactEditorData.BusinessIMListPID, + &ContactEditorData.BusinessIMListType, + &ContactEditorData.BusinessIMListTokens, + &ContactEditorData.BusinessIMListMediatype, + &ContactEditorData.BusinessIMListPref, lboBusinessIM, intSelectedData); frameCEIM->SetEditorMode(TRUE, CE_WORK); @@ -319,10 +319,10 @@ void frmContactEditor::DeleteBusinessIM( wxCommandEvent& event ) lboBusinessIM->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &BusinessIMList, - &BusinessIMListAltID, &BusinessIMListPID, - &BusinessIMListType, &BusinessIMListTokens, - &BusinessIMListMediatype, &BusinessIMListPref); + DeleteMapData(intSelectedData, &ContactEditorData.BusinessIMList, + &ContactEditorData.BusinessIMListAltID, &ContactEditorData.BusinessIMListPID, + &ContactEditorData.BusinessIMListType, &ContactEditorData.BusinessIMListTokens, + &ContactEditorData.BusinessIMListMediatype, &ContactEditorData.BusinessIMListPref); } @@ -332,13 +332,13 @@ void frmContactEditor::AddBusinessTelephone( wxCommandEvent& event ) frmContactEditorTelephone *frameCETel = new frmContactEditorTelephone ( this ); frameCETel->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&BusinessTelephoneList); - frameCETel->SetupPointers(&BusinessTelephoneList, - &BusinessTelephoneListAltID, - &BusinessTelephoneListPID, - &BusinessTelephoneListType, - &BusinessTelephoneListTokens, - &BusinessTelephoneListPref, + intResult = GetLastInt(&ContactEditorData.BusinessTelephoneList); + frameCETel->SetupPointers(&ContactEditorData.BusinessTelephoneList, + &ContactEditorData.BusinessTelephoneListAltID, + &ContactEditorData.BusinessTelephoneListPID, + &ContactEditorData.BusinessTelephoneListType, + &ContactEditorData.BusinessTelephoneListTokens, + &ContactEditorData.BusinessTelephoneListPref, lboBusinessTelephone, (intValueSeek)); frameCETel->ShowModal(); @@ -358,12 +358,12 @@ void frmContactEditor::ModifyBusinessTelephone( wxCommandEvent& event ) } frmContactEditorTelephone *frameCETel = new frmContactEditorTelephone ( this ); - frameCETel->SetupPointers(&BusinessTelephoneList, - &BusinessTelephoneListAltID, - &BusinessTelephoneListPID, - &BusinessTelephoneListType, - &BusinessTelephoneListTokens, - &BusinessTelephoneListPref, + frameCETel->SetupPointers(&ContactEditorData.BusinessTelephoneList, + &ContactEditorData.BusinessTelephoneListAltID, + &ContactEditorData.BusinessTelephoneListPID, + &ContactEditorData.BusinessTelephoneListType, + &ContactEditorData.BusinessTelephoneListTokens, + &ContactEditorData.BusinessTelephoneListPref, lboBusinessTelephone, intSelectedData); frameCETel->SetEditorMode(TRUE, CE_WORK); @@ -385,10 +385,10 @@ void frmContactEditor::DeleteBusinessTelephone( wxCommandEvent& event ) lboBusinessTelephone->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &BusinessTelephoneList, - &BusinessTelephoneListAltID, &BusinessTelephoneListPID, - &BusinessTelephoneListType, &BusinessTelephoneListTokens, - &BusinessTelephoneListPref); + DeleteMapData(intSelectedData, &ContactEditorData.BusinessTelephoneList, + &ContactEditorData.BusinessTelephoneListAltID, &ContactEditorData.BusinessTelephoneListPID, + &ContactEditorData.BusinessTelephoneListType, &ContactEditorData.BusinessTelephoneListTokens, + &ContactEditorData.BusinessTelephoneListPref); } @@ -398,13 +398,13 @@ void frmContactEditor::AddBusinessLanguage( wxCommandEvent& event ) frmContactEditorLanguages *frameCELang = new frmContactEditorLanguages ( this ); frameCELang->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&BusinessLanguageList); - frameCELang->SetupPointers(&BusinessLanguageList, - &BusinessLanguageListAltID, - &BusinessLanguageListPID, - &BusinessLanguageListType, - &BusinessLanguageListTokens, - &BusinessLanguageListPref, + intResult = GetLastInt(&ContactEditorData.BusinessLanguageList); + frameCELang->SetupPointers(&ContactEditorData.BusinessLanguageList, + &ContactEditorData.BusinessLanguageListAltID, + &ContactEditorData.BusinessLanguageListPID, + &ContactEditorData.BusinessLanguageListType, + &ContactEditorData.BusinessLanguageListTokens, + &ContactEditorData.BusinessLanguageListPref, lboBusinessLanguages, (intValueSeek)); frameCELang->ShowModal(); @@ -424,12 +424,12 @@ void frmContactEditor::ModifyBusinessLanguage( wxCommandEvent& event ) } frmContactEditorLanguages *frameCELang = new frmContactEditorLanguages ( this ); - frameCELang->SetupPointers(&BusinessLanguageList, - &BusinessLanguageListAltID, - &BusinessLanguageListPID, - &BusinessLanguageListType, - &BusinessLanguageListTokens, - &BusinessLanguageListPref, + frameCELang->SetupPointers(&ContactEditorData.BusinessLanguageList, + &ContactEditorData.BusinessLanguageListAltID, + &ContactEditorData.BusinessLanguageListPID, + &ContactEditorData.BusinessLanguageListType, + &ContactEditorData.BusinessLanguageListTokens, + &ContactEditorData.BusinessLanguageListPref, lboBusinessLanguages, intSelectedData); frameCELang->SetEditorMode(TRUE, CE_WORK); @@ -451,10 +451,10 @@ void frmContactEditor::DeleteBusinessLanguage( wxCommandEvent& event ) lboBusinessLanguages->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &BusinessLanguageList, - &BusinessLanguageListAltID, &BusinessLanguageListPID, - &BusinessLanguageListType, &BusinessLanguageListTokens, - &BusinessLanguageListPref); + DeleteMapData(intSelectedData, &ContactEditorData.BusinessLanguageList, + &ContactEditorData.BusinessLanguageListAltID, &ContactEditorData.BusinessLanguageListPID, + &ContactEditorData.BusinessLanguageListType, &ContactEditorData.BusinessLanguageListTokens, + &ContactEditorData.BusinessLanguageListPref); } @@ -464,14 +464,14 @@ void frmContactEditor::AddBusinessTimezone( wxCommandEvent& event ) frmContactEditorTimezones *frameCETZ = new frmContactEditorTimezones ( this ); frameCETZ->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&BusinessTZList); - frameCETZ->SetupPointers(&BusinessTZList, - &BusinessTZListAltID, - &BusinessTZListPID, - &BusinessTZListType, - &BusinessTZListTokens, - &BusinessTZListMediatype, - &BusinessTZListPref, + intResult = GetLastInt(&ContactEditorData.BusinessTZList); + frameCETZ->SetupPointers(&ContactEditorData.BusinessTZList, + &ContactEditorData.BusinessTZListAltID, + &ContactEditorData.BusinessTZListPID, + &ContactEditorData.BusinessTZListType, + &ContactEditorData.BusinessTZListTokens, + &ContactEditorData.BusinessTZListMediatype, + &ContactEditorData.BusinessTZListPref, lboBusinessTimezones, (intValueSeek)); frameCETZ->ShowModal(); @@ -491,13 +491,13 @@ void frmContactEditor::ModifyBusinessTimezone( wxCommandEvent& event ) } frmContactEditorTimezones *frameCETZ = new frmContactEditorTimezones ( this ); - frameCETZ->SetupPointers(&BusinessTZList, - &BusinessTZListAltID, - &BusinessTZListPID, - &BusinessTZListType, - &BusinessTZListTokens, - &BusinessTZListMediatype, - &BusinessTZListPref, + frameCETZ->SetupPointers(&ContactEditorData.BusinessTZList, + &ContactEditorData.BusinessTZListAltID, + &ContactEditorData.BusinessTZListPID, + &ContactEditorData.BusinessTZListType, + &ContactEditorData.BusinessTZListTokens, + &ContactEditorData.BusinessTZListMediatype, + &ContactEditorData.BusinessTZListPref, lboBusinessTimezones, intSelectedData); frameCETZ->SetEditorMode(TRUE, CE_WORK); @@ -519,10 +519,10 @@ void frmContactEditor::DeleteBusinessTimezone( wxCommandEvent& event ) lboBusinessTimezones->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &BusinessTZList, - &BusinessTZListAltID, &BusinessTZListPID, - &BusinessTZListType, &BusinessTZListTokens, - &BusinessTZListMediatype, &BusinessTZListPref); + DeleteMapData(intSelectedData, &ContactEditorData.BusinessTZList, + &ContactEditorData.BusinessTZListAltID, &ContactEditorData.BusinessTZListPID, + &ContactEditorData.BusinessTZListType, &ContactEditorData.BusinessTZListTokens, + &ContactEditorData.BusinessTZListMediatype, &ContactEditorData.BusinessTZListPref); } @@ -532,14 +532,14 @@ void frmContactEditor::AddBusinessGeoposition( wxCommandEvent& event ) frmContactEditorGeoposition *frameCEGeo = new frmContactEditorGeoposition ( this ); frameCEGeo->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&BusinessGeographyList); - frameCEGeo->SetupPointers(&BusinessGeographyList, - &BusinessGeographyListAltID, - &BusinessGeographyListPID, - &BusinessGeographyListType, - &BusinessGeographyListTokens, - &BusinessGeographyListMediatype, - &BusinessGeographyListPref, + intResult = GetLastInt(&ContactEditorData.BusinessGeographyList); + frameCEGeo->SetupPointers(&ContactEditorData.BusinessGeographyList, + &ContactEditorData.BusinessGeographyListAltID, + &ContactEditorData.BusinessGeographyListPID, + &ContactEditorData.BusinessGeographyListType, + &ContactEditorData.BusinessGeographyListTokens, + &ContactEditorData.BusinessGeographyListMediatype, + &ContactEditorData.BusinessGeographyListPref, lboBusinessGeoposition, (intValueSeek)); frameCEGeo->ShowModal(); @@ -559,13 +559,13 @@ void frmContactEditor::ModifyBusinessGeoposition( wxCommandEvent& event ) } frmContactEditorGeoposition *frameCEGeo = new frmContactEditorGeoposition ( this ); - frameCEGeo->SetupPointers(&BusinessGeographyList, - &BusinessGeographyListAltID, - &BusinessGeographyListPID, - &BusinessGeographyListType, - &BusinessGeographyListTokens, - &BusinessGeographyListMediatype, - &BusinessGeographyListPref, + frameCEGeo->SetupPointers(&ContactEditorData.BusinessGeographyList, + &ContactEditorData.BusinessGeographyListAltID, + &ContactEditorData.BusinessGeographyListPID, + &ContactEditorData.BusinessGeographyListType, + &ContactEditorData.BusinessGeographyListTokens, + &ContactEditorData.BusinessGeographyListMediatype, + &ContactEditorData.BusinessGeographyListPref, lboBusinessGeoposition, intSelectedData); frameCEGeo->SetEditorMode(TRUE, CE_WORK); @@ -587,10 +587,10 @@ void frmContactEditor::DeleteBusinessGeoposition( wxCommandEvent& event ) lboBusinessGeoposition->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &BusinessGeographyList, - &BusinessGeographyListAltID, &BusinessGeographyListPID, - &BusinessGeographyListType, &BusinessGeographyListTokens, - &BusinessGeographyListMediatype, &BusinessGeographyListPref); + DeleteMapData(intSelectedData, &ContactEditorData.BusinessGeographyList, + &ContactEditorData.BusinessGeographyListAltID, &ContactEditorData.BusinessGeographyListPID, + &ContactEditorData.BusinessGeographyListType, &ContactEditorData.BusinessGeographyListTokens, + &ContactEditorData.BusinessGeographyListMediatype, &ContactEditorData.BusinessGeographyListPref); } @@ -600,14 +600,14 @@ void frmContactEditor::AddBusinessWebsite( wxCommandEvent& event ) frmContactEditorWebsites *frameCEWeb = new frmContactEditorWebsites ( this ); frameCEWeb->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&BusinessWebsiteList); - frameCEWeb->SetupPointers(&BusinessWebsiteList, - &BusinessWebsiteListAltID, - &BusinessWebsiteListPID, - &BusinessWebsiteListType, - &BusinessWebsiteListTokens, - &BusinessWebsiteListMediatype, - &BusinessWebsiteListPref, + intResult = GetLastInt(&ContactEditorData.BusinessWebsiteList); + frameCEWeb->SetupPointers(&ContactEditorData.BusinessWebsiteList, + &ContactEditorData.BusinessWebsiteListAltID, + &ContactEditorData.BusinessWebsiteListPID, + &ContactEditorData.BusinessWebsiteListType, + &ContactEditorData.BusinessWebsiteListTokens, + &ContactEditorData.BusinessWebsiteListMediatype, + &ContactEditorData.BusinessWebsiteListPref, lboBusinessWebsites, (intValueSeek)); frameCEWeb->ShowModal(); @@ -627,13 +627,13 @@ void frmContactEditor::ModifyBusinessWebsite( wxCommandEvent& event ) } frmContactEditorWebsites *frameCEWeb = new frmContactEditorWebsites ( this ); - frameCEWeb->SetupPointers(&BusinessWebsiteList, - &BusinessWebsiteListAltID, - &BusinessWebsiteListPID, - &BusinessWebsiteListType, - &BusinessWebsiteListTokens, - &BusinessWebsiteListMediatype, - &BusinessWebsiteListPref, + frameCEWeb->SetupPointers(&ContactEditorData.BusinessWebsiteList, + &ContactEditorData.BusinessWebsiteListAltID, + &ContactEditorData.BusinessWebsiteListPID, + &ContactEditorData.BusinessWebsiteListType, + &ContactEditorData.BusinessWebsiteListTokens, + &ContactEditorData.BusinessWebsiteListMediatype, + &ContactEditorData.BusinessWebsiteListPref, lboBusinessWebsites, intSelectedData); frameCEWeb->SetEditorMode(TRUE, CE_WORK); @@ -655,10 +655,10 @@ void frmContactEditor::DeleteBusinessWebsite( wxCommandEvent& event ) lboBusinessWebsites->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &BusinessWebsiteList, - &BusinessWebsiteListAltID, &BusinessWebsiteListPID, - &BusinessWebsiteListType, &BusinessWebsiteListTokens, - &BusinessWebsiteListMediatype, &BusinessWebsiteListPref); + DeleteMapData(intSelectedData, &ContactEditorData.BusinessWebsiteList, + &ContactEditorData.BusinessWebsiteListAltID, &ContactEditorData.BusinessWebsiteListPID, + &ContactEditorData.BusinessWebsiteListType, &ContactEditorData.BusinessWebsiteListTokens, + &ContactEditorData.BusinessWebsiteListMediatype, &ContactEditorData.BusinessWebsiteListPref); } @@ -668,14 +668,14 @@ void frmContactEditor::AddBusinessTitle( wxCommandEvent& event ) frmContactEditorTitles *frameCETitle = new frmContactEditorTitles ( this ); frameCETitle->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&BusinessTitleList); - frameCETitle->SetupPointers(&BusinessTitleList, - &BusinessTitleListLanguage, - &BusinessTitleListAltID, - &BusinessTitleListPID, - &BusinessTitleListType, - &BusinessTitleListTokens, - &BusinessTitleListPref, + intResult = GetLastInt(&ContactEditorData.BusinessTitleList); + frameCETitle->SetupPointers(&ContactEditorData.BusinessTitleList, + &ContactEditorData.BusinessTitleListLanguage, + &ContactEditorData.BusinessTitleListAltID, + &ContactEditorData.BusinessTitleListPID, + &ContactEditorData.BusinessTitleListType, + &ContactEditorData.BusinessTitleListTokens, + &ContactEditorData.BusinessTitleListPref, lboBusinessTitles, (intValueSeek)); frameCETitle->ShowModal(); @@ -695,13 +695,13 @@ void frmContactEditor::ModifyBusinessTitle( wxCommandEvent& event ) } frmContactEditorTitles *frameCETitle = new frmContactEditorTitles ( this ); - frameCETitle->SetupPointers(&BusinessTitleList, - &BusinessTitleListLanguage, - &BusinessTitleListAltID, - &BusinessTitleListPID, - &BusinessTitleListType, - &BusinessTitleListTokens, - &BusinessTitleListPref, + frameCETitle->SetupPointers(&ContactEditorData.BusinessTitleList, + &ContactEditorData.BusinessTitleListLanguage, + &ContactEditorData.BusinessTitleListAltID, + &ContactEditorData.BusinessTitleListPID, + &ContactEditorData.BusinessTitleListType, + &ContactEditorData.BusinessTitleListTokens, + &ContactEditorData.BusinessTitleListPref, lboBusinessTitles, intSelectedData); frameCETitle->SetEditorMode(TRUE, CE_WORK); @@ -723,10 +723,10 @@ void frmContactEditor::DeleteBusinessTitle( wxCommandEvent& event ) lboTitles->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &BusinessTitleList, - &BusinessTitleListLanguage, &BusinessTitleListAltID, - &BusinessTitleListPID, &BusinessTitleListType, - &BusinessTitleListTokens, &BusinessTitleListPref); + DeleteMapData(intSelectedData, &ContactEditorData.BusinessTitleList, + &ContactEditorData.BusinessTitleListLanguage, &ContactEditorData.BusinessTitleListAltID, + &ContactEditorData.BusinessTitleListPID, &ContactEditorData.BusinessTitleListType, + &ContactEditorData.BusinessTitleListTokens, &ContactEditorData.BusinessTitleListPref); } @@ -736,14 +736,14 @@ void frmContactEditor::AddBusinessRole( wxCommandEvent& event ) frmContactEditorRoles *frameCERole = new frmContactEditorRoles ( this ); frameCERole->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&BusinessRoleList); - frameCERole->SetupPointers(&BusinessRoleList, - &BusinessRoleListLanguage, - &BusinessRoleListAltID, - &BusinessRoleListPID, - &BusinessRoleListType, - &BusinessRoleListTokens, - &BusinessRoleListPref, + intResult = GetLastInt(&ContactEditorData.BusinessRoleList); + frameCERole->SetupPointers(&ContactEditorData.BusinessRoleList, + &ContactEditorData.BusinessRoleListLanguage, + &ContactEditorData.BusinessRoleListAltID, + &ContactEditorData.BusinessRoleListPID, + &ContactEditorData.BusinessRoleListType, + &ContactEditorData.BusinessRoleListTokens, + &ContactEditorData.BusinessRoleListPref, lboBusinessRoles, (intValueSeek)); frameCERole->ShowModal(); @@ -763,13 +763,13 @@ void frmContactEditor::ModifyBusinessRole( wxCommandEvent& event ) } frmContactEditorRoles *frameCERole = new frmContactEditorRoles ( this ); - frameCERole->SetupPointers(&BusinessRoleList, - &BusinessRoleListLanguage, - &BusinessRoleListAltID, - &BusinessRoleListPID, - &BusinessRoleListType, - &BusinessRoleListTokens, - &BusinessRoleListPref, + frameCERole->SetupPointers(&ContactEditorData.BusinessRoleList, + &ContactEditorData.BusinessRoleListLanguage, + &ContactEditorData.BusinessRoleListAltID, + &ContactEditorData.BusinessRoleListPID, + &ContactEditorData.BusinessRoleListType, + &ContactEditorData.BusinessRoleListTokens, + &ContactEditorData.BusinessRoleListPref, lboBusinessRoles, intSelectedData); frameCERole->SetEditorMode(TRUE, CE_WORK); @@ -791,10 +791,10 @@ void frmContactEditor::DeleteBusinessRole( wxCommandEvent& event ) lboBusinessRoles->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &BusinessRoleList, - &BusinessRoleListLanguage, &BusinessRoleListAltID, - &BusinessRoleListPID, &BusinessRoleListType, - &BusinessRoleListTokens, &BusinessRoleListPref); + DeleteMapData(intSelectedData, &ContactEditorData.BusinessRoleList, + &ContactEditorData.BusinessRoleListLanguage, &ContactEditorData.BusinessRoleListAltID, + &ContactEditorData.BusinessRoleListPID, &ContactEditorData.BusinessRoleListType, + &ContactEditorData.BusinessRoleListTokens, &ContactEditorData.BusinessRoleListPref); } @@ -806,13 +806,13 @@ void frmContactEditor::AddBusinessOrganisation( wxCommandEvent& event ) frameCEOrg->SetEditorMode(FALSE, CE_WORK); intResult = GetLastInt(&GeneralOrganisationsList); frameCEOrg->SetupPointers(&GeneralOrganisationsList, - &BusinessOrganisationsListLanguage, - &BusinessOrganisationsListSortAs, - &BusinessOrganisationsListAltID, - &BusinessOrganisationsListPID, - &BusinessOrganisationsListType, - &BusinessOrganisationsListTokens, - &BusinessOrganisationsListPref, + &ContactEditorData.BusinessOrganisationsListLanguage, + &ContactEditorData.BusinessOrganisationsListSortAs, + &ContactEditorData.BusinessOrganisationsListAltID, + &ContactEditorData.BusinessOrganisationsListPID, + &ContactEditorData.BusinessOrganisationsListType, + &ContactEditorData.BusinessOrganisationsListTokens, + &ContactEditorData.BusinessOrganisationsListPref, lboBusinessOrganisations, (intValueSeek)); frameCEOrg->ShowModal(); @@ -832,14 +832,14 @@ void frmContactEditor::ModifyBusinessOrganisation( wxCommandEvent& event ) } frmContactEditorOrganisations *frameCEOrg = new frmContactEditorOrganisations ( this ); - frameCEOrg->SetupPointers(&BusinessOrganisationsList, - &BusinessOrganisationsListLanguage, - &BusinessOrganisationsListSortAs, - &BusinessOrganisationsListAltID, - &BusinessOrganisationsListPID, - &BusinessOrganisationsListType, - &BusinessOrganisationsListTokens, - &BusinessOrganisationsListPref, + frameCEOrg->SetupPointers(&ContactEditorData.BusinessOrganisationsList, + &ContactEditorData.BusinessOrganisationsListLanguage, + &ContactEditorData.BusinessOrganisationsListSortAs, + &ContactEditorData.BusinessOrganisationsListAltID, + &ContactEditorData.BusinessOrganisationsListPID, + &ContactEditorData.BusinessOrganisationsListType, + &ContactEditorData.BusinessOrganisationsListTokens, + &ContactEditorData.BusinessOrganisationsListPref, lboBusinessOrganisations, intSelectedData); frameCEOrg->SetEditorMode(TRUE, CE_WORK); @@ -861,11 +861,11 @@ void frmContactEditor::DeleteBusinessOrganisation( wxCommandEvent& event ) lboBusinessOrganisations->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &BusinessOrganisationsList, - &BusinessOrganisationsListLanguage, &BusinessOrganisationsListSortAs, - &BusinessOrganisationsListAltID, &BusinessOrganisationsListPID, - &BusinessOrganisationsListType, &BusinessOrganisationsListTokens, - &BusinessOrganisationsListPref); + DeleteMapData(intSelectedData, &ContactEditorData.BusinessOrganisationsList, + &ContactEditorData.BusinessOrganisationsListLanguage, &ContactEditorData.BusinessOrganisationsListSortAs, + &ContactEditorData.BusinessOrganisationsListAltID, &ContactEditorData.BusinessOrganisationsListPID, + &ContactEditorData.BusinessOrganisationsListType, &ContactEditorData.BusinessOrganisationsListTokens, + &ContactEditorData.BusinessOrganisationsListPref); } @@ -875,14 +875,14 @@ void frmContactEditor::AddBusinessNote( wxCommandEvent& event ) frmContactEditorNotes *frameCENote = new frmContactEditorNotes ( this ); frameCENote->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&BusinessNoteList); - frameCENote->SetupPointers(&BusinessNoteList, - &BusinessNoteListLanguage, - &BusinessNoteListAltID, - &BusinessNoteListPID, - &BusinessNoteListType, - &BusinessNoteListTokens, - &BusinessNoteListPref, + intResult = GetLastInt(&ContactEditorData.BusinessNoteList); + frameCENote->SetupPointers(&ContactEditorData.BusinessNoteList, + &ContactEditorData.BusinessNoteListLanguage, + &ContactEditorData.BusinessNoteListAltID, + &ContactEditorData.BusinessNoteListPID, + &ContactEditorData.BusinessNoteListType, + &ContactEditorData.BusinessNoteListTokens, + &ContactEditorData.BusinessNoteListPref, lboBusinessNotes, (intValueSeek)); frameCENote->ShowModal(); @@ -902,13 +902,13 @@ void frmContactEditor::ModifyBusinessNote( wxCommandEvent& event ) } frmContactEditorNotes *frameCENote = new frmContactEditorNotes ( this ); - frameCENote->SetupPointers(&BusinessNoteList, - &BusinessNoteListLanguage, - &BusinessNoteListAltID, - &BusinessNoteListPID, - &BusinessNoteListType, - &BusinessNoteListTokens, - &BusinessNoteListPref, + frameCENote->SetupPointers(&ContactEditorData.BusinessNoteList, + &ContactEditorData.BusinessNoteListLanguage, + &ContactEditorData.BusinessNoteListAltID, + &ContactEditorData.BusinessNoteListPID, + &ContactEditorData.BusinessNoteListType, + &ContactEditorData.BusinessNoteListTokens, + &ContactEditorData.BusinessNoteListPref, lboBusinessNotes, intSelectedData); frameCENote->SetEditorMode(TRUE, CE_WORK); @@ -930,9 +930,9 @@ void frmContactEditor::DeleteBusinessNote( wxCommandEvent& event ) lboBusinessNotes->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &BusinessNoteList, - &BusinessNoteListLanguage, &BusinessNoteListAltID, - &BusinessNoteListPID, &BusinessNoteListType, - &BusinessNoteListTokens, &BusinessNoteListPref); + DeleteMapData(intSelectedData, &ContactEditorData.BusinessNoteList, + &ContactEditorData.BusinessNoteListLanguage, &ContactEditorData.BusinessNoteListAltID, + &ContactEditorData.BusinessNoteListPID, &ContactEditorData.BusinessNoteListType, + &ContactEditorData.BusinessNoteListTokens, &ContactEditorData.BusinessNoteListPref); } -- 2.39.5