X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-General.cpp;h=96249b31ff300cc2f2f76521517c6ddd5b6e138f;hb=bfe817b5bfae33a1eb666c463643ec119cd1d66d;hp=2ee83a3efcb07c5af88aee546d8d316c8003d271;hpb=60b068e2dfdf58c14d5669133db0e789304b2717;p=xestiaab%2F.git

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)){