X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Business.cpp;h=16413937ac5c39c8a256c7b07f906758f5aeebbd;hb=bac054ea5eda94fe663d8b1a7c680ae80de8075c;hp=a5e39c7dd14dbbe1f6405231e7cda5c5aca9b0d6;hpb=f1af82fb637114dfc67e72356c0322928231bebf;p=xestiaab%2F.git diff --git a/source/contacteditor/frmContactEditor-Business.cpp b/source/contacteditor/frmContactEditor-Business.cpp index a5e39c7..1641393 100644 --- a/source/contacteditor/frmContactEditor-Business.cpp +++ b/source/contacteditor/frmContactEditor-Business.cpp @@ -37,12 +37,9 @@ void frmContactEditor::AddBusinessNickname( wxCommandEvent& event ) { // Bring up the window for adding a nickname. - - int intResult = 0; - + frmContactEditorNickname *frameCENickname = new frmContactEditorNickname ( this ); frameCENickname->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessNicknamesList); frameCENickname->SetupPointers(&ContactEditorData.BusinessNicknamesList, &ContactEditorData.BusinessNicknamesListAltID, &ContactEditorData.BusinessNicknamesListPID, @@ -55,7 +52,8 @@ void frmContactEditor::AddBusinessNickname( wxCommandEvent& event ) frameCENickname->ShowModal(); delete frameCENickname; frameCENickname = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessNickname( wxCommandEvent& event ) @@ -66,7 +64,7 @@ void frmContactEditor::ModifyBusinessNickname( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessNicknames, + if (lboBusinessNicknames->GetItemCount() == 0 || !GetSelectedItem(lboBusinessNicknames, &longSelected, &intSelectedData)){ @@ -99,7 +97,7 @@ void frmContactEditor::DeleteBusinessNickname( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessNicknames, + if (lboBusinessNicknames->GetItemCount() == 0 || !GetSelectedItem(lboBusinessNicknames, &longSelected, &intSelectedData)){ @@ -124,12 +122,9 @@ void frmContactEditor::AddBusinessAddress( wxCommandEvent& event ) { // Bring up the window for adding an address. - - int intResult = 0; frmContactEditorAddress *frameCEAddress = new frmContactEditorAddress ( this ); frameCEAddress->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessAddressList); frameCEAddress->SetupPointers(&ContactEditorData.BusinessAddressList, &ContactEditorData.BusinessAddressListTown, &ContactEditorData.BusinessAddressListCounty, @@ -150,7 +145,8 @@ void frmContactEditor::AddBusinessAddress( wxCommandEvent& event ) frameCEAddress->ShowModal(); delete frameCEAddress; frameCEAddress = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessAddress( wxCommandEvent& event ) @@ -161,7 +157,7 @@ void frmContactEditor::ModifyBusinessAddress( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessAddresses, + if (lboBusinessAddresses->GetItemCount() == 0 || !GetSelectedItem(lboBusinessAddresses, &longSelected, &intSelectedData)){ @@ -202,7 +198,7 @@ void frmContactEditor::DeleteBusinessAddress( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessAddresses, + if (lboBusinessAddresses->GetItemCount() == 0 || !GetSelectedItem(lboBusinessAddresses, &longSelected, &intSelectedData)){ @@ -227,12 +223,9 @@ void frmContactEditor::AddBusinessEmail( wxCommandEvent& event ) { // Bring up the window for adding an email address. - - int intResult = 0; frmContactEditorEmail *frameCEEmail = new frmContactEditorEmail ( this ); frameCEEmail->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessAddressList); frameCEEmail->SetupPointers(&ContactEditorData.BusinessEmailList, &ContactEditorData.BusinessEmailListAltID, &ContactEditorData.BusinessEmailListPID, @@ -244,7 +237,8 @@ void frmContactEditor::AddBusinessEmail( wxCommandEvent& event ) frameCEEmail->ShowModal(); delete frameCEEmail; frameCEEmail = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessEmail( wxCommandEvent& event ) @@ -255,7 +249,7 @@ void frmContactEditor::ModifyBusinessEmail( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessEmail, + if (lboBusinessEmail->GetItemCount() == 0 || !GetSelectedItem(lboBusinessEmail, &longSelected, &intSelectedData)){ @@ -287,7 +281,7 @@ void frmContactEditor::DeleteBusinessEmail( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessEmail, + if (lboBusinessEmail->GetItemCount() == 0 || !GetSelectedItem(lboBusinessEmail, &longSelected, &intSelectedData)){ @@ -308,12 +302,9 @@ void frmContactEditor::AddBusinessIM( wxCommandEvent& event ) { // Bring up the window for adding an IM address. - - int intResult = 0; frmContactEditorIM *frameCEIM = new frmContactEditorIM ( this ); frameCEIM->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessIMList); frameCEIM->SetupPointers(&ContactEditorData.BusinessIMList, &ContactEditorData.BusinessIMListAltID, &ContactEditorData.BusinessIMListPID, @@ -327,7 +318,8 @@ void frmContactEditor::AddBusinessIM( wxCommandEvent& event ) frameCEIM->ShowModal(); delete frameCEIM; frameCEIM = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessIM( wxCommandEvent& event ) @@ -338,7 +330,7 @@ void frmContactEditor::ModifyBusinessIM( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessIM, + if (lboBusinessIM->GetItemCount() == 0 || !GetSelectedItem(lboBusinessIM, &longSelected, &intSelectedData)){ @@ -372,7 +364,7 @@ void frmContactEditor::DeleteBusinessIM( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessIM, + if (lboBusinessIM->GetItemCount() == 0 || !GetSelectedItem(lboBusinessIM, &longSelected, &intSelectedData)){ @@ -394,12 +386,9 @@ void frmContactEditor::AddBusinessTelephone( wxCommandEvent& event ) { // Bring up the window for adding a telephone number. - - int intResult = 0; frmContactEditorTelephone *frameCETel = new frmContactEditorTelephone ( this ); frameCETel->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessTelephoneList); frameCETel->SetupPointers(&ContactEditorData.BusinessTelephoneList, &ContactEditorData.BusinessTelephoneListAltID, &ContactEditorData.BusinessTelephoneListPID, @@ -412,7 +401,8 @@ void frmContactEditor::AddBusinessTelephone( wxCommandEvent& event ) frameCETel->ShowModal(); delete frameCETel; frameCETel = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessTelephone( wxCommandEvent& event ) @@ -423,7 +413,7 @@ void frmContactEditor::ModifyBusinessTelephone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTelephone, + if (lboBusinessTelephone->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTelephone, &longSelected, &intSelectedData)){ @@ -456,7 +446,7 @@ void frmContactEditor::DeleteBusinessTelephone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTelephone, + if (lboBusinessTelephone->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTelephone, &longSelected, &intSelectedData)){ @@ -477,12 +467,9 @@ void frmContactEditor::AddBusinessLanguage( wxCommandEvent& event ) { // Bring up the window for adding a language. - - int intResult = 0; frmContactEditorLanguages *frameCELang = new frmContactEditorLanguages ( this ); frameCELang->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessLanguageList); frameCELang->SetupPointers(&ContactEditorData.BusinessLanguageList, &ContactEditorData.BusinessLanguageListAltID, &ContactEditorData.BusinessLanguageListPID, @@ -494,7 +481,8 @@ void frmContactEditor::AddBusinessLanguage( wxCommandEvent& event ) frameCELang->ShowModal(); delete frameCELang; frameCELang = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessLanguage( wxCommandEvent& event ) @@ -505,7 +493,7 @@ void frmContactEditor::ModifyBusinessLanguage( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessLanguages, + if (lboBusinessLanguages->GetItemCount() == 0 || !GetSelectedItem(lboBusinessLanguages, &longSelected, &intSelectedData)){ @@ -537,7 +525,7 @@ void frmContactEditor::DeleteBusinessLanguage( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessLanguages, + if (lboBusinessLanguages->GetItemCount() == 0 || !GetSelectedItem(lboBusinessLanguages, &longSelected, &intSelectedData)){ @@ -558,12 +546,9 @@ void frmContactEditor::AddBusinessTimezone( wxCommandEvent& event ) { // Bring up the window for adding a timezone. - - int intResult = 0; frmContactEditorTimezones *frameCETZ = new frmContactEditorTimezones ( this ); frameCETZ->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessTZList); frameCETZ->SetupPointers(&ContactEditorData.BusinessTZList, &ContactEditorData.BusinessTZListAltID, &ContactEditorData.BusinessTZListPID, @@ -576,7 +561,8 @@ void frmContactEditor::AddBusinessTimezone( wxCommandEvent& event ) frameCETZ->ShowModal(); delete frameCETZ; frameCETZ = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessTimezone( wxCommandEvent& event ) @@ -587,7 +573,7 @@ void frmContactEditor::ModifyBusinessTimezone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTimezones, + if (lboBusinessTimezones->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTimezones, &longSelected, &intSelectedData)){ @@ -620,7 +606,7 @@ void frmContactEditor::DeleteBusinessTimezone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTimezones, + if (lboBusinessTimezones->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTimezones, &longSelected, &intSelectedData)){ @@ -641,12 +627,9 @@ void frmContactEditor::AddBusinessGeoposition( wxCommandEvent& event ) { // Bring up the window for adding a geoposition location. - - int intResult = 0; frmContactEditorGeoposition *frameCEGeo = new frmContactEditorGeoposition ( this ); frameCEGeo->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessGeographyList); frameCEGeo->SetupPointers(&ContactEditorData.BusinessGeographyList, &ContactEditorData.BusinessGeographyListAltID, &ContactEditorData.BusinessGeographyListPID, @@ -660,7 +643,8 @@ void frmContactEditor::AddBusinessGeoposition( wxCommandEvent& event ) frameCEGeo->ShowModal(); delete frameCEGeo; frameCEGeo = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessGeoposition( wxCommandEvent& event ) @@ -671,7 +655,7 @@ void frmContactEditor::ModifyBusinessGeoposition( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessGeoposition, + if (lboBusinessGeoposition->GetItemCount() == 0 || !GetSelectedItem(lboBusinessGeoposition, &longSelected, &intSelectedData)){ @@ -705,7 +689,7 @@ void frmContactEditor::DeleteBusinessGeoposition( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessGeoposition, + if (lboBusinessGeoposition->GetItemCount() == 0 || !GetSelectedItem(lboBusinessGeoposition, &longSelected, &intSelectedData)){ @@ -727,12 +711,9 @@ void frmContactEditor::AddBusinessWebsite( wxCommandEvent& event ) { // Bring up the window for adding a website. - - int intResult = 0; frmContactEditorWebsites *frameCEWeb = new frmContactEditorWebsites ( this ); frameCEWeb->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessWebsiteList); frameCEWeb->SetupPointers(&ContactEditorData.BusinessWebsiteList, &ContactEditorData.BusinessWebsiteListAltID, &ContactEditorData.BusinessWebsiteListPID, @@ -745,7 +726,8 @@ void frmContactEditor::AddBusinessWebsite( wxCommandEvent& event ) frameCEWeb->ShowModal(); delete frameCEWeb; frameCEWeb = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessWebsite( wxCommandEvent& event ) @@ -756,7 +738,7 @@ void frmContactEditor::ModifyBusinessWebsite( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessWebsites, + if (lboBusinessWebsites->GetItemCount() == 0 || !GetSelectedItem(lboBusinessWebsites, &longSelected, &intSelectedData)){ @@ -789,7 +771,7 @@ void frmContactEditor::DeleteBusinessWebsite( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessWebsites, + if (lboBusinessWebsites->GetItemCount() == 0 || !GetSelectedItem(lboBusinessWebsites, &longSelected, &intSelectedData)){ @@ -810,12 +792,9 @@ void frmContactEditor::AddBusinessTitle( wxCommandEvent& event ) { // Bring up the window for adding a title. - - int intResult = 0; frmContactEditorTitles *frameCETitle = new frmContactEditorTitles ( this ); frameCETitle->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessTitleList); frameCETitle->SetupPointers(&ContactEditorData.BusinessTitleList, &ContactEditorData.BusinessTitleListLanguage, &ContactEditorData.BusinessTitleListAltID, @@ -828,7 +807,8 @@ void frmContactEditor::AddBusinessTitle( wxCommandEvent& event ) frameCETitle->ShowModal(); delete frameCETitle; frameCETitle = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessTitle( wxCommandEvent& event ) @@ -839,7 +819,7 @@ void frmContactEditor::ModifyBusinessTitle( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTitles, + if (lboBusinessTitles->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTitles, &longSelected, &intSelectedData)){ @@ -872,7 +852,7 @@ void frmContactEditor::DeleteBusinessTitle( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTitles, + if (lboBusinessTitles->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTitles, &longSelected, &intSelectedData)){ @@ -880,7 +860,7 @@ void frmContactEditor::DeleteBusinessTitle( wxCommandEvent& event ) } - lboTitles->DeleteItem(longSelected); + lboBusinessTitles->DeleteItem(longSelected); DeleteMapData(intSelectedData, &ContactEditorData.BusinessTitleList, &ContactEditorData.BusinessTitleListLanguage, &ContactEditorData.BusinessTitleListAltID, @@ -893,12 +873,9 @@ void frmContactEditor::AddBusinessRole( wxCommandEvent& event ) { // Bring up the window to add a role. - - int intResult = 0; frmContactEditorRoles *frameCERole = new frmContactEditorRoles ( this ); frameCERole->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessRoleList); frameCERole->SetupPointers(&ContactEditorData.BusinessRoleList, &ContactEditorData.BusinessRoleListLanguage, &ContactEditorData.BusinessRoleListAltID, @@ -911,7 +888,8 @@ void frmContactEditor::AddBusinessRole( wxCommandEvent& event ) frameCERole->ShowModal(); delete frameCERole; frameCERole = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessRole( wxCommandEvent& event ) @@ -922,7 +900,7 @@ void frmContactEditor::ModifyBusinessRole( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessRoles, + if (lboBusinessRoles->GetItemCount() == 0 || !GetSelectedItem(lboBusinessRoles, &longSelected, &intSelectedData)){ @@ -955,7 +933,7 @@ void frmContactEditor::DeleteBusinessRole( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessRoles, + if (lboBusinessRoles->GetItemCount() == 0 || !GetSelectedItem(lboBusinessRoles, &longSelected, &intSelectedData)){ @@ -977,11 +955,8 @@ void frmContactEditor::AddBusinessOrganisation( wxCommandEvent& event ) // Bring up the window to add an organisation. - int intResult = 0; - frmContactEditorOrganisations *frameCEOrg = new frmContactEditorOrganisations ( this ); frameCEOrg->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessOrganisationsList); frameCEOrg->SetupPointers(&ContactEditorData.BusinessOrganisationsList, &ContactEditorData.BusinessOrganisationsListLanguage, &ContactEditorData.BusinessOrganisationsListSortAs, @@ -995,7 +970,8 @@ void frmContactEditor::AddBusinessOrganisation( wxCommandEvent& event ) frameCEOrg->ShowModal(); delete frameCEOrg; frameCEOrg = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessOrganisation( wxCommandEvent& event ) @@ -1006,7 +982,7 @@ void frmContactEditor::ModifyBusinessOrganisation( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessOrganisations, + if (lboBusinessOrganisations->GetItemCount() == 0 || !GetSelectedItem(lboBusinessOrganisations, &longSelected, &intSelectedData)){ @@ -1040,7 +1016,7 @@ void frmContactEditor::DeleteBusinessOrganisation( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessOrganisations, + if (lboBusinessOrganisations->GetItemCount() == 0 || !GetSelectedItem(lboBusinessOrganisations, &longSelected, &intSelectedData)){ @@ -1062,12 +1038,9 @@ void frmContactEditor::AddBusinessNote( wxCommandEvent& event ) { // Bring up the window to add a note. - - int intResult = 0; frmContactEditorNotes *frameCENote = new frmContactEditorNotes ( this ); frameCENote->SetEditorMode(FALSE, CE_WORK); - intResult = GetLastInt(&ContactEditorData.BusinessNoteList); frameCENote->SetupPointers(&ContactEditorData.BusinessNoteList, &ContactEditorData.BusinessNoteListLanguage, &ContactEditorData.BusinessNoteListAltID, @@ -1080,7 +1053,8 @@ void frmContactEditor::AddBusinessNote( wxCommandEvent& event ) frameCENote->ShowModal(); delete frameCENote; frameCENote = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyBusinessNote( wxCommandEvent& event ) @@ -1091,7 +1065,7 @@ void frmContactEditor::ModifyBusinessNote( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessNotes, + if (lboBusinessNotes->GetItemCount() == 0 || !GetSelectedItem(lboBusinessNotes, &longSelected, &intSelectedData)){ @@ -1124,7 +1098,7 @@ void frmContactEditor::DeleteBusinessNote( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessNotes, + if (lboBusinessNotes->GetItemCount() == 0 || !GetSelectedItem(lboBusinessNotes, &longSelected, &intSelectedData)){