frmContactEditor: Fix issue with intValueSeek not being incremented properly

[xestiaab/.git] / source / contacteditor / frmContactEditor-General.cpp

diff --git a/source/contacteditor/frmContactEditor-General.cpp b/source/contacteditor/frmContactEditor-General.cpp
index 2ee83a3..9f892eb 100644 (file)
--- a/source/contacteditor/frmContactEditor-General.cpp
+++ b/source/contacteditor/frmContactEditor-General.cpp
@@ -52,6 +52,7 @@ void frmContactEditor::AddGeneralNickname( wxCommandEvent& event )
        frameCENickname->ShowModal();
        delete frameCENickname;
        frameCENickname = NULL;
+    intValueSeek++;
        
 }
 
@@ -63,7 +64,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 +95,7 @@ void frmContactEditor::DeleteGeneralNickname( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboNicknames,
+       if (lboNicknames->GetItemCount() == 0 || !GetSelectedItem(lboNicknames,
                &longSelected,
                &intSelectedData)){
                return;
@@ -140,7 +141,8 @@ void frmContactEditor::AddGeneralAddress( wxCommandEvent& event )
        frameCEAddress->ShowModal();
        delete frameCEAddress;
        frameCEAddress = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralAddress( wxCommandEvent& event )
@@ -151,7 +153,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 +200,7 @@ void frmContactEditor::DeleteGeneralAddress( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboAddresses,
+       if (lboAddresses->GetItemCount() == 0 || !GetSelectedItem(lboAddresses,
                &longSelected,
                &intSelectedData)){
         
@@ -238,7 +240,8 @@ void frmContactEditor::AddGeneralEmail( wxCommandEvent& event )
        frameCEEmail->ShowModal();
        delete frameCEEmail;
        frameCEEmail = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralEmail( wxCommandEvent& event )
@@ -249,7 +252,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 +284,7 @@ void frmContactEditor::DeleteGeneralEmail( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboEmails,
+       if (lboEmails->GetItemCount() == 0 || !GetSelectedItem(lboEmails,
                &longSelected,
                &intSelectedData)){
         
@@ -318,7 +321,8 @@ void frmContactEditor::AddGeneralIM( wxCommandEvent& event )
        frameCEIM->ShowModal();
        delete frameCEIM;
        frameCEIM = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralIM( wxCommandEvent& event )
@@ -329,7 +333,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 +367,7 @@ void frmContactEditor::DeleteGeneralIM( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboIM,
+       if (lboIM->GetItemCount() == 0 || !GetSelectedItem(lboIM,
                &longSelected,
                &intSelectedData)){
                
@@ -399,7 +403,8 @@ void frmContactEditor::AddGeneralTelephone( wxCommandEvent& event )
        frameCETel->ShowModal();
        delete frameCETel;
        frameCETel = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralTelephone( wxCommandEvent& event )
@@ -410,7 +415,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 +448,7 @@ void frmContactEditor::DeleteGeneralTelephone( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboTelephone,
+       if (lboTelephone->GetItemCount() == 0 || !GetSelectedItem(lboTelephone,
                &longSelected,
                &intSelectedData)){
                
@@ -478,7 +483,8 @@ void frmContactEditor::AddGeneralLanguages( wxCommandEvent& event )
        frameCELang->ShowModal();
        delete frameCELang;
        frameCELang = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralLanguages( wxCommandEvent& event )
@@ -489,7 +495,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 +527,7 @@ void frmContactEditor::DeleteGeneralLanguage( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboLanguages,
+       if (lboLanguages->GetItemCount() == 0 || !GetSelectedItem(lboLanguages,
                &longSelected,
                &intSelectedData)){
                
@@ -556,7 +562,8 @@ void frmContactEditor::AddGeneralTimezone( wxCommandEvent& event )
        frameCETZ->ShowModal();
        delete frameCETZ;
        frameCETZ = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralTimezone( wxCommandEvent& event )
@@ -567,7 +574,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 +606,7 @@ void frmContactEditor::DeleteGeneralTimezone( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboTimezones,
+       if (lboTimezones->GetItemCount() == 0 || !GetSelectedItem(lboTimezones,
                &longSelected,
                &intSelectedData)){
                
@@ -636,7 +643,8 @@ void frmContactEditor::AddGeneralGeoposition( wxCommandEvent& event )
        frameCEGeo->ShowModal();
        delete frameCEGeo;
        frameCEGeo = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralGeoposition( wxCommandEvent& event )
@@ -647,7 +655,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 +690,7 @@ void frmContactEditor::DeleteGeneralGeoposition( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboGeoposition,
+       if (lboGeoposition->GetItemCount() == 0 || !GetSelectedItem(lboGeoposition,
                &longSelected,
                &intSelectedData)){
                
@@ -719,7 +727,8 @@ void frmContactEditor::AddGeneralRelated( wxCommandEvent& event )
        frameCERel->ShowModal();
        delete frameCERel;
        frameCERel = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralRelated( wxCommandEvent& event )
@@ -730,7 +739,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 +772,7 @@ void frmContactEditor::DeleteGeneralRelated( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboRelated,
+       if (lboRelated->GetItemCount() == 0 || !GetSelectedItem(lboRelated,
                &longSelected,
                &intSelectedData)){
                
@@ -799,7 +808,8 @@ void frmContactEditor::AddGeneralWebsite( wxCommandEvent& event )
        frameCEWeb->ShowModal();
        delete frameCEWeb;
        frameCEWeb = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralWebsite( wxCommandEvent& event )
@@ -810,7 +820,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 +853,7 @@ void frmContactEditor::DeleteGeneralWebsite( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboWebsites,
+       if (lboWebsites->GetItemCount() == 0 || !GetSelectedItem(lboWebsites,
                &longSelected,
                &intSelectedData)){
                
@@ -879,7 +889,8 @@ void frmContactEditor::AddGeneralTitle( wxCommandEvent& event )
        frameCETitle->ShowModal();
        delete frameCETitle;
        frameCETitle = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralTitle( wxCommandEvent& event )
@@ -890,7 +901,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 +934,7 @@ void frmContactEditor::DeleteGeneralTitle( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboTitles,
+       if (lboTitles->GetItemCount() == 0 || !GetSelectedItem(lboTitles,
                &longSelected,
                &intSelectedData)){
                
@@ -959,7 +970,8 @@ void frmContactEditor::AddGeneralRole( wxCommandEvent& event )
        frameCERole->ShowModal();
        delete frameCERole;
        frameCERole = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralRole( wxCommandEvent& event )
@@ -970,7 +982,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 +1015,7 @@ void frmContactEditor::DeleteGeneralRole( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboRoles,
+       if (lboRoles->GetItemCount() == 0 || !GetSelectedItem(lboRoles,
                &longSelected,
                &intSelectedData)){
                
@@ -1040,7 +1052,8 @@ void frmContactEditor::AddGeneralOrganisation( wxCommandEvent& event )
        frameCEOrg->ShowModal();
        delete frameCEOrg;
        frameCEOrg = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralOrganisation( wxCommandEvent& event )
@@ -1051,7 +1064,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 +1098,7 @@ void frmContactEditor::DeleteGeneralOrganisation( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboOrganisations,
+       if (lboOrganisations->GetItemCount() == 0 || !GetSelectedItem(lboOrganisations,
                &longSelected,
                &intSelectedData)){
                
@@ -1122,7 +1135,8 @@ void frmContactEditor::AddGeneralNote( wxCommandEvent& event )
        frameCENote->ShowModal();
        delete frameCENote;
        frameCENote = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralNote( wxCommandEvent& event )
@@ -1133,7 +1147,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 +1180,7 @@ void frmContactEditor::DeleteGeneralNote( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboNotes,
+       if (lboBusinessNotes->GetItemCount() == 0 || !GetSelectedItem(lboNotes,
                &longSelected,
                &intSelectedData)){