X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-General.cpp;h=96249b31ff300cc2f2f76521517c6ddd5b6e138f;hb=a1e5a0c50e4081cd8db37acd168c5f045d2c6e81;hp=9dc47ba3842ced336b0faf3b8a20c80c827522dd;hpb=361975db3c6ec171bd0a4271c343f97f83c31148;p=xestiaab%2F.git diff --git a/source/contacteditor/frmContactEditor-General.cpp b/source/contacteditor/frmContactEditor-General.cpp index 9dc47ba..96249b3 100644 --- a/source/contacteditor/frmContactEditor-General.cpp +++ b/source/contacteditor/frmContactEditor-General.cpp @@ -38,11 +38,8 @@ void frmContactEditor::AddGeneralNickname( wxCommandEvent& event ) // Bring up the window for adding a nickname. - int intResult = 0; - frmContactEditorNickname *frameCENickname = new frmContactEditorNickname ( this ); frameCENickname->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&ContactEditorData.GeneralNicknamesList); frameCENickname->SetupPointers(&ContactEditorData.GeneralNicknamesList, &ContactEditorData.GeneralNicknamesListAltID, &ContactEditorData.GeneralNicknamesListPID, @@ -66,7 +63,7 @@ void frmContactEditor::ModifyGeneralNickname( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboNicknames, + if (lboNicknames->GetItemCount() == 0 || !GetSelectedItem(lboNicknames, &longSelected, &intSelectedData)){ return; @@ -97,7 +94,7 @@ void frmContactEditor::DeleteGeneralNickname( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboNicknames, + if (lboNicknames->GetItemCount() == 0 || !GetSelectedItem(lboNicknames, &longSelected, &intSelectedData)){ return; @@ -121,11 +118,8 @@ void frmContactEditor::AddGeneralAddress( wxCommandEvent& event ) // Bring up the window for adding an address. - int intResult = 0; - frmContactEditorAddress *frameCEAddress = new frmContactEditorAddress ( this ); frameCEAddress->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&ContactEditorData.GeneralAddressList); frameCEAddress->SetupPointers(&ContactEditorData.GeneralAddressList, &ContactEditorData.GeneralAddressListTown, &ContactEditorData.GeneralAddressListCounty, @@ -157,7 +151,7 @@ void frmContactEditor::ModifyGeneralAddress( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboAddresses, + if (lboAddresses->GetItemCount() == 0 || !GetSelectedItem(lboAddresses, &longSelected, &intSelectedData)){ @@ -204,7 +198,7 @@ void frmContactEditor::DeleteGeneralAddress( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboAddresses, + if (lboAddresses->GetItemCount() == 0 || !GetSelectedItem(lboAddresses, &longSelected, &intSelectedData)){ @@ -231,11 +225,8 @@ void frmContactEditor::AddGeneralEmail( wxCommandEvent& event ) // Bring up the window for adding an email. - int intResult = 0; - frmContactEditorEmail *frameCEEmail = new frmContactEditorEmail ( this ); frameCEEmail->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&ContactEditorData.GeneralAddressList); frameCEEmail->SetupPointers(&ContactEditorData.GeneralEmailList, &ContactEditorData.GeneralEmailListAltID, &ContactEditorData.GeneralEmailListPID, @@ -258,7 +249,7 @@ void frmContactEditor::ModifyGeneralEmail( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboEmails, + if (lboEmails->GetItemCount() == 0 || !GetSelectedItem(lboEmails, &longSelected, &intSelectedData)){ @@ -290,7 +281,7 @@ void frmContactEditor::DeleteGeneralEmail( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboEmails, + if (lboEmails->GetItemCount() == 0 || !GetSelectedItem(lboEmails, &longSelected, &intSelectedData)){ @@ -311,12 +302,9 @@ void frmContactEditor::AddGeneralIM( wxCommandEvent& event ) { // Bring up the window for adding a IM address. - - int intResult = 0; frmContactEditorIM *frameCEIM = new frmContactEditorIM ( this ); frameCEIM->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&ContactEditorData.GeneralIMList); frameCEIM->SetupPointers(&ContactEditorData.GeneralIMList, &ContactEditorData.GeneralIMListAltID, &ContactEditorData.GeneralIMListPID, @@ -341,7 +329,7 @@ void frmContactEditor::ModifyGeneralIM( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboIM, + if (lboIM->GetItemCount() == 0 || !GetSelectedItem(lboIM, &longSelected, &intSelectedData)){ @@ -375,7 +363,7 @@ void frmContactEditor::DeleteGeneralIM( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboIM, + if (lboIM->GetItemCount() == 0 || !GetSelectedItem(lboIM, &longSelected, &intSelectedData)){ @@ -396,12 +384,9 @@ void frmContactEditor::AddGeneralTelephone( wxCommandEvent& event ) { // Bring up the window for adding a telephone. - - int intResult = 0; frmContactEditorTelephone *frameCETel = new frmContactEditorTelephone ( this ); frameCETel->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&ContactEditorData.GeneralTelephoneList); frameCETel->SetupPointers(&ContactEditorData.GeneralTelephoneList, &ContactEditorData.GeneralTelephoneListAltID, &ContactEditorData.GeneralTelephoneListPID, @@ -425,7 +410,7 @@ void frmContactEditor::ModifyGeneralTelephone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboTelephone, + if (lboTelephone->GetItemCount() == 0 || !GetSelectedItem(lboTelephone, &longSelected, &intSelectedData)){ @@ -458,7 +443,7 @@ void frmContactEditor::DeleteGeneralTelephone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboTelephone, + if (lboTelephone->GetItemCount() == 0 || !GetSelectedItem(lboTelephone, &longSelected, &intSelectedData)){ @@ -479,12 +464,9 @@ void frmContactEditor::AddGeneralLanguages( wxCommandEvent& event ) { // Bring up the window for adding a language. - - int intResult = 0; frmContactEditorLanguages *frameCELang = new frmContactEditorLanguages ( this ); frameCELang->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&ContactEditorData.GeneralLanguageList); frameCELang->SetupPointers(&ContactEditorData.GeneralLanguageList, &ContactEditorData.GeneralLanguageListAltID, &ContactEditorData.GeneralLanguageListPID, @@ -507,7 +489,7 @@ void frmContactEditor::ModifyGeneralLanguages( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboLanguages, + if (lboLanguages->GetItemCount() == 0 || !GetSelectedItem(lboLanguages, &longSelected, &intSelectedData)){ @@ -539,7 +521,7 @@ void frmContactEditor::DeleteGeneralLanguage( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboLanguages, + if (lboLanguages->GetItemCount() == 0 || !GetSelectedItem(lboLanguages, &longSelected, &intSelectedData)){ @@ -559,12 +541,9 @@ void frmContactEditor::AddGeneralTimezone( wxCommandEvent& event ) { // Bring up the window for adding a timezone. - - int intResult = 0; frmContactEditorTimezones *frameCETZ = new frmContactEditorTimezones ( this ); frameCETZ->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&ContactEditorData.GeneralTZList); frameCETZ->SetupPointers(&ContactEditorData.GeneralTZList, &ContactEditorData.GeneralTZListAltID, &ContactEditorData.GeneralTZListPID, @@ -588,7 +567,7 @@ void frmContactEditor::ModifyGeneralTimezone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboTimezones, + if (lboTimezones->GetItemCount() == 0 || !GetSelectedItem(lboTimezones, &longSelected, &intSelectedData)){ @@ -620,7 +599,7 @@ void frmContactEditor::DeleteGeneralTimezone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboTimezones, + if (lboTimezones->GetItemCount() == 0 || !GetSelectedItem(lboTimezones, &longSelected, &intSelectedData)){ @@ -641,12 +620,9 @@ void frmContactEditor::AddGeneralGeoposition( wxCommandEvent& event ) { // Bring up the window for adding a geoposition location. - - int intResult = 0; frmContactEditorGeoposition *frameCEGeo = new frmContactEditorGeoposition ( this ); frameCEGeo->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&ContactEditorData.GeneralGeographyList); frameCEGeo->SetupPointers(&ContactEditorData.GeneralGeographyList, &ContactEditorData.GeneralGeographyListAltID, &ContactEditorData.GeneralGeographyListPID, @@ -671,7 +647,7 @@ void frmContactEditor::ModifyGeneralGeoposition( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboGeoposition, + if (lboGeoposition->GetItemCount() == 0 || !GetSelectedItem(lboGeoposition, &longSelected, &intSelectedData)){ @@ -706,7 +682,7 @@ void frmContactEditor::DeleteGeneralGeoposition( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboGeoposition, + if (lboGeoposition->GetItemCount() == 0 || !GetSelectedItem(lboGeoposition, &longSelected, &intSelectedData)){ @@ -728,12 +704,9 @@ void frmContactEditor::AddGeneralRelated( wxCommandEvent& event ) { // Bring up the window for adding a relation. - - int intResult = 0; frmContactEditorRelated *frameCERel = new frmContactEditorRelated ( this ); frameCERel->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&ContactEditorData.GeneralRelatedList); frameCERel->SetupPointers(&ContactEditorData.GeneralRelatedList, &ContactEditorData.GeneralRelatedListRelType, &ContactEditorData.GeneralRelatedListAltID, @@ -757,7 +730,7 @@ void frmContactEditor::ModifyGeneralRelated( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboRelated, + if (lboRelated->GetItemCount() == 0 || !GetSelectedItem(lboRelated, &longSelected, &intSelectedData)){ @@ -790,7 +763,7 @@ void frmContactEditor::DeleteGeneralRelated( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboRelated, + if (lboRelated->GetItemCount() == 0 || !GetSelectedItem(lboRelated, &longSelected, &intSelectedData)){ @@ -811,12 +784,9 @@ void frmContactEditor::AddGeneralWebsite( wxCommandEvent& event ) { // Bring up a window for adding a website. - - int intResult = 0; frmContactEditorWebsites *frameCEWeb = new frmContactEditorWebsites ( this ); frameCEWeb->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&ContactEditorData.GeneralWebsiteList); frameCEWeb->SetupPointers(&ContactEditorData.GeneralWebsiteList, &ContactEditorData.GeneralWebsiteListAltID, &ContactEditorData.GeneralWebsiteListPID, @@ -840,7 +810,7 @@ void frmContactEditor::ModifyGeneralWebsite( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboWebsites, + if (lboWebsites->GetItemCount() == 0 || !GetSelectedItem(lboWebsites, &longSelected, &intSelectedData)){ @@ -873,7 +843,7 @@ void frmContactEditor::DeleteGeneralWebsite( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboWebsites, + if (lboWebsites->GetItemCount() == 0 || !GetSelectedItem(lboWebsites, &longSelected, &intSelectedData)){ @@ -894,12 +864,9 @@ void frmContactEditor::AddGeneralTitle( wxCommandEvent& event ) { // Bring up the window for adding a title. - - int intResult = 0; frmContactEditorTitles *frameCETitle = new frmContactEditorTitles ( this ); frameCETitle->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&ContactEditorData.GeneralTitleList); frameCETitle->SetupPointers(&ContactEditorData.GeneralTitleList, &ContactEditorData.GeneralTitleListLanguage, &ContactEditorData.GeneralTitleListAltID, @@ -923,7 +890,7 @@ void frmContactEditor::ModifyGeneralTitle( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboTitles, + if (lboTitles->GetItemCount() == 0 || !GetSelectedItem(lboTitles, &longSelected, &intSelectedData)){ @@ -956,7 +923,7 @@ void frmContactEditor::DeleteGeneralTitle( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboTitles, + if (lboTitles->GetItemCount() == 0 || !GetSelectedItem(lboTitles, &longSelected, &intSelectedData)){ @@ -977,12 +944,9 @@ void frmContactEditor::AddGeneralRole( wxCommandEvent& event ) { // Bring up the window for adding a role. - - int intResult = 0; frmContactEditorRoles *frameCERole = new frmContactEditorRoles ( this ); frameCERole->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&ContactEditorData.GeneralRoleList); frameCERole->SetupPointers(&ContactEditorData.GeneralRoleList, &ContactEditorData.GeneralRoleListLanguage, &ContactEditorData.GeneralRoleListAltID, @@ -1006,7 +970,7 @@ void frmContactEditor::ModifyGeneralRole( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboRoles, + if (lboRoles->GetItemCount() == 0 || !GetSelectedItem(lboRoles, &longSelected, &intSelectedData)){ @@ -1039,7 +1003,7 @@ void frmContactEditor::DeleteGeneralRole( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboRoles, + if (lboRoles->GetItemCount() == 0 || !GetSelectedItem(lboRoles, &longSelected, &intSelectedData)){ @@ -1060,12 +1024,9 @@ void frmContactEditor::AddGeneralOrganisation( wxCommandEvent& event ) { // Bring up the window for adding an organisation. - - int intResult = 0; frmContactEditorOrganisations *frameCEOrg = new frmContactEditorOrganisations ( this ); frameCEOrg->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&ContactEditorData.GeneralOrganisationsList); frameCEOrg->SetupPointers(&ContactEditorData.GeneralOrganisationsList, &ContactEditorData.GeneralOrganisationsListLanguage, &ContactEditorData.GeneralOrganisationsListSortAs, @@ -1090,7 +1051,7 @@ void frmContactEditor::ModifyGeneralOrganisation( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboOrganisations, + if (lboOrganisations->GetItemCount() == 0 || !GetSelectedItem(lboOrganisations, &longSelected, &intSelectedData)){ @@ -1124,7 +1085,7 @@ void frmContactEditor::DeleteGeneralOrganisation( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboOrganisations, + if (lboOrganisations->GetItemCount() == 0 || !GetSelectedItem(lboOrganisations, &longSelected, &intSelectedData)){ @@ -1146,12 +1107,9 @@ void frmContactEditor::AddGeneralNote( wxCommandEvent& event ) { // Bring up the window for adding a note. - - int intResult = 0; frmContactEditorNotes *frameCENote = new frmContactEditorNotes ( this ); frameCENote->SetEditorMode(FALSE, CE_GENERAL); - intResult = GetLastInt(&ContactEditorData.GeneralNoteList); frameCENote->SetupPointers(&ContactEditorData.GeneralNoteList, &ContactEditorData.GeneralNoteListLanguage, &ContactEditorData.GeneralNoteListAltID, @@ -1175,7 +1133,7 @@ void frmContactEditor::ModifyGeneralNote( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboNotes, + if (lboNotes->GetItemCount() == 0 || !GetSelectedItem(lboNotes, &longSelected, &intSelectedData)){ @@ -1208,7 +1166,7 @@ void frmContactEditor::DeleteGeneralNote( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboNotes, + if (lboBusinessNotes->GetItemCount() == 0 || !GetSelectedItem(lboNotes, &longSelected, &intSelectedData)){