X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Business.cpp;h=16413937ac5c39c8a256c7b07f906758f5aeebbd;hb=ee9b71949005734012f18251774807c38b989ae2;hp=5a19a7c95d0ab045e0e0cc0ca917c3a1d59221ea;hpb=03e449a96a8119033ed11638e1c710547f6cf45a;p=xestiaab%2F.git diff --git a/source/contacteditor/frmContactEditor-Business.cpp b/source/contacteditor/frmContactEditor-Business.cpp index 5a19a7c..1641393 100644 --- a/source/contacteditor/frmContactEditor-Business.cpp +++ b/source/contacteditor/frmContactEditor-Business.cpp @@ -36,11 +36,10 @@ void frmContactEditor::AddBusinessNickname( wxCommandEvent& event ) { - int intResult = 0; - + // Bring up the window for adding a nickname. + frmContactEditorNickname *frameCENickname = new frmContactEditorNickname ( this ); frameCENickname->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessNicknamesList); frameCENickname->SetupPointers(&ContactEditorData.BusinessNicknamesList, &ContactEditorData.BusinessNicknamesListAltID, &ContactEditorData.BusinessNicknamesListPID, @@ -53,16 +52,19 @@ void frmContactEditor::AddBusinessNickname( wxCommandEvent& event ) frameCENickname->ShowModal(); delete frameCENickname; frameCENickname = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessNickname( wxCommandEvent& event ) { + // Bring up the window for modifying a nickname. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessNicknames, + if (lboBusinessNicknames->GetItemCount() == 0 || !GetSelectedItem(lboBusinessNicknames, &longSelected, &intSelectedData)){ @@ -90,10 +92,12 @@ void frmContactEditor::ModifyBusinessNickname( wxCommandEvent& event ) void frmContactEditor::DeleteBusinessNickname( wxCommandEvent& event ) { + // Bring up the window to delete the nickname. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessNicknames, + if (lboBusinessNicknames->GetItemCount() == 0 || !GetSelectedItem(lboBusinessNicknames, &longSelected, &intSelectedData)){ @@ -117,11 +121,10 @@ void frmContactEditor::DeleteBusinessNickname( wxCommandEvent& event ) void frmContactEditor::AddBusinessAddress( wxCommandEvent& event ) { - int intResult = 0; + // Bring up the window for adding an address. frmContactEditorAddress *frameCEAddress = new frmContactEditorAddress ( this ); frameCEAddress->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessAddressList); frameCEAddress->SetupPointers(&ContactEditorData.BusinessAddressList, &ContactEditorData.BusinessAddressListTown, &ContactEditorData.BusinessAddressListCounty, @@ -142,16 +145,19 @@ void frmContactEditor::AddBusinessAddress( wxCommandEvent& event ) frameCEAddress->ShowModal(); delete frameCEAddress; frameCEAddress = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessAddress( wxCommandEvent& event ) { + // Bring up a window for editing an address. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessAddresses, + if (lboBusinessAddresses->GetItemCount() == 0 || !GetSelectedItem(lboBusinessAddresses, &longSelected, &intSelectedData)){ @@ -187,10 +193,12 @@ void frmContactEditor::ModifyBusinessAddress( wxCommandEvent& event ) void frmContactEditor::DeleteBusinessAddress( wxCommandEvent& event ) { + // Bring up the window for deleting the address. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessAddresses, + if (lboBusinessAddresses->GetItemCount() == 0 || !GetSelectedItem(lboBusinessAddresses, &longSelected, &intSelectedData)){ @@ -214,11 +222,10 @@ void frmContactEditor::DeleteBusinessAddress( wxCommandEvent& event ) void frmContactEditor::AddBusinessEmail( wxCommandEvent& event ) { - int intResult = 0; + // Bring up the window for adding an email address. frmContactEditorEmail *frameCEEmail = new frmContactEditorEmail ( this ); frameCEEmail->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessAddressList); frameCEEmail->SetupPointers(&ContactEditorData.BusinessEmailList, &ContactEditorData.BusinessEmailListAltID, &ContactEditorData.BusinessEmailListPID, @@ -230,16 +237,19 @@ void frmContactEditor::AddBusinessEmail( wxCommandEvent& event ) frameCEEmail->ShowModal(); delete frameCEEmail; frameCEEmail = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessEmail( wxCommandEvent& event ) { + // Bring up the window for modifying the email address. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessEmail, + if (lboBusinessEmail->GetItemCount() == 0 || !GetSelectedItem(lboBusinessEmail, &longSelected, &intSelectedData)){ @@ -266,10 +276,12 @@ void frmContactEditor::ModifyBusinessEmail( wxCommandEvent& event ) void frmContactEditor::DeleteBusinessEmail( wxCommandEvent& event ) { + // Bring up the window to delete the email address. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessEmail, + if (lboBusinessEmail->GetItemCount() == 0 || !GetSelectedItem(lboBusinessEmail, &longSelected, &intSelectedData)){ @@ -289,11 +301,10 @@ void frmContactEditor::DeleteBusinessEmail( wxCommandEvent& event ) void frmContactEditor::AddBusinessIM( wxCommandEvent& event ) { - int intResult = 0; + // Bring up the window for adding an IM address. frmContactEditorIM *frameCEIM = new frmContactEditorIM ( this ); frameCEIM->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessIMList); frameCEIM->SetupPointers(&ContactEditorData.BusinessIMList, &ContactEditorData.BusinessIMListAltID, &ContactEditorData.BusinessIMListPID, @@ -307,16 +318,19 @@ void frmContactEditor::AddBusinessIM( wxCommandEvent& event ) frameCEIM->ShowModal(); delete frameCEIM; frameCEIM = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessIM( wxCommandEvent& event ) { + // Bring up the window for editing an IM address. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessIM, + if (lboBusinessIM->GetItemCount() == 0 || !GetSelectedItem(lboBusinessIM, &longSelected, &intSelectedData)){ @@ -345,10 +359,12 @@ void frmContactEditor::ModifyBusinessIM( wxCommandEvent& event ) void frmContactEditor::DeleteBusinessIM( wxCommandEvent& event ) { + // Bring up the window for deleting an IM address. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessIM, + if (lboBusinessIM->GetItemCount() == 0 || !GetSelectedItem(lboBusinessIM, &longSelected, &intSelectedData)){ @@ -369,11 +385,10 @@ void frmContactEditor::DeleteBusinessIM( wxCommandEvent& event ) void frmContactEditor::AddBusinessTelephone( wxCommandEvent& event ) { - int intResult = 0; + // Bring up the window for adding a telephone number. frmContactEditorTelephone *frameCETel = new frmContactEditorTelephone ( this ); frameCETel->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessTelephoneList); frameCETel->SetupPointers(&ContactEditorData.BusinessTelephoneList, &ContactEditorData.BusinessTelephoneListAltID, &ContactEditorData.BusinessTelephoneListPID, @@ -386,16 +401,19 @@ void frmContactEditor::AddBusinessTelephone( wxCommandEvent& event ) frameCETel->ShowModal(); delete frameCETel; frameCETel = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessTelephone( wxCommandEvent& event ) { + // Bring up the address for editing a telephone number. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTelephone, + if (lboBusinessTelephone->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTelephone, &longSelected, &intSelectedData)){ @@ -423,10 +441,12 @@ void frmContactEditor::ModifyBusinessTelephone( wxCommandEvent& event ) void frmContactEditor::DeleteBusinessTelephone( wxCommandEvent& event ) { + // Bring up the window for deleting a telephone number. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTelephone, + if (lboBusinessTelephone->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTelephone, &longSelected, &intSelectedData)){ @@ -446,11 +466,10 @@ void frmContactEditor::DeleteBusinessTelephone( wxCommandEvent& event ) void frmContactEditor::AddBusinessLanguage( wxCommandEvent& event ) { - int intResult = 0; + // Bring up the window for adding a language. frmContactEditorLanguages *frameCELang = new frmContactEditorLanguages ( this ); frameCELang->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessLanguageList); frameCELang->SetupPointers(&ContactEditorData.BusinessLanguageList, &ContactEditorData.BusinessLanguageListAltID, &ContactEditorData.BusinessLanguageListPID, @@ -462,16 +481,19 @@ void frmContactEditor::AddBusinessLanguage( wxCommandEvent& event ) frameCELang->ShowModal(); delete frameCELang; frameCELang = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessLanguage( wxCommandEvent& event ) { + // Bring up the window for editing a language. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessLanguages, + if (lboBusinessLanguages->GetItemCount() == 0 || !GetSelectedItem(lboBusinessLanguages, &longSelected, &intSelectedData)){ @@ -498,10 +520,12 @@ void frmContactEditor::ModifyBusinessLanguage( wxCommandEvent& event ) void frmContactEditor::DeleteBusinessLanguage( wxCommandEvent& event ) { + // Bring up the window for deleting a language. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessLanguages, + if (lboBusinessLanguages->GetItemCount() == 0 || !GetSelectedItem(lboBusinessLanguages, &longSelected, &intSelectedData)){ @@ -521,11 +545,10 @@ void frmContactEditor::DeleteBusinessLanguage( wxCommandEvent& event ) void frmContactEditor::AddBusinessTimezone( wxCommandEvent& event ) { - int intResult = 0; + // Bring up the window for adding a timezone. frmContactEditorTimezones *frameCETZ = new frmContactEditorTimezones ( this ); frameCETZ->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessTZList); frameCETZ->SetupPointers(&ContactEditorData.BusinessTZList, &ContactEditorData.BusinessTZListAltID, &ContactEditorData.BusinessTZListPID, @@ -538,16 +561,19 @@ void frmContactEditor::AddBusinessTimezone( wxCommandEvent& event ) frameCETZ->ShowModal(); delete frameCETZ; frameCETZ = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessTimezone( wxCommandEvent& event ) { + // Bring up the window for modifying a timezone. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTimezones, + if (lboBusinessTimezones->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTimezones, &longSelected, &intSelectedData)){ @@ -575,10 +601,12 @@ void frmContactEditor::ModifyBusinessTimezone( wxCommandEvent& event ) void frmContactEditor::DeleteBusinessTimezone( wxCommandEvent& event ) { + // Bring up the window for deleting a timezone. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTimezones, + if (lboBusinessTimezones->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTimezones, &longSelected, &intSelectedData)){ @@ -598,11 +626,10 @@ void frmContactEditor::DeleteBusinessTimezone( wxCommandEvent& event ) void frmContactEditor::AddBusinessGeoposition( wxCommandEvent& event ) { - int intResult = 0; + // Bring up the window for adding a geoposition location. frmContactEditorGeoposition *frameCEGeo = new frmContactEditorGeoposition ( this ); frameCEGeo->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessGeographyList); frameCEGeo->SetupPointers(&ContactEditorData.BusinessGeographyList, &ContactEditorData.BusinessGeographyListAltID, &ContactEditorData.BusinessGeographyListPID, @@ -616,16 +643,19 @@ void frmContactEditor::AddBusinessGeoposition( wxCommandEvent& event ) frameCEGeo->ShowModal(); delete frameCEGeo; frameCEGeo = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessGeoposition( wxCommandEvent& event ) { + // Bring up the window for editing a geoposition location. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessGeoposition, + if (lboBusinessGeoposition->GetItemCount() == 0 || !GetSelectedItem(lboBusinessGeoposition, &longSelected, &intSelectedData)){ @@ -654,10 +684,12 @@ void frmContactEditor::ModifyBusinessGeoposition( wxCommandEvent& event ) void frmContactEditor::DeleteBusinessGeoposition( wxCommandEvent& event ) { + // Bring up the window for deleting a geoposition location. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessGeoposition, + if (lboBusinessGeoposition->GetItemCount() == 0 || !GetSelectedItem(lboBusinessGeoposition, &longSelected, &intSelectedData)){ @@ -678,11 +710,10 @@ void frmContactEditor::DeleteBusinessGeoposition( wxCommandEvent& event ) void frmContactEditor::AddBusinessWebsite( wxCommandEvent& event ) { - int intResult = 0; + // Bring up the window for adding a website. frmContactEditorWebsites *frameCEWeb = new frmContactEditorWebsites ( this ); frameCEWeb->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessWebsiteList); frameCEWeb->SetupPointers(&ContactEditorData.BusinessWebsiteList, &ContactEditorData.BusinessWebsiteListAltID, &ContactEditorData.BusinessWebsiteListPID, @@ -695,16 +726,19 @@ void frmContactEditor::AddBusinessWebsite( wxCommandEvent& event ) frameCEWeb->ShowModal(); delete frameCEWeb; frameCEWeb = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessWebsite( wxCommandEvent& event ) { + // Bring up a window for editing a website. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessWebsites, + if (lboBusinessWebsites->GetItemCount() == 0 || !GetSelectedItem(lboBusinessWebsites, &longSelected, &intSelectedData)){ @@ -732,10 +766,12 @@ void frmContactEditor::ModifyBusinessWebsite( wxCommandEvent& event ) void frmContactEditor::DeleteBusinessWebsite( wxCommandEvent& event ) { + // Bring up the window for deleting a website. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessWebsites, + if (lboBusinessWebsites->GetItemCount() == 0 || !GetSelectedItem(lboBusinessWebsites, &longSelected, &intSelectedData)){ @@ -755,11 +791,10 @@ void frmContactEditor::DeleteBusinessWebsite( wxCommandEvent& event ) void frmContactEditor::AddBusinessTitle( wxCommandEvent& event ) { - int intResult = 0; + // Bring up the window for adding a title. frmContactEditorTitles *frameCETitle = new frmContactEditorTitles ( this ); frameCETitle->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessTitleList); frameCETitle->SetupPointers(&ContactEditorData.BusinessTitleList, &ContactEditorData.BusinessTitleListLanguage, &ContactEditorData.BusinessTitleListAltID, @@ -772,16 +807,19 @@ void frmContactEditor::AddBusinessTitle( wxCommandEvent& event ) frameCETitle->ShowModal(); delete frameCETitle; frameCETitle = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessTitle( wxCommandEvent& event ) { + // Bring up the window for editing a title. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTitles, + if (lboBusinessTitles->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTitles, &longSelected, &intSelectedData)){ @@ -809,10 +847,12 @@ void frmContactEditor::ModifyBusinessTitle( wxCommandEvent& event ) void frmContactEditor::DeleteBusinessTitle( wxCommandEvent& event ) { + // Bring up the window to delete the title. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTitles, + if (lboBusinessTitles->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTitles, &longSelected, &intSelectedData)){ @@ -820,7 +860,7 @@ void frmContactEditor::DeleteBusinessTitle( wxCommandEvent& event ) } - lboTitles->DeleteItem(longSelected); + lboBusinessTitles->DeleteItem(longSelected); DeleteMapData(intSelectedData, &ContactEditorData.BusinessTitleList, &ContactEditorData.BusinessTitleListLanguage, &ContactEditorData.BusinessTitleListAltID, @@ -832,11 +872,10 @@ void frmContactEditor::DeleteBusinessTitle( wxCommandEvent& event ) void frmContactEditor::AddBusinessRole( wxCommandEvent& event ) { - int intResult = 0; + // Bring up the window to add a role. frmContactEditorRoles *frameCERole = new frmContactEditorRoles ( this ); frameCERole->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessRoleList); frameCERole->SetupPointers(&ContactEditorData.BusinessRoleList, &ContactEditorData.BusinessRoleListLanguage, &ContactEditorData.BusinessRoleListAltID, @@ -849,16 +888,19 @@ void frmContactEditor::AddBusinessRole( wxCommandEvent& event ) frameCERole->ShowModal(); delete frameCERole; frameCERole = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessRole( wxCommandEvent& event ) { + // Bring up the window for editing a role. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessRoles, + if (lboBusinessRoles->GetItemCount() == 0 || !GetSelectedItem(lboBusinessRoles, &longSelected, &intSelectedData)){ @@ -886,10 +928,12 @@ void frmContactEditor::ModifyBusinessRole( wxCommandEvent& event ) void frmContactEditor::DeleteBusinessRole( wxCommandEvent& event ) { + // Bring up the window to delete a role. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessRoles, + if (lboBusinessRoles->GetItemCount() == 0 || !GetSelectedItem(lboBusinessRoles, &longSelected, &intSelectedData)){ @@ -909,11 +953,10 @@ void frmContactEditor::DeleteBusinessRole( wxCommandEvent& event ) void frmContactEditor::AddBusinessOrganisation( wxCommandEvent& event ) { - int intResult = 0; - + // Bring up the window to add an organisation. + frmContactEditorOrganisations *frameCEOrg = new frmContactEditorOrganisations ( this ); frameCEOrg->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessOrganisationsList); frameCEOrg->SetupPointers(&ContactEditorData.BusinessOrganisationsList, &ContactEditorData.BusinessOrganisationsListLanguage, &ContactEditorData.BusinessOrganisationsListSortAs, @@ -927,16 +970,19 @@ void frmContactEditor::AddBusinessOrganisation( wxCommandEvent& event ) frameCEOrg->ShowModal(); delete frameCEOrg; frameCEOrg = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessOrganisation( wxCommandEvent& event ) { + // Bring up the window to edit an organisation. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessOrganisations, + if (lboBusinessOrganisations->GetItemCount() == 0 || !GetSelectedItem(lboBusinessOrganisations, &longSelected, &intSelectedData)){ @@ -965,10 +1011,12 @@ void frmContactEditor::ModifyBusinessOrganisation( wxCommandEvent& event ) void frmContactEditor::DeleteBusinessOrganisation( wxCommandEvent& event ) { + // Bring up the window to delete a organisation. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessOrganisations, + if (lboBusinessOrganisations->GetItemCount() == 0 || !GetSelectedItem(lboBusinessOrganisations, &longSelected, &intSelectedData)){ @@ -989,11 +1037,10 @@ void frmContactEditor::DeleteBusinessOrganisation( wxCommandEvent& event ) void frmContactEditor::AddBusinessNote( wxCommandEvent& event ) { - int intResult = 0; + // Bring up the window to add a note. frmContactEditorNotes *frameCENote = new frmContactEditorNotes ( this ); frameCENote->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessNoteList); frameCENote->SetupPointers(&ContactEditorData.BusinessNoteList, &ContactEditorData.BusinessNoteListLanguage, &ContactEditorData.BusinessNoteListAltID, @@ -1006,16 +1053,19 @@ void frmContactEditor::AddBusinessNote( wxCommandEvent& event ) frameCENote->ShowModal(); delete frameCENote; frameCENote = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessNote( wxCommandEvent& event ) { + // Bring up the window to edit a note. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessNotes, + if (lboBusinessNotes->GetItemCount() == 0 || !GetSelectedItem(lboBusinessNotes, &longSelected, &intSelectedData)){ @@ -1043,10 +1093,12 @@ void frmContactEditor::ModifyBusinessNote( wxCommandEvent& event ) void frmContactEditor::DeleteBusinessNote( wxCommandEvent& event ) { + // Bring up the window to delete a note. + long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessNotes, + if (lboBusinessNotes->GetItemCount() == 0 || !GetSelectedItem(lboBusinessNotes, &longSelected, &intSelectedData)){