X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Home.cpp;h=33769e3dfe48e157feedc5264f79f02ea3015658;hb=ee9b71949005734012f18251774807c38b989ae2;hp=7aa3830551341431c1300dd2e2ec649297f78ae7;hpb=ab3dee2bcfd41def158d2cec95e2dcdac376b81c;p=xestiaab%2F.git diff --git a/source/contacteditor/frmContactEditor-Home.cpp b/source/contacteditor/frmContactEditor-Home.cpp index 7aa3830..33769e3 100644 --- a/source/contacteditor/frmContactEditor-Home.cpp +++ b/source/contacteditor/frmContactEditor-Home.cpp @@ -38,11 +38,8 @@ void frmContactEditor::AddHomeNickname( wxCommandEvent& event ) // Bring up window to add nickname. - int intResult = 0; - frmContactEditorNickname *frameCENickname = new frmContactEditorNickname ( this ); frameCENickname->SetEditorMode(FALSE, CE_HOME); - intResult = GetLastInt(&ContactEditorData.HomeNicknamesList); frameCENickname->SetupPointers(&ContactEditorData.HomeNicknamesList, &ContactEditorData.HomeNicknamesListAltID, &ContactEditorData.HomeNicknamesListPID, @@ -55,7 +52,8 @@ void frmContactEditor::AddHomeNickname( wxCommandEvent& event ) frameCENickname->ShowModal(); delete frameCENickname; frameCENickname = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyHomeNickname( wxCommandEvent& event ) @@ -66,7 +64,7 @@ void frmContactEditor::ModifyHomeNickname( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeNicknames, + if (lboHomeNicknames->GetItemCount() == 0 || !GetSelectedItem(lboHomeNicknames, &longSelected, &intSelectedData)){ return; @@ -97,7 +95,7 @@ void frmContactEditor::DeleteHomeNickname( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeNicknames, + if (lboHomeNicknames->GetItemCount() == 0 || !GetSelectedItem(lboHomeNicknames, &longSelected, &intSelectedData)){ return; @@ -121,11 +119,8 @@ void frmContactEditor::AddHomeAddress( wxCommandEvent& event ) // Bring up window to add address. - int intResult = 0; - frmContactEditorAddress *frameCEAddress = new frmContactEditorAddress ( this ); frameCEAddress->SetEditorMode(FALSE, CE_HOME); - intResult = GetLastInt(&ContactEditorData.HomeAddressList); frameCEAddress->SetupPointers(&ContactEditorData.HomeAddressList, &ContactEditorData.HomeAddressListTown, &ContactEditorData.HomeAddressListCounty, @@ -146,7 +141,8 @@ void frmContactEditor::AddHomeAddress( wxCommandEvent& event ) frameCEAddress->ShowModal(); delete frameCEAddress; frameCEAddress = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyHomeAddress( wxCommandEvent& event ) @@ -157,7 +153,7 @@ void frmContactEditor::ModifyHomeAddress( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeAddresses, + if (lboHomeAddresses->GetItemCount() == 0 || !GetSelectedItem(lboHomeAddresses, &longSelected, &intSelectedData)){ return; @@ -196,7 +192,7 @@ void frmContactEditor::DeleteHomeAddress( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeAddresses, + if (lboHomeAddresses->GetItemCount() == 0 || !GetSelectedItem(lboHomeAddresses, &longSelected, &intSelectedData)){ return; @@ -221,11 +217,8 @@ void frmContactEditor::AddHomeEmail( wxCommandEvent& event ) // Bring up window to add email. - int intResult = 0; - frmContactEditorEmail *frameCEEmail = new frmContactEditorEmail ( this ); frameCEEmail->SetEditorMode(FALSE, CE_HOME); - intResult = GetLastInt(&ContactEditorData.HomeAddressList); frameCEEmail->SetupPointers(&ContactEditorData.HomeEmailList, &ContactEditorData.HomeEmailListAltID, &ContactEditorData.HomeEmailListPID, @@ -237,7 +230,8 @@ void frmContactEditor::AddHomeEmail( wxCommandEvent& event ) frameCEEmail->ShowModal(); delete frameCEEmail; frameCEEmail = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyHomeEmail( wxCommandEvent& event ) @@ -248,7 +242,7 @@ void frmContactEditor::ModifyHomeEmail( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeEmails, + if (lboHomeEmails->GetItemCount() == 0 || !GetSelectedItem(lboHomeEmails, &longSelected, &intSelectedData)){ return; @@ -279,7 +273,7 @@ void frmContactEditor::DeleteHomeEmail( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeEmails, + if (lboHomeEmails->GetItemCount() == 0 || !GetSelectedItem(lboHomeEmails, &longSelected, &intSelectedData)){ return; @@ -300,11 +294,8 @@ void frmContactEditor::AddHomeIM( wxCommandEvent& event ) // Bring up window to add IM. - int intResult = 0; - frmContactEditorIM *frameCEIM = new frmContactEditorIM ( this ); frameCEIM->SetEditorMode(FALSE, CE_HOME); - intResult = GetLastInt(&ContactEditorData.HomeIMList); frameCEIM->SetupPointers(&ContactEditorData.HomeIMList, &ContactEditorData.HomeIMListAltID, &ContactEditorData.HomeIMListPID, @@ -318,7 +309,8 @@ void frmContactEditor::AddHomeIM( wxCommandEvent& event ) frameCEIM->ShowModal(); delete frameCEIM; frameCEIM = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyHomeIM( wxCommandEvent& event ) @@ -329,7 +321,7 @@ void frmContactEditor::ModifyHomeIM( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeIM, + if (lboHomeIM->GetItemCount() == 0 || !GetSelectedItem(lboHomeIM, &longSelected, &intSelectedData)){ return; @@ -361,7 +353,7 @@ void frmContactEditor::DeleteHomeIM( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeIM, + if (lboHomeIM->GetItemCount() == 0 || !GetSelectedItem(lboHomeIM, &longSelected, &intSelectedData)){ return; @@ -382,11 +374,8 @@ void frmContactEditor::AddHomeTelephone( wxCommandEvent& event ) // Bring up window to add telephone. - int intResult = 0; - frmContactEditorTelephone *frameCETel = new frmContactEditorTelephone ( this ); frameCETel->SetEditorMode(FALSE, CE_HOME); - intResult = GetLastInt(&ContactEditorData.HomeTelephoneList); frameCETel->SetupPointers(&ContactEditorData.HomeTelephoneList, &ContactEditorData.HomeTelephoneListAltID, &ContactEditorData.HomeTelephoneListPID, @@ -399,7 +388,8 @@ void frmContactEditor::AddHomeTelephone( wxCommandEvent& event ) frameCETel->ShowModal(); delete frameCETel; frameCETel = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyHomeTelephone( wxCommandEvent& event ) @@ -410,7 +400,7 @@ void frmContactEditor::ModifyHomeTelephone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeTelephone, + if (lboHomeTelephone->GetItemCount() == 0 || !GetSelectedItem(lboHomeTelephone, &longSelected, &intSelectedData)){ return; @@ -441,7 +431,7 @@ void frmContactEditor::DeleteHomeTelephone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeTelephone, + if (lboHomeTelephone->GetItemCount() == 0 || !GetSelectedItem(lboHomeTelephone, &longSelected, &intSelectedData)){ return; @@ -461,12 +451,8 @@ void frmContactEditor::AddHomeLanguage( wxCommandEvent& event ) // Bring up window to add language. - int intResult = 0; - frmContactEditorLanguages *frameCELang = new frmContactEditorLanguages ( this ); frameCELang->SetEditorMode(FALSE, CE_HOME); - intResult = GetLastInt(&ContactEditorData.HomeLanguageList); - frameCELang->SetupPointers(&ContactEditorData.HomeLanguageList, &ContactEditorData.HomeLanguageListAltID, &ContactEditorData.HomeLanguageListPID, @@ -478,7 +464,8 @@ void frmContactEditor::AddHomeLanguage( wxCommandEvent& event ) frameCELang->ShowModal(); delete frameCELang; frameCELang = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyHomeLanguage( wxCommandEvent& event ) @@ -489,7 +476,7 @@ void frmContactEditor::ModifyHomeLanguage( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeLanguages, + if (lboHomeLanguages->GetItemCount() == 0 || !GetSelectedItem(lboHomeLanguages, &longSelected, &intSelectedData)){ return; @@ -519,7 +506,7 @@ void frmContactEditor::DeleteHomeLanguage( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeLanguages, + if (lboHomeLanguages->GetItemCount() == 0 || !GetSelectedItem(lboHomeLanguages, &longSelected, &intSelectedData)){ return; @@ -539,11 +526,8 @@ void frmContactEditor::AddHomeTimezone( wxCommandEvent& event ) // Bring up window to add timezone. - int intResult = 0; - frmContactEditorTimezones *frameCETZ = new frmContactEditorTimezones ( this ); frameCETZ->SetEditorMode(FALSE, CE_HOME); - intResult = GetLastInt(&ContactEditorData.HomeTZList); frameCETZ->SetupPointers(&ContactEditorData.HomeTZList, &ContactEditorData.HomeTZListAltID, &ContactEditorData.HomeTZListPID, @@ -556,7 +540,8 @@ void frmContactEditor::AddHomeTimezone( wxCommandEvent& event ) frameCETZ->ShowModal(); delete frameCETZ; frameCETZ = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyHomeTimezone( wxCommandEvent& event ) @@ -567,7 +552,7 @@ void frmContactEditor::ModifyHomeTimezone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeTimezones, + if (lboHomeTimezones->GetItemCount() == 0 || !GetSelectedItem(lboHomeTimezones, &longSelected, &intSelectedData)){ return; @@ -598,7 +583,7 @@ void frmContactEditor::DeleteHomeTimezone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeTimezones, + if (lboHomeTimezones->GetItemCount() == 0 || !GetSelectedItem(lboHomeTimezones, &longSelected, &intSelectedData)){ return; @@ -618,11 +603,8 @@ void frmContactEditor::AddHomeGeoposition( wxCommandEvent& event ) // Bring up window to add geoposition. - int intResult = 0; - frmContactEditorGeoposition *frameCEGeo = new frmContactEditorGeoposition ( this ); frameCEGeo->SetEditorMode(FALSE, CE_HOME); - intResult = GetLastInt(&ContactEditorData.HomeGeographyList); frameCEGeo->SetupPointers(&ContactEditorData.HomeGeographyList, &ContactEditorData.HomeGeographyListAltID, &ContactEditorData.HomeGeographyListPID, @@ -636,7 +618,8 @@ void frmContactEditor::AddHomeGeoposition( wxCommandEvent& event ) frameCEGeo->ShowModal(); delete frameCEGeo; frameCEGeo = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyHomeGeoposition( wxCommandEvent& event ) @@ -647,7 +630,7 @@ void frmContactEditor::ModifyHomeGeoposition( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeGeoposition, + if (lboHomeGeoposition->GetItemCount() == 0 || !GetSelectedItem(lboHomeGeoposition, &longSelected, &intSelectedData)){ return; @@ -679,7 +662,7 @@ void frmContactEditor::DeleteHomeGeoposition( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeGeoposition, + if (lboHomeGeoposition->GetItemCount() == 0 || !GetSelectedItem(lboHomeGeoposition, &longSelected, &intSelectedData)){ return; @@ -700,11 +683,8 @@ void frmContactEditor::AddHomeWebsite( wxCommandEvent& event ) // Bring up window to add website. - int intResult = 0; - frmContactEditorWebsites *frameCEWeb = new frmContactEditorWebsites ( this ); frameCEWeb->SetEditorMode(FALSE, CE_HOME); - intResult = GetLastInt(&ContactEditorData.HomeWebsiteList); frameCEWeb->SetupPointers(&ContactEditorData.HomeWebsiteList, &ContactEditorData.HomeWebsiteListAltID, &ContactEditorData.HomeWebsiteListPID, @@ -717,7 +697,8 @@ void frmContactEditor::AddHomeWebsite( wxCommandEvent& event ) frameCEWeb->ShowModal(); delete frameCEWeb; frameCEWeb = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyHomeWebsite( wxCommandEvent& event ) @@ -728,7 +709,7 @@ void frmContactEditor::ModifyHomeWebsite( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeWebsites, + if (lboHomeWebsites->GetItemCount() == 0 || !GetSelectedItem(lboHomeWebsites, &longSelected, &intSelectedData)){ return; @@ -759,7 +740,7 @@ void frmContactEditor::DeleteHomeWebsite( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeWebsites, + if (lboHomeWebsites->GetItemCount() == 0 || !GetSelectedItem(lboHomeWebsites, &longSelected, &intSelectedData)){ return; @@ -779,11 +760,8 @@ void frmContactEditor::AddHomeTitle( wxCommandEvent& event ) // Bring up window to add title. - int intResult = 0; - frmContactEditorTitles *frameCETitle = new frmContactEditorTitles ( this ); frameCETitle->SetEditorMode(FALSE, CE_HOME); - intResult = GetLastInt(&ContactEditorData.HomeTitleList); frameCETitle->SetupPointers(&ContactEditorData.HomeTitleList, &ContactEditorData.HomeTitleListLanguage, &ContactEditorData.HomeTitleListAltID, @@ -796,7 +774,8 @@ void frmContactEditor::AddHomeTitle( wxCommandEvent& event ) frameCETitle->ShowModal(); delete frameCETitle; frameCETitle = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyHomeTitle( wxCommandEvent& event ) @@ -807,7 +786,7 @@ void frmContactEditor::ModifyHomeTitle( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeTitles, + if (lboHomeTitles->GetItemCount() == 0 || !GetSelectedItem(lboHomeTitles, &longSelected, &intSelectedData)){ return; @@ -838,7 +817,7 @@ void frmContactEditor::DeleteHomeTitle( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeTitles, + if (lboHomeTitles->GetItemCount() == 0 || !GetSelectedItem(lboHomeTitles, &longSelected, &intSelectedData)){ return; @@ -858,11 +837,8 @@ void frmContactEditor::AddHomeRole( wxCommandEvent& event ) // Bring up window to add role. - int intResult = 0; - frmContactEditorRoles *frameCERole = new frmContactEditorRoles ( this ); frameCERole->SetEditorMode(FALSE, CE_HOME); - intResult = GetLastInt(&ContactEditorData.HomeRoleList); frameCERole->SetupPointers(&ContactEditorData.HomeRoleList, &ContactEditorData.HomeRoleListLanguage, &ContactEditorData.HomeRoleListAltID, @@ -875,7 +851,8 @@ void frmContactEditor::AddHomeRole( wxCommandEvent& event ) frameCERole->ShowModal(); delete frameCERole; frameCERole = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyHomeRole( wxCommandEvent& event ) @@ -886,7 +863,7 @@ void frmContactEditor::ModifyHomeRole( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeRoles, + if (lboHomeRoles->GetItemCount() == 0 || !GetSelectedItem(lboHomeRoles, &longSelected, &intSelectedData)){ return; @@ -917,7 +894,7 @@ void frmContactEditor::DeleteHomeRole( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeRoles, + if (lboHomeRoles->GetItemCount() == 0 || !GetSelectedItem(lboHomeRoles, &longSelected, &intSelectedData)){ return; @@ -937,11 +914,8 @@ void frmContactEditor::AddHomeOrganisation( wxCommandEvent& event ) // Bring up window to add organisation. - int intResult = 0; - frmContactEditorOrganisations *frameCEOrg = new frmContactEditorOrganisations ( this ); frameCEOrg->SetEditorMode(FALSE, CE_HOME); - intResult = GetLastInt(&ContactEditorData.HomeOrganisationsList); frameCEOrg->SetupPointers(&ContactEditorData.HomeOrganisationsList, &ContactEditorData.HomeOrganisationsListLanguage, &ContactEditorData.HomeOrganisationsListSortAs, @@ -955,7 +929,8 @@ void frmContactEditor::AddHomeOrganisation( wxCommandEvent& event ) frameCEOrg->ShowModal(); delete frameCEOrg; frameCEOrg = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyHomeOrganisation( wxCommandEvent& event ) @@ -966,7 +941,7 @@ void frmContactEditor::ModifyHomeOrganisation( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeOrganisations, + if (lboHomeOrganisations->GetItemCount() == 0 || !GetSelectedItem(lboHomeOrganisations, &longSelected, &intSelectedData)){ return; @@ -998,7 +973,7 @@ void frmContactEditor::DeleteHomeOrganisation( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeOrganisations, + if (lboHomeOrganisations->GetItemCount() == 0 ||!GetSelectedItem(lboHomeOrganisations, &longSelected, &intSelectedData)){ return; @@ -1019,11 +994,8 @@ void frmContactEditor::AddHomeNote( wxCommandEvent& event ) // Bring up window to add note. - int intResult = 0; - frmContactEditorNotes *frameCENote = new frmContactEditorNotes ( this ); frameCENote->SetEditorMode(FALSE, CE_HOME); - intResult = GetLastInt(&ContactEditorData.HomeNoteList); frameCENote->SetupPointers(&ContactEditorData.HomeNoteList, &ContactEditorData.HomeNoteListLanguage, &ContactEditorData.HomeNoteListAltID, @@ -1036,7 +1008,8 @@ void frmContactEditor::AddHomeNote( wxCommandEvent& event ) frameCENote->ShowModal(); delete frameCENote; frameCENote = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyHomeNote( wxCommandEvent& event ) @@ -1047,7 +1020,7 @@ void frmContactEditor::ModifyHomeNote( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeNotes, + if (lboHomeNotes->GetItemCount() == 0 || !GetSelectedItem(lboHomeNotes, &longSelected, &intSelectedData)){ return; @@ -1078,13 +1051,13 @@ void frmContactEditor::DeleteHomeNote( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeNotes, + if (lboHomeNotes->GetItemCount() == 0 || !GetSelectedItem(lboHomeNotes, &longSelected, &intSelectedData)){ return; } - lboNotes->DeleteItem(longSelected); + lboHomeNotes->DeleteItem(longSelected); DeleteMapData(intSelectedData, &ContactEditorData.HomeNoteList, &ContactEditorData.HomeNoteListLanguage, &ContactEditorData.HomeNoteListAltID,