Home | News | Projects | Releases
Bugs | RFE | Repositories | Help
All items in the Home tab of the contact editor now use ContactDataObject.
authorSteve Brokenshire <sbrokenshire@xestia.co.uk>
Fri, 1 Jan 2016 14:09:57 +0000 (14:09 +0000)
committerSteve Brokenshire <sbrokenshire@xestia.co.uk>
Fri, 1 Jan 2016 14:09:57 +0000 (14:09 +0000)
source/contacteditor/frmContactEditor-Home.cpp

index 065b9af..0d45448 100644 (file)
@@ -1,6 +1,6 @@
 // frmContactEditor-Home.cpp - frmContactEditor Home 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::AddHomeNickname( wxCommandEvent& event )
     
     frmContactEditorNickname *frameCENickname = new frmContactEditorNickname ( this );
     frameCENickname->SetEditorMode(FALSE, CE_HOME);
-    intResult = GetLastInt(&HomeNicknamesList);
-    frameCENickname->SetupPointers(&HomeNicknamesList,
-                                   &HomeNicknamesListAltID,
-                                   &HomeNicknamesListPID,
-                                   &HomeNicknamesListType,
-                                   &HomeNicknamesListLanguage,
-                                   &HomeNicknamesListTokens,
-                                   &HomeNicknamesListPref,
+    intResult = GetLastInt(&ContactEditorData.HomeNicknamesList);
+    frameCENickname->SetupPointers(&ContactEditorData.HomeNicknamesList,
+                                   &ContactEditorData.HomeNicknamesListAltID,
+                                   &ContactEditorData.HomeNicknamesListPID,
+                                   &ContactEditorData.HomeNicknamesListType,
+                                   &ContactEditorData.HomeNicknamesListLanguage,
+                                   &ContactEditorData.HomeNicknamesListTokens,
+                                   &ContactEditorData.HomeNicknamesListPref,
                                    lboHomeNicknames,
                                    (intValueSeek));
     frameCENickname->ShowModal();
@@ -66,13 +66,13 @@ void frmContactEditor::ModifyHomeNickname( wxCommandEvent& event )
     }
     
     frmContactEditorNickname *frameCENickname = new frmContactEditorNickname ( this );
-    frameCENickname->SetupPointers(&HomeNicknamesList,
-                                   &HomeNicknamesListAltID,
-                                   &HomeNicknamesListPID,
-                                   &HomeNicknamesListType,
-                                   &HomeNicknamesListLanguage,
-                                   &HomeNicknamesListTokens,
-                                   &HomeNicknamesListPref,
+    frameCENickname->SetupPointers(&ContactEditorData.HomeNicknamesList,
+                                   &ContactEditorData.HomeNicknamesListAltID,
+                                   &ContactEditorData.HomeNicknamesListPID,
+                                   &ContactEditorData.HomeNicknamesListType,
+                                   &ContactEditorData.HomeNicknamesListLanguage,
+                                   &ContactEditorData.HomeNicknamesListTokens,
+                                   &ContactEditorData.HomeNicknamesListPref,
                                    lboHomeNicknames,
                                    intSelectedData);
     frameCENickname->SetEditorMode(TRUE, CE_HOME);
@@ -96,13 +96,13 @@ void frmContactEditor::DeleteHomeNickname( wxCommandEvent& event )
     lboHomeNicknames->DeleteItem(longSelected);
     
     DeleteMapData(intSelectedData,
-                  &HomeNicknamesList,
-                  &HomeNicknamesListLanguage,
-                  &HomeNicknamesListAltID,
-                  &HomeNicknamesListPID,
-                  &HomeNicknamesListTokens,
-                  &HomeNicknamesListType,
-                  &HomeNicknamesListPref);
+                  &ContactEditorData.HomeNicknamesList,
+                  &ContactEditorData.HomeNicknamesListLanguage,
+                  &ContactEditorData.HomeNicknamesListAltID,
+                  &ContactEditorData.HomeNicknamesListPID,
+                  &ContactEditorData.HomeNicknamesListTokens,
+                  &ContactEditorData.HomeNicknamesListType,
+                  &ContactEditorData.HomeNicknamesListPref);
     
 }
 
@@ -112,22 +112,22 @@ void frmContactEditor::AddHomeAddress( wxCommandEvent& event )
     
     frmContactEditorAddress *frameCEAddress = new frmContactEditorAddress ( this );
     frameCEAddress->SetEditorMode(FALSE, CE_HOME);
-    intResult = GetLastInt(&HomeAddressList);
-    frameCEAddress->SetupPointers(&HomeAddressList,
-                                  &HomeAddressListTown,
-                                  &HomeAddressListCounty,
-                                  &HomeAddressListPostCode,
-                                  &HomeAddressListCountry,
-                                  &HomeAddressListLabel,
-                                  &HomeAddressListLang,
-                                  &HomeAddressListAltID,
-                                  &HomeAddressListPID,
-                                  &HomeAddressListTokens,
-                                  &HomeAddressListGeo,
-                                  &HomeAddressListTimezone,
-                                  &HomeAddressListType,
-                                  &HomeAddressListMediatype,
-                                  &HomeAddressListPref,
+    intResult = GetLastInt(&ContactEditorData.HomeAddressList);
+    frameCEAddress->SetupPointers(&ContactEditorData.HomeAddressList,
+                                  &ContactEditorData.HomeAddressListTown,
+                                  &ContactEditorData.HomeAddressListCounty,
+                                  &ContactEditorData.HomeAddressListPostCode,
+                                  &ContactEditorData.HomeAddressListCountry,
+                                  &ContactEditorData.HomeAddressListLabel,
+                                  &ContactEditorData.HomeAddressListLang,
+                                  &ContactEditorData.HomeAddressListAltID,
+                                  &ContactEditorData.HomeAddressListPID,
+                                  &ContactEditorData.HomeAddressListTokens,
+                                  &ContactEditorData.HomeAddressListGeo,
+                                  &ContactEditorData.HomeAddressListTimezone,
+                                  &ContactEditorData.HomeAddressListType,
+                                  &ContactEditorData.HomeAddressListMediatype,
+                                  &ContactEditorData.HomeAddressListPref,
                                   lboHomeAddresses,
                                   (intValueSeek));
     frameCEAddress->ShowModal();
@@ -147,21 +147,21 @@ void frmContactEditor::ModifyHomeAddress( wxCommandEvent& event )
     }
     
     frmContactEditorAddress *frameCEAddress = new frmContactEditorAddress ( this );
-    frameCEAddress->SetupPointers(&HomeAddressList,
-                                  &HomeAddressListTown,
-                                  &HomeAddressListCounty,
-                                  &HomeAddressListPostCode,
-                                  &HomeAddressListCountry,
-                                  &HomeAddressListLabel,
-                                  &HomeAddressListLang,
-                                  &HomeAddressListAltID,
-                                  &HomeAddressListPID,
-                                  &HomeAddressListTokens,
-                                  &HomeAddressListGeo,
-                                  &HomeAddressListTimezone,
-                                  &HomeAddressListType,
-                                  &HomeAddressListMediatype,
-                                  &HomeAddressListPref,
+    frameCEAddress->SetupPointers(&ContactEditorData.HomeAddressList,
+                                  &ContactEditorData.HomeAddressListTown,
+                                  &ContactEditorData.HomeAddressListCounty,
+                                  &ContactEditorData.HomeAddressListPostCode,
+                                  &ContactEditorData.HomeAddressListCountry,
+                                  &ContactEditorData.HomeAddressListLabel,
+                                  &ContactEditorData.HomeAddressListLang,
+                                  &ContactEditorData.HomeAddressListAltID,
+                                  &ContactEditorData.HomeAddressListPID,
+                                  &ContactEditorData.HomeAddressListTokens,
+                                  &ContactEditorData.HomeAddressListGeo,
+                                  &ContactEditorData.HomeAddressListTimezone,
+                                  &ContactEditorData.HomeAddressListType,
+                                  &ContactEditorData.HomeAddressListMediatype,
+                                  &ContactEditorData.HomeAddressListPref,
                                   lboHomeAddresses,
                                   intSelectedData);
     frameCEAddress->SetEditorMode(TRUE, CE_HOME);
@@ -184,15 +184,15 @@ void frmContactEditor::DeleteHomeAddress( wxCommandEvent& event )
     
     lboHomeAddresses->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &HomeAddressList,
-                  &HomeAddressListTown, &HomeAddressListCounty,
-                  &HomeAddressListPostCode, &HomeAddressListCountry,
-                  &HomeAddressList, &HomeAddressListLabel,
-                  &HomeAddressListLang, &HomeAddressListAltID,
-                  &HomeAddressListPID, &HomeAddressListTokens,
-                  &HomeAddressListGeo, &HomeAddressListTimezone,
-                  &HomeAddressListType, &HomeAddressListMediatype,
-                  &HomeAddressListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.HomeAddressList,
+                  &ContactEditorData.HomeAddressListTown, &ContactEditorData.HomeAddressListCounty,
+                  &ContactEditorData.HomeAddressListPostCode, &ContactEditorData.HomeAddressListCountry,
+                  &ContactEditorData.HomeAddressList, &ContactEditorData.HomeAddressListLabel,
+                  &ContactEditorData.HomeAddressListLang, &ContactEditorData.HomeAddressListAltID,
+                  &ContactEditorData.HomeAddressListPID, &ContactEditorData.HomeAddressListTokens,
+                  &ContactEditorData.HomeAddressListGeo, &ContactEditorData.HomeAddressListTimezone,
+                  &ContactEditorData.HomeAddressListType, &ContactEditorData.HomeAddressListMediatype,
+                  &ContactEditorData.HomeAddressListPref);
     
 }
 
@@ -202,13 +202,13 @@ void frmContactEditor::AddHomeEmail( wxCommandEvent& event )
     
     frmContactEditorEmail *frameCEEmail = new frmContactEditorEmail ( this );
     frameCEEmail->SetEditorMode(FALSE, CE_HOME);
-    intResult = GetLastInt(&HomeAddressList);
-    frameCEEmail->SetupPointers(&HomeEmailList,
-                                &HomeEmailListAltID,
-                                &HomeEmailListPID,
-                                &HomeEmailListType,
-                                &HomeEmailListTokens,
-                                &HomeEmailListPref,
+    intResult = GetLastInt(&ContactEditorData.HomeAddressList);
+    frameCEEmail->SetupPointers(&ContactEditorData.HomeEmailList,
+                                &ContactEditorData.HomeEmailListAltID,
+                                &ContactEditorData.HomeEmailListPID,
+                                &ContactEditorData.HomeEmailListType,
+                                &ContactEditorData.HomeEmailListTokens,
+                                &ContactEditorData.HomeEmailListPref,
                                 lboHomeEmails,
                                 (intValueSeek));
     frameCEEmail->ShowModal();
@@ -228,12 +228,12 @@ void frmContactEditor::ModifyHomeEmail( wxCommandEvent& event )
     }
     
     frmContactEditorEmail *frameCEEmail = new frmContactEditorEmail ( this );
-    frameCEEmail->SetupPointers(&HomeEmailList,
-                                &HomeEmailListAltID,
-                                &HomeEmailListPID,
-                                &HomeEmailListType,
-                                &HomeEmailListTokens,
-                                &HomeEmailListPref,
+    frameCEEmail->SetupPointers(&ContactEditorData.HomeEmailList,
+                                &ContactEditorData.HomeEmailListAltID,
+                                &ContactEditorData.HomeEmailListPID,
+                                &ContactEditorData.HomeEmailListType,
+                                &ContactEditorData.HomeEmailListTokens,
+                                &ContactEditorData.HomeEmailListPref,
                                 lboHomeEmails,
                                 intSelectedData);
     frameCEEmail->SetEditorMode(TRUE, CE_HOME);
@@ -256,10 +256,10 @@ void frmContactEditor::DeleteHomeEmail( wxCommandEvent& event )
     
     lboHomeEmails->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &HomeEmailList,
-                  &HomeEmailListAltID, &HomeEmailListPID,
-                  &HomeEmailListType, &HomeEmailListTokens,
-                  &HomeEmailListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.HomeEmailList,
+                  &ContactEditorData.HomeEmailListAltID, &ContactEditorData.HomeEmailListPID,
+                  &ContactEditorData.HomeEmailListType, &ContactEditorData.HomeEmailListTokens,
+                  &ContactEditorData.HomeEmailListPref);
 }
 
 
@@ -269,14 +269,14 @@ void frmContactEditor::AddHomeIM( wxCommandEvent& event )
     
     frmContactEditorIM *frameCEIM = new frmContactEditorIM ( this );
     frameCEIM->SetEditorMode(FALSE, CE_HOME);
-    intResult = GetLastInt(&HomeIMList);
-    frameCEIM->SetupPointers(&HomeIMList,
-                             &HomeIMListAltID,
-                             &HomeIMListPID,
-                             &HomeIMListType,
-                             &HomeIMListTokens,
-                             &HomeIMListMediatype,
-                             &HomeIMListPref,
+    intResult = GetLastInt(&ContactEditorData.HomeIMList);
+    frameCEIM->SetupPointers(&ContactEditorData.HomeIMList,
+                             &ContactEditorData.HomeIMListAltID,
+                             &ContactEditorData.HomeIMListPID,
+                             &ContactEditorData.HomeIMListType,
+                             &ContactEditorData.HomeIMListTokens,
+                             &ContactEditorData.HomeIMListMediatype,
+                             &ContactEditorData.HomeIMListPref,
                              lboHomeIM,
                              (intValueSeek));
     frameCEIM->ShowModal();
@@ -296,13 +296,13 @@ void frmContactEditor::ModifyHomeIM( wxCommandEvent& event )
     }
     
     frmContactEditorIM *frameCEIM = new frmContactEditorIM ( this );
-    frameCEIM->SetupPointers(&HomeIMList,
-                             &HomeIMListAltID,
-                             &HomeIMListPID,
-                             &HomeIMListType,
-                             &HomeIMListTokens,
-                             &HomeIMListMediatype,
-                             &HomeIMListPref,
+    frameCEIM->SetupPointers(&ContactEditorData.HomeIMList,
+                             &ContactEditorData.HomeIMListAltID,
+                             &ContactEditorData.HomeIMListPID,
+                             &ContactEditorData.HomeIMListType,
+                             &ContactEditorData.HomeIMListTokens,
+                             &ContactEditorData.HomeIMListMediatype,
+                             &ContactEditorData.HomeIMListPref,
                              lboHomeIM,
                              intSelectedData);
     frameCEIM->SetEditorMode(TRUE, CE_HOME);
@@ -324,10 +324,10 @@ void frmContactEditor::DeleteHomeIM( wxCommandEvent& event )
     
     lboHomeIM->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &HomeIMList,
-                  &HomeIMListAltID, &HomeIMListPID,
-                  &HomeIMListType, &HomeIMListTokens,
-                  &HomeIMListMediatype, &HomeIMListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.HomeIMList,
+                  &ContactEditorData.HomeIMListAltID, &ContactEditorData.HomeIMListPID,
+                  &ContactEditorData.HomeIMListType, &ContactEditorData.HomeIMListTokens,
+                  &ContactEditorData.HomeIMListMediatype, &ContactEditorData.HomeIMListPref);
     
 }
 
@@ -337,13 +337,13 @@ void frmContactEditor::AddHomeTelephone( wxCommandEvent& event )
     
     frmContactEditorTelephone *frameCETel = new frmContactEditorTelephone ( this );
     frameCETel->SetEditorMode(FALSE, CE_HOME);
-    intResult = GetLastInt(&HomeTelephoneList);
-    frameCETel->SetupPointers(&HomeTelephoneList,
-                              &HomeTelephoneListAltID,
-                              &HomeTelephoneListPID,
-                              &HomeTelephoneListType,
-                              &HomeTelephoneListTokens,
-                              &HomeTelephoneListPref,
+    intResult = GetLastInt(&ContactEditorData.HomeTelephoneList);
+    frameCETel->SetupPointers(&ContactEditorData.HomeTelephoneList,
+                              &ContactEditorData.HomeTelephoneListAltID,
+                              &ContactEditorData.HomeTelephoneListPID,
+                              &ContactEditorData.HomeTelephoneListType,
+                              &ContactEditorData.HomeTelephoneListTokens,
+                              &ContactEditorData.HomeTelephoneListPref,
                               lboHomeTelephone,
                               (intValueSeek));
     frameCETel->ShowModal();
@@ -363,12 +363,12 @@ void frmContactEditor::ModifyHomeTelephone( wxCommandEvent& event )
     }
     
     frmContactEditorTelephone *frameCETel = new frmContactEditorTelephone ( this );
-    frameCETel->SetupPointers(&HomeTelephoneList,
-                              &HomeTelephoneListAltID,
-                              &HomeTelephoneListPID,
-                              &HomeTelephoneListType,
-                              &HomeTelephoneListTokens,
-                              &HomeTelephoneListPref,
+    frameCETel->SetupPointers(&ContactEditorData.HomeTelephoneList,
+                              &ContactEditorData.HomeTelephoneListAltID,
+                              &ContactEditorData.HomeTelephoneListPID,
+                              &ContactEditorData.HomeTelephoneListType,
+                              &ContactEditorData.HomeTelephoneListTokens,
+                              &ContactEditorData.HomeTelephoneListPref,
                               lboHomeTelephone,
                               intSelectedData);
     frameCETel->SetEditorMode(TRUE, CE_HOME);
@@ -390,10 +390,10 @@ void frmContactEditor::DeleteHomeTelephone( wxCommandEvent& event )
     
     lboHomeTelephone->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &HomeTelephoneList,
-                  &HomeTelephoneListAltID, &HomeTelephoneListPID,
-                  &HomeTelephoneListType, &HomeTelephoneListTokens,
-                  &HomeTelephoneListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.HomeTelephoneList,
+                  &ContactEditorData.HomeTelephoneListAltID, &ContactEditorData.HomeTelephoneListPID,
+                  &ContactEditorData.HomeTelephoneListType, &ContactEditorData.HomeTelephoneListTokens,
+                  &ContactEditorData.HomeTelephoneListPref);
     
 }
 
@@ -403,13 +403,13 @@ void frmContactEditor::AddHomeLanguage( wxCommandEvent& event )
     
     frmContactEditorLanguages *frameCELang = new frmContactEditorLanguages ( this );
     frameCELang->SetEditorMode(FALSE, CE_HOME);
-    intResult = GetLastInt(&HomeLanguageList);
-    frameCELang->SetupPointers(&HomeLanguageList,
-                               &HomeLanguageListAltID,
-                               &HomeLanguageListPID,
-                               &HomeLanguageListType,
-                               &HomeLanguageListTokens,
-                               &HomeLanguageListPref,
+    intResult = GetLastInt(&ContactEditorData.HomeLanguageList);
+    frameCELang->SetupPointers(&ContactEditorData.HomeLanguageList,
+                               &ContactEditorData.HomeLanguageListAltID,
+                               &ContactEditorData.HomeLanguageListPID,
+                               &ContactEditorData.HomeLanguageListType,
+                               &ContactEditorData.HomeLanguageListTokens,
+                               &ContactEditorData.HomeLanguageListPref,
                                lboHomeLanguages,
                                (intValueSeek));
     frameCELang->ShowModal();
@@ -429,12 +429,12 @@ void frmContactEditor::ModifyHomeLanguage( wxCommandEvent& event )
     }
     
     frmContactEditorLanguages *frameCELang = new frmContactEditorLanguages ( this );
-    frameCELang->SetupPointers(&HomeLanguageList,
-                               &HomeLanguageListAltID,
-                               &HomeLanguageListPID,
-                               &HomeLanguageListType,
-                               &HomeLanguageListTokens,
-                               &HomeLanguageListPref,
+    frameCELang->SetupPointers(&ContactEditorData.HomeLanguageList,
+                               &ContactEditorData.HomeLanguageListAltID,
+                               &ContactEditorData.HomeLanguageListPID,
+                               &ContactEditorData.HomeLanguageListType,
+                               &ContactEditorData.HomeLanguageListTokens,
+                               &ContactEditorData.HomeLanguageListPref,
                                lboHomeLanguages,
                                intSelectedData);
     frameCELang->SetEditorMode(TRUE, CE_HOME);
@@ -456,10 +456,10 @@ void frmContactEditor::DeleteHomeLanguage( wxCommandEvent& event )
     
     lboHomeLanguages->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &HomeLanguageList,
-                  &HomeLanguageListAltID, &HomeLanguageListPID,
-                  &HomeLanguageListType, &HomeLanguageListTokens,
-                  &HomeLanguageListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.HomeLanguageList,
+                  &ContactEditorData.HomeLanguageListAltID, &ContactEditorData.HomeLanguageListPID,
+                  &ContactEditorData.HomeLanguageListType, &ContactEditorData.HomeLanguageListTokens,
+                  &ContactEditorData.HomeLanguageListPref);
     
 }
 
@@ -469,14 +469,14 @@ void frmContactEditor::AddHomeTimezone( wxCommandEvent& event )
     
     frmContactEditorTimezones *frameCETZ = new frmContactEditorTimezones ( this );
     frameCETZ->SetEditorMode(FALSE, CE_HOME);
-    intResult = GetLastInt(&HomeTZList);
-    frameCETZ->SetupPointers(&HomeTZList,
-                             &HomeTZListAltID,
-                             &HomeTZListPID,
-                             &HomeTZListType,
-                             &HomeTZListTokens,
-                             &HomeTZListMediatype,
-                             &HomeTZListPref,
+    intResult = GetLastInt(&ContactEditorData.HomeTZList);
+    frameCETZ->SetupPointers(&ContactEditorData.HomeTZList,
+                             &ContactEditorData.HomeTZListAltID,
+                             &ContactEditorData.HomeTZListPID,
+                             &ContactEditorData.HomeTZListType,
+                             &ContactEditorData.HomeTZListTokens,
+                             &ContactEditorData.HomeTZListMediatype,
+                             &ContactEditorData.HomeTZListPref,
                              lboHomeTimezones,
                              (intValueSeek));
     frameCETZ->ShowModal();
@@ -496,13 +496,13 @@ void frmContactEditor::ModifyHomeTimezone( wxCommandEvent& event )
     }
     
     frmContactEditorTimezones *frameCETZ = new frmContactEditorTimezones ( this );
-    frameCETZ->SetupPointers(&HomeTZList,
-                             &HomeTZListAltID,
-                             &HomeTZListPID,
-                             &HomeTZListType,
-                             &HomeTZListTokens,
-                             &HomeTZListMediatype,
-                             &HomeTZListPref,
+    frameCETZ->SetupPointers(&ContactEditorData.HomeTZList,
+                             &ContactEditorData.HomeTZListAltID,
+                             &ContactEditorData.HomeTZListPID,
+                             &ContactEditorData.HomeTZListType,
+                             &ContactEditorData.HomeTZListTokens,
+                             &ContactEditorData.HomeTZListMediatype,
+                             &ContactEditorData.HomeTZListPref,
                              lboHomeTimezones,
                              intSelectedData);
     frameCETZ->SetEditorMode(TRUE, CE_HOME);
@@ -524,10 +524,10 @@ void frmContactEditor::DeleteHomeTimezone( wxCommandEvent& event )
     
     lboHomeTimezones->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &HomeTZList,
-                  &HomeTZListAltID, &HomeTZListPID,
-                  &HomeTZListType, &HomeTZListTokens,
-                  &HomeTZListMediatype, &HomeTZListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.HomeTZList,
+                  &ContactEditorData.HomeTZListAltID, &ContactEditorData.HomeTZListPID,
+                  &ContactEditorData.HomeTZListType, &ContactEditorData.HomeTZListTokens,
+                  &ContactEditorData.HomeTZListMediatype, &ContactEditorData.HomeTZListPref);
     
 }
 
@@ -537,14 +537,14 @@ void frmContactEditor::AddHomeGeoposition( wxCommandEvent& event )
     
     frmContactEditorGeoposition *frameCEGeo = new frmContactEditorGeoposition ( this );
     frameCEGeo->SetEditorMode(FALSE, CE_HOME);
-    intResult = GetLastInt(&HomeGeographyList);
-    frameCEGeo->SetupPointers(&HomeGeographyList,
-                              &HomeGeographyListAltID,
-                              &HomeGeographyListPID,
-                              &HomeGeographyListType,
-                              &HomeGeographyListTokens,
-                              &HomeGeographyListMediatype,
-                              &HomeGeographyListPref,
+    intResult = GetLastInt(&ContactEditorData.HomeGeographyList);
+    frameCEGeo->SetupPointers(&ContactEditorData.HomeGeographyList,
+                              &ContactEditorData.HomeGeographyListAltID,
+                              &ContactEditorData.HomeGeographyListPID,
+                              &ContactEditorData.HomeGeographyListType,
+                              &ContactEditorData.HomeGeographyListTokens,
+                              &ContactEditorData.HomeGeographyListMediatype,
+                              &ContactEditorData.HomeGeographyListPref,
                               lboHomeGeoposition,
                               (intValueSeek));
     frameCEGeo->ShowModal();
@@ -564,13 +564,13 @@ void frmContactEditor::ModifyHomeGeoposition( wxCommandEvent& event )
     }
     
     frmContactEditorGeoposition *frameCEGeo = new frmContactEditorGeoposition ( this );
-    frameCEGeo->SetupPointers(&HomeGeographyList,
-                              &HomeGeographyListAltID,
-                              &HomeGeographyListPID,
-                              &HomeGeographyListType,
-                              &HomeGeographyListTokens,
-                              &HomeGeographyListMediatype,
-                              &HomeGeographyListPref,
+    frameCEGeo->SetupPointers(&ContactEditorData.HomeGeographyList,
+                              &ContactEditorData.HomeGeographyListAltID,
+                              &ContactEditorData.HomeGeographyListPID,
+                              &ContactEditorData.HomeGeographyListType,
+                              &ContactEditorData.HomeGeographyListTokens,
+                              &ContactEditorData.HomeGeographyListMediatype,
+                              &ContactEditorData.HomeGeographyListPref,
                               lboHomeGeoposition,
                               intSelectedData);
     frameCEGeo->SetEditorMode(TRUE, CE_HOME);
@@ -592,10 +592,10 @@ void frmContactEditor::DeleteHomeGeoposition( wxCommandEvent& event )
     
     lboHomeGeoposition->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &HomeGeographyList,
-                  &HomeGeographyListAltID, &HomeGeographyListPID,
-                  &HomeGeographyListType, &HomeGeographyListTokens,
-                  &HomeGeographyListMediatype, &HomeGeographyListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.HomeGeographyList,
+                  &ContactEditorData.HomeGeographyListAltID, &ContactEditorData.HomeGeographyListPID,
+                  &ContactEditorData.HomeGeographyListType, &ContactEditorData.HomeGeographyListTokens,
+                  &ContactEditorData.HomeGeographyListMediatype, &ContactEditorData.HomeGeographyListPref);
     
 }
 
@@ -605,14 +605,14 @@ void frmContactEditor::AddHomeWebsite( wxCommandEvent& event )
     
     frmContactEditorWebsites *frameCEWeb = new frmContactEditorWebsites ( this );
     frameCEWeb->SetEditorMode(FALSE, CE_HOME);
-    intResult = GetLastInt(&HomeWebsiteList);
-    frameCEWeb->SetupPointers(&HomeWebsiteList,
-                              &HomeWebsiteListAltID,
-                              &HomeWebsiteListPID,
-                              &HomeWebsiteListType,
-                              &HomeWebsiteListTokens,
-                              &HomeWebsiteListMediatype,
-                              &HomeWebsiteListPref,
+    intResult = GetLastInt(&ContactEditorData.HomeWebsiteList);
+    frameCEWeb->SetupPointers(&ContactEditorData.HomeWebsiteList,
+                              &ContactEditorData.HomeWebsiteListAltID,
+                              &ContactEditorData.HomeWebsiteListPID,
+                              &ContactEditorData.HomeWebsiteListType,
+                              &ContactEditorData.HomeWebsiteListTokens,
+                              &ContactEditorData.HomeWebsiteListMediatype,
+                              &ContactEditorData.HomeWebsiteListPref,
                               lboHomeWebsites,
                               (intValueSeek));
     frameCEWeb->ShowModal();
@@ -632,13 +632,13 @@ void frmContactEditor::ModifyHomeWebsite( wxCommandEvent& event )
     }
     
     frmContactEditorWebsites *frameCEWeb = new frmContactEditorWebsites ( this );
-    frameCEWeb->SetupPointers(&HomeWebsiteList,
-                              &HomeWebsiteListAltID,
-                              &HomeWebsiteListPID,
-                              &HomeWebsiteListType,
-                              &HomeWebsiteListTokens,
-                              &HomeWebsiteListMediatype,
-                              &HomeWebsiteListPref,
+    frameCEWeb->SetupPointers(&ContactEditorData.HomeWebsiteList,
+                              &ContactEditorData.HomeWebsiteListAltID,
+                              &ContactEditorData.HomeWebsiteListPID,
+                              &ContactEditorData.HomeWebsiteListType,
+                              &ContactEditorData.HomeWebsiteListTokens,
+                              &ContactEditorData.HomeWebsiteListMediatype,
+                              &ContactEditorData.HomeWebsiteListPref,
                               lboHomeWebsites,
                               intSelectedData);
     frameCEWeb->SetEditorMode(TRUE, CE_HOME);
@@ -660,10 +660,10 @@ void frmContactEditor::DeleteHomeWebsite( wxCommandEvent& event )
     
     lboHomeWebsites->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &HomeWebsiteList,
-                  &HomeWebsiteListAltID, &HomeWebsiteListPID,
-                  &HomeWebsiteListType, &HomeWebsiteListTokens,
-                  &HomeWebsiteListMediatype, &HomeWebsiteListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.HomeWebsiteList,
+                  &ContactEditorData.HomeWebsiteListAltID, &ContactEditorData.HomeWebsiteListPID,
+                  &ContactEditorData.HomeWebsiteListType, &ContactEditorData.HomeWebsiteListTokens,
+                  &ContactEditorData.HomeWebsiteListMediatype, &ContactEditorData.HomeWebsiteListPref);
     
 }
 
@@ -673,14 +673,14 @@ void frmContactEditor::AddHomeTitle( wxCommandEvent& event )
     
     frmContactEditorTitles *frameCETitle = new frmContactEditorTitles ( this );
     frameCETitle->SetEditorMode(FALSE, CE_HOME);
-    intResult = GetLastInt(&HomeTitleList);
-    frameCETitle->SetupPointers(&HomeTitleList,
-                                &HomeTitleListLanguage,
-                                &HomeTitleListAltID,
-                                &HomeTitleListPID,
-                                &HomeTitleListType,
-                                &HomeTitleListTokens,
-                                &HomeTitleListPref,
+    intResult = GetLastInt(&ContactEditorData.HomeTitleList);
+    frameCETitle->SetupPointers(&ContactEditorData.HomeTitleList,
+                                &ContactEditorData.HomeTitleListLanguage,
+                                &ContactEditorData.HomeTitleListAltID,
+                                &ContactEditorData.HomeTitleListPID,
+                                &ContactEditorData.HomeTitleListType,
+                                &ContactEditorData.HomeTitleListTokens,
+                                &ContactEditorData.HomeTitleListPref,
                                 lboHomeTitles,
                                 (intValueSeek));
     frameCETitle->ShowModal();
@@ -700,13 +700,13 @@ void frmContactEditor::ModifyHomeTitle( wxCommandEvent& event )
     }
     
     frmContactEditorTitles *frameCETitle = new frmContactEditorTitles ( this );
-    frameCETitle->SetupPointers(&HomeTitleList,
-                                &HomeTitleListLanguage,
-                                &HomeTitleListAltID,
-                                &HomeTitleListPID,
-                                &HomeTitleListType,
-                                &HomeTitleListTokens,
-                                &HomeTitleListPref,
+    frameCETitle->SetupPointers(&ContactEditorData.HomeTitleList,
+                                &ContactEditorData.HomeTitleListLanguage,
+                                &ContactEditorData.HomeTitleListAltID,
+                                &ContactEditorData.HomeTitleListPID,
+                                &ContactEditorData.HomeTitleListType,
+                                &ContactEditorData.HomeTitleListTokens,
+                                &ContactEditorData.HomeTitleListPref,
                                 lboHomeTitles,
                                 intSelectedData);
     frameCETitle->SetEditorMode(TRUE, CE_HOME);
@@ -728,10 +728,10 @@ void frmContactEditor::DeleteHomeTitle( wxCommandEvent& event )
     
     lboHomeTitles->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &HomeTitleList,
-                  &HomeTitleListLanguage, &HomeTitleListAltID,
-                  &HomeTitleListPID, &HomeTitleListType,
-                  &HomeTitleListTokens, &HomeTitleListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.HomeTitleList,
+                  &ContactEditorData.HomeTitleListLanguage, &ContactEditorData.HomeTitleListAltID,
+                  &ContactEditorData.HomeTitleListPID, &ContactEditorData.HomeTitleListType,
+                  &ContactEditorData.HomeTitleListTokens, &ContactEditorData.HomeTitleListPref);
     
 }
 
@@ -741,14 +741,14 @@ void frmContactEditor::AddHomeRole( wxCommandEvent& event )
     
     frmContactEditorRoles *frameCERole = new frmContactEditorRoles ( this );
     frameCERole->SetEditorMode(FALSE, CE_HOME);
-    intResult = GetLastInt(&HomeRoleList);
-    frameCERole->SetupPointers(&HomeRoleList,
-                               &HomeRoleListLanguage,
-                               &HomeRoleListAltID,
-                               &HomeRoleListPID,
-                               &HomeRoleListType,
-                               &HomeRoleListTokens,
-                               &HomeRoleListPref,
+    intResult = GetLastInt(&ContactEditorData.HomeRoleList);
+    frameCERole->SetupPointers(&ContactEditorData.HomeRoleList,
+                               &ContactEditorData.HomeRoleListLanguage,
+                               &ContactEditorData.HomeRoleListAltID,
+                               &ContactEditorData.HomeRoleListPID,
+                               &ContactEditorData.HomeRoleListType,
+                               &ContactEditorData.HomeRoleListTokens,
+                               &ContactEditorData.HomeRoleListPref,
                                lboHomeRoles,
                                (intValueSeek));
     frameCERole->ShowModal();
@@ -768,13 +768,13 @@ void frmContactEditor::ModifyHomeRole( wxCommandEvent& event )
     }
     
     frmContactEditorRoles *frameCERole = new frmContactEditorRoles ( this );
-    frameCERole->SetupPointers(&HomeRoleList,
-                               &HomeRoleListLanguage,
-                               &HomeRoleListAltID,
-                               &HomeRoleListPID,
-                               &HomeRoleListType,
-                               &HomeRoleListTokens,
-                               &HomeRoleListPref,
+    frameCERole->SetupPointers(&ContactEditorData.HomeRoleList,
+                               &ContactEditorData.HomeRoleListLanguage,
+                               &ContactEditorData.HomeRoleListAltID,
+                               &ContactEditorData.HomeRoleListPID,
+                               &ContactEditorData.HomeRoleListType,
+                               &ContactEditorData.HomeRoleListTokens,
+                               &ContactEditorData.HomeRoleListPref,
                                lboHomeRoles,
                                intSelectedData);
     frameCERole->SetEditorMode(TRUE, CE_HOME);
@@ -796,10 +796,10 @@ void frmContactEditor::DeleteHomeRole( wxCommandEvent& event )
     
     lboHomeRoles->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &HomeRoleList,
-                  &HomeRoleListLanguage, &HomeRoleListAltID,
-                  &HomeRoleListPID, &HomeRoleListType,
-                  &HomeRoleListTokens, &HomeRoleListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.HomeRoleList,
+                  &ContactEditorData.HomeRoleListLanguage, &ContactEditorData.HomeRoleListAltID,
+                  &ContactEditorData.HomeRoleListPID, &ContactEditorData.HomeRoleListType,
+                  &ContactEditorData.HomeRoleListTokens, &ContactEditorData.HomeRoleListPref);
     
 }
 
@@ -809,15 +809,15 @@ void frmContactEditor::AddHomeOrganisation( wxCommandEvent& event )
     
     frmContactEditorOrganisations *frameCEOrg = new frmContactEditorOrganisations ( this );
     frameCEOrg->SetEditorMode(FALSE, CE_HOME);
-    intResult = GetLastInt(&HomeOrganisationsList);
-    frameCEOrg->SetupPointers(&HomeOrganisationsList,
-                              &HomeOrganisationsListLanguage,
-                              &HomeOrganisationsListSortAs,
-                              &HomeOrganisationsListAltID,
-                              &HomeOrganisationsListPID,
-                              &HomeOrganisationsListType,
-                              &HomeOrganisationsListTokens,
-                              &HomeOrganisationsListPref,
+    intResult = GetLastInt(&ContactEditorData.HomeOrganisationsList);
+    frameCEOrg->SetupPointers(&ContactEditorData.HomeOrganisationsList,
+                              &ContactEditorData.HomeOrganisationsListLanguage,
+                              &ContactEditorData.HomeOrganisationsListSortAs,
+                              &ContactEditorData.HomeOrganisationsListAltID,
+                              &ContactEditorData.HomeOrganisationsListPID,
+                              &ContactEditorData.HomeOrganisationsListType,
+                              &ContactEditorData.HomeOrganisationsListTokens,
+                              &ContactEditorData.HomeOrganisationsListPref,
                               lboHomeOrganisations,
                               (intValueSeek));
     frameCEOrg->ShowModal();
@@ -837,14 +837,14 @@ void frmContactEditor::ModifyHomeOrganisation( wxCommandEvent& event )
     }
     
     frmContactEditorOrganisations *frameCEOrg = new frmContactEditorOrganisations ( this );
-    frameCEOrg->SetupPointers(&HomeOrganisationsList,
-                              &HomeOrganisationsListLanguage,
-                              &HomeOrganisationsListSortAs,
-                              &HomeOrganisationsListAltID,
-                              &HomeOrganisationsListPID,
-                              &HomeOrganisationsListType,
-                              &HomeOrganisationsListTokens,
-                              &HomeOrganisationsListPref,
+    frameCEOrg->SetupPointers(&ContactEditorData.HomeOrganisationsList,
+                              &ContactEditorData.HomeOrganisationsListLanguage,
+                              &ContactEditorData.HomeOrganisationsListSortAs,
+                              &ContactEditorData.HomeOrganisationsListAltID,
+                              &ContactEditorData.HomeOrganisationsListPID,
+                              &ContactEditorData.HomeOrganisationsListType,
+                              &ContactEditorData.HomeOrganisationsListTokens,
+                              &ContactEditorData.HomeOrganisationsListPref,
                               lboHomeOrganisations,
                               intSelectedData);
     frameCEOrg->SetEditorMode(TRUE, CE_HOME);
@@ -866,11 +866,11 @@ void frmContactEditor::DeleteHomeOrganisation( wxCommandEvent& event )
     
     lboHomeOrganisations->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &HomeOrganisationsList,
-                  &HomeOrganisationsListLanguage, &HomeOrganisationsListSortAs,
-                  &HomeOrganisationsListAltID, &HomeOrganisationsListPID,
-                  &HomeOrganisationsListType, &HomeOrganisationsListTokens,
-                  &HomeOrganisationsListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.HomeOrganisationsList,
+                  &ContactEditorData.HomeOrganisationsListLanguage, &ContactEditorData.HomeOrganisationsListSortAs,
+                  &ContactEditorData.HomeOrganisationsListAltID, &ContactEditorData.HomeOrganisationsListPID,
+                  &ContactEditorData.HomeOrganisationsListType, &ContactEditorData.HomeOrganisationsListTokens,
+                  &ContactEditorData.HomeOrganisationsListPref);
     
 }
 
@@ -880,14 +880,14 @@ void frmContactEditor::AddHomeNote( wxCommandEvent& event )
     
     frmContactEditorNotes *frameCENote = new frmContactEditorNotes ( this );
     frameCENote->SetEditorMode(FALSE, CE_HOME);
-    intResult = GetLastInt(&HomeNoteList);
-    frameCENote->SetupPointers(&HomeNoteList,
-                               &HomeNoteListLanguage,
-                               &HomeNoteListAltID,
-                               &HomeNoteListPID,
-                               &HomeNoteListType,
-                               &HomeNoteListTokens,
-                               &HomeNoteListPref,
+    intResult = GetLastInt(&ContactEditorData.HomeNoteList);
+    frameCENote->SetupPointers(&ContactEditorData.HomeNoteList,
+                               &ContactEditorData.HomeNoteListLanguage,
+                               &ContactEditorData.HomeNoteListAltID,
+                               &ContactEditorData.HomeNoteListPID,
+                               &ContactEditorData.HomeNoteListType,
+                               &ContactEditorData.HomeNoteListTokens,
+                               &ContactEditorData.HomeNoteListPref,
                                lboHomeNotes,
                                (intValueSeek));
     frameCENote->ShowModal();
@@ -907,13 +907,13 @@ void frmContactEditor::ModifyHomeNote( wxCommandEvent& event )
     }
     
     frmContactEditorNotes *frameCENote = new frmContactEditorNotes ( this );
-    frameCENote->SetupPointers(&HomeNoteList,
-                               &HomeNoteListLanguage,
-                               &HomeNoteListAltID,
-                               &HomeNoteListPID,
-                               &HomeNoteListType,
-                               &HomeNoteListTokens,
-                               &HomeNoteListPref,
+    frameCENote->SetupPointers(&ContactEditorData.HomeNoteList,
+                               &ContactEditorData.HomeNoteListLanguage,
+                               &ContactEditorData.HomeNoteListAltID,
+                               &ContactEditorData.HomeNoteListPID,
+                               &ContactEditorData.HomeNoteListType,
+                               &ContactEditorData.HomeNoteListTokens,
+                               &ContactEditorData.HomeNoteListPref,
                                lboHomeNotes,
                                intSelectedData);
     frameCENote->SetEditorMode(TRUE, CE_HOME);
@@ -935,9 +935,9 @@ void frmContactEditor::DeleteHomeNote( wxCommandEvent& event )
     
     lboNotes->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &HomeNoteList,
-                  &HomeNoteListLanguage, &HomeNoteListAltID,
-                  &HomeNoteListPID, &HomeNoteListType,
-                  &HomeNoteListTokens, &HomeNoteListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.HomeNoteList,
+                  &ContactEditorData.HomeNoteListLanguage, &ContactEditorData.HomeNoteListAltID,
+                  &ContactEditorData.HomeNoteListPID, &ContactEditorData.HomeNoteListType,
+                  &ContactEditorData.HomeNoteListTokens, &ContactEditorData.HomeNoteListPref);
     
 }
Xestia Software Development
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software

Xestia Address Book
Xestia Calendar
Development

Xestia Gelforn
Everything else

About
News
Privacy Policy