From 66582143bc7b3e31b38abcb86da63fd8f2f61415 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Mon, 28 Aug 2017 22:11:52 +0100 Subject: [PATCH] frmContactEditor: Stop crashing when pressing Modify/Delete buttons when there's no items --- .../frmContactEditor-Business.cpp | 52 ++++++++--------- .../frmContactEditor-Calendar.cpp | 12 ++-- .../frmContactEditor-Category.cpp | 4 +- .../frmContactEditor-General.cpp | 56 +++++++++---------- .../contacteditor/frmContactEditor-Groups.cpp | 2 +- .../contacteditor/frmContactEditor-Home.cpp | 52 ++++++++--------- source/contacteditor/frmContactEditor-Key.cpp | 4 +- .../contacteditor/frmContactEditor-Logo.cpp | 8 +-- .../contacteditor/frmContactEditor-Other.cpp | 8 +-- .../frmContactEditor-Picture.cpp | 8 +-- .../contacteditor/frmContactEditor-Sound.cpp | 8 +-- 11 files changed, 107 insertions(+), 107 deletions(-) diff --git a/source/contacteditor/frmContactEditor-Business.cpp b/source/contacteditor/frmContactEditor-Business.cpp index 0bd693e..245b348 100644 --- a/source/contacteditor/frmContactEditor-Business.cpp +++ b/source/contacteditor/frmContactEditor-Business.cpp @@ -63,7 +63,7 @@ void frmContactEditor::ModifyBusinessNickname( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessNicknames, + if (lboBusinessNicknames->GetItemCount() == 0 || !GetSelectedItem(lboBusinessNicknames, &longSelected, &intSelectedData)){ @@ -96,7 +96,7 @@ void frmContactEditor::DeleteBusinessNickname( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessNicknames, + if (lboBusinessNicknames->GetItemCount() == 0 || !GetSelectedItem(lboBusinessNicknames, &longSelected, &intSelectedData)){ @@ -155,7 +155,7 @@ void frmContactEditor::ModifyBusinessAddress( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessAddresses, + if (lboBusinessAddresses->GetItemCount() == 0 || !GetSelectedItem(lboBusinessAddresses, &longSelected, &intSelectedData)){ @@ -196,7 +196,7 @@ void frmContactEditor::DeleteBusinessAddress( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessAddresses, + if (lboBusinessAddresses->GetItemCount() == 0 || !GetSelectedItem(lboBusinessAddresses, &longSelected, &intSelectedData)){ @@ -246,7 +246,7 @@ void frmContactEditor::ModifyBusinessEmail( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessEmail, + if (lboBusinessEmail->GetItemCount() == 0 || !GetSelectedItem(lboBusinessEmail, &longSelected, &intSelectedData)){ @@ -278,7 +278,7 @@ void frmContactEditor::DeleteBusinessEmail( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessEmail, + if (lboBusinessEmail->GetItemCount() == 0 || !GetSelectedItem(lboBusinessEmail, &longSelected, &intSelectedData)){ @@ -326,7 +326,7 @@ void frmContactEditor::ModifyBusinessIM( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessIM, + if (lboBusinessIM->GetItemCount() == 0 || !GetSelectedItem(lboBusinessIM, &longSelected, &intSelectedData)){ @@ -360,7 +360,7 @@ void frmContactEditor::DeleteBusinessIM( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessIM, + if (lboBusinessIM->GetItemCount() == 0 || !GetSelectedItem(lboBusinessIM, &longSelected, &intSelectedData)){ @@ -408,7 +408,7 @@ void frmContactEditor::ModifyBusinessTelephone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTelephone, + if (lboBusinessTelephone->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTelephone, &longSelected, &intSelectedData)){ @@ -441,7 +441,7 @@ void frmContactEditor::DeleteBusinessTelephone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTelephone, + if (lboBusinessTelephone->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTelephone, &longSelected, &intSelectedData)){ @@ -487,7 +487,7 @@ void frmContactEditor::ModifyBusinessLanguage( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessLanguages, + if (lboBusinessLanguages->GetItemCount() == 0 || !GetSelectedItem(lboBusinessLanguages, &longSelected, &intSelectedData)){ @@ -519,7 +519,7 @@ void frmContactEditor::DeleteBusinessLanguage( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessLanguages, + if (lboBusinessLanguages->GetItemCount() == 0 || !GetSelectedItem(lboBusinessLanguages, &longSelected, &intSelectedData)){ @@ -566,7 +566,7 @@ void frmContactEditor::ModifyBusinessTimezone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTimezones, + if (lboBusinessTimezones->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTimezones, &longSelected, &intSelectedData)){ @@ -599,7 +599,7 @@ void frmContactEditor::DeleteBusinessTimezone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTimezones, + if (lboBusinessTimezones->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTimezones, &longSelected, &intSelectedData)){ @@ -647,7 +647,7 @@ void frmContactEditor::ModifyBusinessGeoposition( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessGeoposition, + if (lboBusinessGeoposition->GetItemCount() == 0 || !GetSelectedItem(lboBusinessGeoposition, &longSelected, &intSelectedData)){ @@ -681,7 +681,7 @@ void frmContactEditor::DeleteBusinessGeoposition( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessGeoposition, + if (lboBusinessGeoposition->GetItemCount() == 0 || !GetSelectedItem(lboBusinessGeoposition, &longSelected, &intSelectedData)){ @@ -729,7 +729,7 @@ void frmContactEditor::ModifyBusinessWebsite( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessWebsites, + if (lboBusinessWebsites->GetItemCount() == 0 || !GetSelectedItem(lboBusinessWebsites, &longSelected, &intSelectedData)){ @@ -762,7 +762,7 @@ void frmContactEditor::DeleteBusinessWebsite( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessWebsites, + if (lboBusinessWebsites->GetItemCount() == 0 || !GetSelectedItem(lboBusinessWebsites, &longSelected, &intSelectedData)){ @@ -809,7 +809,7 @@ void frmContactEditor::ModifyBusinessTitle( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTitles, + if (lboBusinessTitles->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTitles, &longSelected, &intSelectedData)){ @@ -842,7 +842,7 @@ void frmContactEditor::DeleteBusinessTitle( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessTitles, + if (lboBusinessTitles->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTitles, &longSelected, &intSelectedData)){ @@ -889,7 +889,7 @@ void frmContactEditor::ModifyBusinessRole( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessRoles, + if (lboBusinessRoles->GetItemCount() == 0 || !GetSelectedItem(lboBusinessRoles, &longSelected, &intSelectedData)){ @@ -922,7 +922,7 @@ void frmContactEditor::DeleteBusinessRole( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessRoles, + if (lboBusinessRoles->GetItemCount() == 0 || !GetSelectedItem(lboBusinessRoles, &longSelected, &intSelectedData)){ @@ -970,7 +970,7 @@ void frmContactEditor::ModifyBusinessOrganisation( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessOrganisations, + if (lboBusinessOrganisations->GetItemCount() == 0 || !GetSelectedItem(lboBusinessOrganisations, &longSelected, &intSelectedData)){ @@ -1004,7 +1004,7 @@ void frmContactEditor::DeleteBusinessOrganisation( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessOrganisations, + if (lboBusinessOrganisations->GetItemCount() == 0 || !GetSelectedItem(lboBusinessOrganisations, &longSelected, &intSelectedData)){ @@ -1052,7 +1052,7 @@ void frmContactEditor::ModifyBusinessNote( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessNotes, + if (lboBusinessNotes->GetItemCount() == 0 || !GetSelectedItem(lboBusinessNotes, &longSelected, &intSelectedData)){ @@ -1085,7 +1085,7 @@ void frmContactEditor::DeleteBusinessNote( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboBusinessNotes, + if (lboBusinessNotes->GetItemCount() == 0 || !GetSelectedItem(lboBusinessNotes, &longSelected, &intSelectedData)){ diff --git a/source/contacteditor/frmContactEditor-Calendar.cpp b/source/contacteditor/frmContactEditor-Calendar.cpp index e4b8135..083dc80 100644 --- a/source/contacteditor/frmContactEditor-Calendar.cpp +++ b/source/contacteditor/frmContactEditor-Calendar.cpp @@ -48,7 +48,7 @@ void frmContactEditor::ModifyCalendarAddress( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboCalendarAddresses, + if (lboCalendarAddresses->GetItemCount() == 0 || !GetSelectedItem(lboCalendarAddresses, &longSelected, &intSelectedData)){ @@ -80,7 +80,7 @@ void frmContactEditor::DeleteCalendarAddress( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboCalendarAddresses, + if (lboCalendarAddresses->GetItemCount() == 0 || !GetSelectedItem(lboCalendarAddresses, &longSelected, &intSelectedData)){ @@ -125,7 +125,7 @@ void frmContactEditor::ModifyCalendarRequest( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboCalendarRequestAddress, + if (lboCalendarRequestAddress->GetItemCount() == 0 || !GetSelectedItem(lboCalendarRequestAddress, &longSelected, &intSelectedData)){ @@ -157,7 +157,7 @@ void frmContactEditor::DeleteCalendarRequest( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboCalendarRequestAddress, + if (lboCalendarRequestAddress->GetItemCount() == 0 || !GetSelectedItem(lboCalendarRequestAddress, &longSelected, &intSelectedData)){ @@ -203,7 +203,7 @@ void frmContactEditor::ModifyFreeBusy( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboFreeBusyAddresses, + if (lboFreeBusyAddresses->GetItemCount() == 0 || !GetSelectedItem(lboFreeBusyAddresses, &longSelected, &intSelectedData)){ @@ -235,7 +235,7 @@ void frmContactEditor::DeleteFreeBusy( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboFreeBusyAddresses, + if (lboFreeBusyAddresses->GetItemCount() == 0 || !GetSelectedItem(lboFreeBusyAddresses, &longSelected, &intSelectedData)){ diff --git a/source/contacteditor/frmContactEditor-Category.cpp b/source/contacteditor/frmContactEditor-Category.cpp index 3150377..3fc61ae 100644 --- a/source/contacteditor/frmContactEditor-Category.cpp +++ b/source/contacteditor/frmContactEditor-Category.cpp @@ -48,7 +48,7 @@ void frmContactEditor::ModifyCategory( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboCategories, + if (lboCategories->GetItemCount() == 0 || !GetSelectedItem(lboCategories, &longSelected, &intSelectedData)){ @@ -80,7 +80,7 @@ void frmContactEditor::DeleteCategory( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboCategories, + if (lboCategories->GetItemCount() == 0 || !GetSelectedItem(lboCategories, &longSelected, &intSelectedData)){ diff --git a/source/contacteditor/frmContactEditor-General.cpp b/source/contacteditor/frmContactEditor-General.cpp index 2ee83a3..96249b3 100644 --- a/source/contacteditor/frmContactEditor-General.cpp +++ b/source/contacteditor/frmContactEditor-General.cpp @@ -63,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; @@ -94,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; @@ -151,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)){ @@ -198,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)){ @@ -249,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)){ @@ -281,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)){ @@ -329,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)){ @@ -363,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)){ @@ -410,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)){ @@ -443,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)){ @@ -489,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)){ @@ -521,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)){ @@ -567,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)){ @@ -599,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)){ @@ -647,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)){ @@ -682,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)){ @@ -730,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)){ @@ -763,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)){ @@ -810,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)){ @@ -843,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)){ @@ -890,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)){ @@ -923,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)){ @@ -970,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)){ @@ -1003,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)){ @@ -1051,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)){ @@ -1085,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)){ @@ -1133,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)){ @@ -1166,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)){ diff --git a/source/contacteditor/frmContactEditor-Groups.cpp b/source/contacteditor/frmContactEditor-Groups.cpp index f3af6a7..b3e5f10 100644 --- a/source/contacteditor/frmContactEditor-Groups.cpp +++ b/source/contacteditor/frmContactEditor-Groups.cpp @@ -57,7 +57,7 @@ void frmContactEditor::DeleteGroup( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboGroups, + if (lboGroups->GetItemCount() == 0 || !GetSelectedItem(lboGroups, &longSelected, &intSelectedData)){ return; diff --git a/source/contacteditor/frmContactEditor-Home.cpp b/source/contacteditor/frmContactEditor-Home.cpp index 42d4879..e610a94 100644 --- a/source/contacteditor/frmContactEditor-Home.cpp +++ b/source/contacteditor/frmContactEditor-Home.cpp @@ -63,7 +63,7 @@ void frmContactEditor::ModifyHomeNickname( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeNicknames, + if (lboHomeNicknames->GetItemCount() == 0 || !GetSelectedItem(lboHomeNicknames, &longSelected, &intSelectedData)){ return; @@ -94,7 +94,7 @@ void frmContactEditor::DeleteHomeNickname( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeNicknames, + if (lboHomeNicknames->GetItemCount() == 0 || !GetSelectedItem(lboHomeNicknames, &longSelected, &intSelectedData)){ return; @@ -151,7 +151,7 @@ void frmContactEditor::ModifyHomeAddress( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeAddresses, + if (lboHomeAddresses->GetItemCount() == 0 || !GetSelectedItem(lboHomeAddresses, &longSelected, &intSelectedData)){ return; @@ -190,7 +190,7 @@ void frmContactEditor::DeleteHomeAddress( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeAddresses, + if (lboHomeAddresses->GetItemCount() == 0 || !GetSelectedItem(lboHomeAddresses, &longSelected, &intSelectedData)){ return; @@ -239,7 +239,7 @@ void frmContactEditor::ModifyHomeEmail( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeEmails, + if (lboHomeEmails->GetItemCount() == 0 || !GetSelectedItem(lboHomeEmails, &longSelected, &intSelectedData)){ return; @@ -270,7 +270,7 @@ void frmContactEditor::DeleteHomeEmail( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeEmails, + if (lboHomeEmails->GetItemCount() == 0 || !GetSelectedItem(lboHomeEmails, &longSelected, &intSelectedData)){ return; @@ -317,7 +317,7 @@ void frmContactEditor::ModifyHomeIM( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeIM, + if (lboHomeIM->GetItemCount() == 0 || !GetSelectedItem(lboHomeIM, &longSelected, &intSelectedData)){ return; @@ -349,7 +349,7 @@ void frmContactEditor::DeleteHomeIM( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeIM, + if (lboHomeIM->GetItemCount() == 0 || !GetSelectedItem(lboHomeIM, &longSelected, &intSelectedData)){ return; @@ -395,7 +395,7 @@ void frmContactEditor::ModifyHomeTelephone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeTelephone, + if (lboHomeTelephone->GetItemCount() == 0 || !GetSelectedItem(lboHomeTelephone, &longSelected, &intSelectedData)){ return; @@ -426,7 +426,7 @@ void frmContactEditor::DeleteHomeTelephone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeTelephone, + if (lboHomeTelephone->GetItemCount() == 0 || !GetSelectedItem(lboHomeTelephone, &longSelected, &intSelectedData)){ return; @@ -470,7 +470,7 @@ void frmContactEditor::ModifyHomeLanguage( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeLanguages, + if (lboHomeLanguages->GetItemCount() == 0 || !GetSelectedItem(lboHomeLanguages, &longSelected, &intSelectedData)){ return; @@ -500,7 +500,7 @@ void frmContactEditor::DeleteHomeLanguage( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeLanguages, + if (lboHomeLanguages->GetItemCount() == 0 || !GetSelectedItem(lboHomeLanguages, &longSelected, &intSelectedData)){ return; @@ -545,7 +545,7 @@ void frmContactEditor::ModifyHomeTimezone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeTimezones, + if (lboHomeTimezones->GetItemCount() == 0 || !GetSelectedItem(lboHomeTimezones, &longSelected, &intSelectedData)){ return; @@ -576,7 +576,7 @@ void frmContactEditor::DeleteHomeTimezone( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeTimezones, + if (lboHomeTimezones->GetItemCount() == 0 || !GetSelectedItem(lboHomeTimezones, &longSelected, &intSelectedData)){ return; @@ -622,7 +622,7 @@ void frmContactEditor::ModifyHomeGeoposition( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeGeoposition, + if (lboHomeGeoposition->GetItemCount() == 0 || !GetSelectedItem(lboHomeGeoposition, &longSelected, &intSelectedData)){ return; @@ -654,7 +654,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,7 +700,7 @@ void frmContactEditor::ModifyHomeWebsite( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeWebsites, + if (lboHomeWebsites->GetItemCount() == 0 || !GetSelectedItem(lboHomeWebsites, &longSelected, &intSelectedData)){ return; @@ -731,7 +731,7 @@ void frmContactEditor::DeleteHomeWebsite( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeWebsites, + if (lboHomeWebsites->GetItemCount() == 0 || !GetSelectedItem(lboHomeWebsites, &longSelected, &intSelectedData)){ return; @@ -776,7 +776,7 @@ void frmContactEditor::ModifyHomeTitle( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeTitles, + if (lboHomeTitles->GetItemCount() == 0 || !GetSelectedItem(lboHomeTitles, &longSelected, &intSelectedData)){ return; @@ -807,7 +807,7 @@ void frmContactEditor::DeleteHomeTitle( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeTitles, + if (lboHomeTitles->GetItemCount() == 0 || !GetSelectedItem(lboHomeTitles, &longSelected, &intSelectedData)){ return; @@ -852,7 +852,7 @@ void frmContactEditor::ModifyHomeRole( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeRoles, + if (lboHomeRoles->GetItemCount() == 0 || !GetSelectedItem(lboHomeRoles, &longSelected, &intSelectedData)){ return; @@ -883,7 +883,7 @@ void frmContactEditor::DeleteHomeRole( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeRoles, + if (lboHomeRoles->GetItemCount() == 0 || !GetSelectedItem(lboHomeRoles, &longSelected, &intSelectedData)){ return; @@ -929,7 +929,7 @@ void frmContactEditor::ModifyHomeOrganisation( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeOrganisations, + if (lboHomeOrganisations->GetItemCount() == 0 || !GetSelectedItem(lboHomeOrganisations, &longSelected, &intSelectedData)){ return; @@ -961,7 +961,7 @@ void frmContactEditor::DeleteHomeOrganisation( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeOrganisations, + if (lboHomeOrganisations->GetItemCount() == 0 ||!GetSelectedItem(lboHomeOrganisations, &longSelected, &intSelectedData)){ return; @@ -1007,7 +1007,7 @@ void frmContactEditor::ModifyHomeNote( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeNotes, + if (lboHomeNotes->GetItemCount() == 0 || !GetSelectedItem(lboHomeNotes, &longSelected, &intSelectedData)){ return; @@ -1038,7 +1038,7 @@ void frmContactEditor::DeleteHomeNote( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboHomeNotes, + if (lboHomeNotes->GetItemCount() == 0 || !GetSelectedItem(lboHomeNotes, &longSelected, &intSelectedData)){ return; diff --git a/source/contacteditor/frmContactEditor-Key.cpp b/source/contacteditor/frmContactEditor-Key.cpp index a71655e..3dd7876 100644 --- a/source/contacteditor/frmContactEditor-Key.cpp +++ b/source/contacteditor/frmContactEditor-Key.cpp @@ -50,7 +50,7 @@ void frmContactEditor::ModifyKey( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboKeys, + if (lboKeys->GetItemCount() == 0 || !GetSelectedItem(lboKeys, &longSelected, &intSelectedData)){ return; @@ -82,7 +82,7 @@ void frmContactEditor::DeleteKey( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboKeys, + if (lboKeys->GetItemCount() == 0 || !GetSelectedItem(lboKeys, &longSelected, &intSelectedData)){ return; diff --git a/source/contacteditor/frmContactEditor-Logo.cpp b/source/contacteditor/frmContactEditor-Logo.cpp index 7aa3309..ce5649a 100644 --- a/source/contacteditor/frmContactEditor-Logo.cpp +++ b/source/contacteditor/frmContactEditor-Logo.cpp @@ -28,7 +28,7 @@ void frmContactEditor::LoadLogo( wxListEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboLogos, + if (lboLogos->GetItemCount() == 0 || !GetSelectedItem(lboLogos, &longSelected, &intSelectedData)){ return; @@ -115,7 +115,7 @@ void frmContactEditor::ModifyLogo( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboLogos, + if (lboLogos->GetItemCount() == 0 || !GetSelectedItem(lboLogos, &longSelected, &intSelectedData)){ return; @@ -149,7 +149,7 @@ void frmContactEditor::DeleteLogo( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboLogos, + if (lboLogos->GetItemCount() == 0 || !GetSelectedItem(lboLogos, &longSelected, &intSelectedData)){ return; @@ -178,7 +178,7 @@ void frmContactEditor::SaveLogo( wxCommandEvent &event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboLogos, + if (lboLogos->GetItemCount() == 0 || !GetSelectedItem(lboLogos, &longSelected, &intSelectedData)){ diff --git a/source/contacteditor/frmContactEditor-Other.cpp b/source/contacteditor/frmContactEditor-Other.cpp index 51e337e..171b3ae 100644 --- a/source/contacteditor/frmContactEditor-Other.cpp +++ b/source/contacteditor/frmContactEditor-Other.cpp @@ -46,7 +46,7 @@ void frmContactEditor::ModifyVendorNamespace( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboVendorNamespace, + if (lboVendorNamespace->GetItemCount() == 0 || !GetSelectedItem(lboVendorNamespace, &longSelected, &intSelectedData)){ return; @@ -73,7 +73,7 @@ void frmContactEditor::DeleteVendorNamespace( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboVendorNamespace, + if (lboVendorNamespace->GetItemCount() == 0 || !GetSelectedItem(lboVendorNamespace, &longSelected, &intSelectedData)){ return; @@ -111,7 +111,7 @@ void frmContactEditor::ModifyXToken( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboXToken, + if (lboXToken->GetItemCount() == 0 || !GetSelectedItem(lboXToken, &longSelected, &intSelectedData)){ @@ -139,7 +139,7 @@ void frmContactEditor::DeleteXToken( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboXToken, + if (lboXToken->GetItemCount() == 0 || !GetSelectedItem(lboXToken, &longSelected, &intSelectedData)){ return; diff --git a/source/contacteditor/frmContactEditor-Picture.cpp b/source/contacteditor/frmContactEditor-Picture.cpp index 0ad94b0..fd9d169 100644 --- a/source/contacteditor/frmContactEditor-Picture.cpp +++ b/source/contacteditor/frmContactEditor-Picture.cpp @@ -54,7 +54,7 @@ void frmContactEditor::ModifyPicture( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboPictures, + if (lboPictures->GetItemCount() == 0 || !GetSelectedItem(lboPictures, &longSelected, &intSelectedData)){ return; @@ -88,7 +88,7 @@ void frmContactEditor::DeletePicture( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboPictures, + if (lboPictures->GetItemCount() == 0 || !GetSelectedItem(lboPictures, &longSelected, &intSelectedData)){ return; @@ -117,7 +117,7 @@ void frmContactEditor::LoadPicture( wxListEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboPictures, + if (lboPictures->GetItemCount() == 0 || !GetSelectedItem(lboPictures, &longSelected, &intSelectedData)){ return; @@ -179,7 +179,7 @@ void frmContactEditor::SavePicture( wxCommandEvent &event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboPictures, + if (lboPictures->GetItemCount() == 0 || !GetSelectedItem(lboPictures, &longSelected, &intSelectedData)){ diff --git a/source/contacteditor/frmContactEditor-Sound.cpp b/source/contacteditor/frmContactEditor-Sound.cpp index 7d9fcde..369238c 100644 --- a/source/contacteditor/frmContactEditor-Sound.cpp +++ b/source/contacteditor/frmContactEditor-Sound.cpp @@ -50,7 +50,7 @@ void frmContactEditor::ModifySound( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboSounds, + if (lboSounds->GetItemCount() == 0 || !GetSelectedItem(lboSounds, &longSelected, &intSelectedData)){ return; @@ -83,7 +83,7 @@ void frmContactEditor::DeleteSound( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboSounds, + if (lboSounds->GetItemCount() == 0 || !GetSelectedItem(lboSounds, &longSelected, &intSelectedData)){ return; @@ -153,7 +153,7 @@ void frmContactEditor::PlaySound( wxCommandEvent& event ) } - if (!GetSelectedItem(lboSounds, + if (lboSounds->GetItemCount() == 0 || !GetSelectedItem(lboSounds, &longSelected, &intSelectedData)){ return; @@ -201,7 +201,7 @@ void frmContactEditor::SaveSound( wxCommandEvent &event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboSounds, + if (lboSounds->GetItemCount() == 0 || !GetSelectedItem(lboSounds, &longSelected, &intSelectedData)){ -- 2.39.5