X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Home.cpp;h=e610a949e4bb91164dd79293216f4a98048bf153;hb=bfe817b5bfae33a1eb666c463643ec119cd1d66d;hp=8cbc7e17fb0a2c3ba1f1326aea7f071c67da77dc;hpb=70b3f51dee86d0beb7dbc357374537ff0874f11d;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Home.cpp b/source/contacteditor/frmContactEditor-Home.cpp
index 8cbc7e1..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,13 +1038,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,