frmContactEditor: Fix issue with intValueSeek not being incremented properly

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

diff --git a/source/contacteditor/frmContactEditor-Home.cpp b/source/contacteditor/frmContactEditor-Home.cpp
index 42d4879..33769e3 100644 (file)
--- a/source/contacteditor/frmContactEditor-Home.cpp
+++ b/source/contacteditor/frmContactEditor-Home.cpp
@@ -52,7 +52,8 @@ void frmContactEditor::AddHomeNickname( wxCommandEvent& event )
        frameCENickname->ShowModal();
        delete frameCENickname;
        frameCENickname = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeNickname( wxCommandEvent& event )
@@ -63,7 +64,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 +95,7 @@ void frmContactEditor::DeleteHomeNickname( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboHomeNicknames,
+       if (lboHomeNicknames->GetItemCount() == 0 || !GetSelectedItem(lboHomeNicknames,
                 &longSelected,
                 &intSelectedData)){
                return;
@@ -140,7 +141,8 @@ void frmContactEditor::AddHomeAddress( wxCommandEvent& event )
        frameCEAddress->ShowModal();
        delete frameCEAddress;
        frameCEAddress = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeAddress( wxCommandEvent& event )
@@ -151,7 +153,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 +192,7 @@ void frmContactEditor::DeleteHomeAddress( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboHomeAddresses,
+       if (lboHomeAddresses->GetItemCount() == 0 || !GetSelectedItem(lboHomeAddresses,
                 &longSelected,
                 &intSelectedData)){
                return;
@@ -228,7 +230,8 @@ void frmContactEditor::AddHomeEmail( wxCommandEvent& event )
        frameCEEmail->ShowModal();
        delete frameCEEmail;
        frameCEEmail = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeEmail( wxCommandEvent& event )
@@ -239,7 +242,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 +273,7 @@ void frmContactEditor::DeleteHomeEmail( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboHomeEmails,
+       if (lboHomeEmails->GetItemCount() == 0 || !GetSelectedItem(lboHomeEmails,
                &longSelected,
                 &intSelectedData)){
                return;
@@ -306,7 +309,8 @@ void frmContactEditor::AddHomeIM( wxCommandEvent& event )
        frameCEIM->ShowModal();
        delete frameCEIM;
        frameCEIM = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeIM( wxCommandEvent& event )
@@ -317,7 +321,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 +353,7 @@ void frmContactEditor::DeleteHomeIM( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboHomeIM,
+       if (lboHomeIM->GetItemCount() == 0 || !GetSelectedItem(lboHomeIM,
                &longSelected,
                &intSelectedData)){
                return;
@@ -384,7 +388,8 @@ void frmContactEditor::AddHomeTelephone( wxCommandEvent& event )
        frameCETel->ShowModal();
        delete frameCETel;
        frameCETel = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeTelephone( wxCommandEvent& event )
@@ -395,7 +400,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 +431,7 @@ void frmContactEditor::DeleteHomeTelephone( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboHomeTelephone,
+       if (lboHomeTelephone->GetItemCount() == 0 || !GetSelectedItem(lboHomeTelephone,
                &longSelected,
                 &intSelectedData)){
                return;
@@ -459,7 +464,8 @@ void frmContactEditor::AddHomeLanguage( wxCommandEvent& event )
        frameCELang->ShowModal();
        delete frameCELang;
        frameCELang = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeLanguage( wxCommandEvent& event )
@@ -470,7 +476,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 +506,7 @@ void frmContactEditor::DeleteHomeLanguage( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboHomeLanguages,
+       if (lboHomeLanguages->GetItemCount() == 0 || !GetSelectedItem(lboHomeLanguages,
                &longSelected,
                 &intSelectedData)){
                return;
@@ -534,7 +540,8 @@ void frmContactEditor::AddHomeTimezone( wxCommandEvent& event )
        frameCETZ->ShowModal();
        delete frameCETZ;
        frameCETZ = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeTimezone( wxCommandEvent& event )
@@ -545,7 +552,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 +583,7 @@ void frmContactEditor::DeleteHomeTimezone( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboHomeTimezones,
+       if (lboHomeTimezones->GetItemCount() == 0 || !GetSelectedItem(lboHomeTimezones,
                &longSelected,
                &intSelectedData)){
                return;
@@ -611,7 +618,8 @@ void frmContactEditor::AddHomeGeoposition( wxCommandEvent& event )
        frameCEGeo->ShowModal();
        delete frameCEGeo;
        frameCEGeo = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeGeoposition( wxCommandEvent& event )
@@ -622,7 +630,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 +662,7 @@ void frmContactEditor::DeleteHomeGeoposition( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboHomeGeoposition,
+       if (lboHomeGeoposition->GetItemCount() == 0 || !GetSelectedItem(lboHomeGeoposition,
                &longSelected,
                &intSelectedData)){
                return;
@@ -689,7 +697,8 @@ void frmContactEditor::AddHomeWebsite( wxCommandEvent& event )
        frameCEWeb->ShowModal();
        delete frameCEWeb;
        frameCEWeb = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeWebsite( wxCommandEvent& event )
@@ -700,7 +709,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 +740,7 @@ void frmContactEditor::DeleteHomeWebsite( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboHomeWebsites,
+       if (lboHomeWebsites->GetItemCount() == 0 || !GetSelectedItem(lboHomeWebsites,
                &longSelected,
                &intSelectedData)){
                return;
@@ -765,7 +774,8 @@ void frmContactEditor::AddHomeTitle( wxCommandEvent& event )
        frameCETitle->ShowModal();
        delete frameCETitle;
        frameCETitle = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeTitle( wxCommandEvent& event )
@@ -776,7 +786,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 +817,7 @@ void frmContactEditor::DeleteHomeTitle( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboHomeTitles,
+       if (lboHomeTitles->GetItemCount() == 0 || !GetSelectedItem(lboHomeTitles,
                &longSelected,
                &intSelectedData)){
                return;
@@ -841,7 +851,8 @@ void frmContactEditor::AddHomeRole( wxCommandEvent& event )
        frameCERole->ShowModal();
        delete frameCERole;
        frameCERole = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeRole( wxCommandEvent& event )
@@ -852,7 +863,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 +894,7 @@ void frmContactEditor::DeleteHomeRole( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboHomeRoles,
+       if (lboHomeRoles->GetItemCount() == 0 || !GetSelectedItem(lboHomeRoles,
                &longSelected,
                &intSelectedData)){
                return;
@@ -918,7 +929,8 @@ void frmContactEditor::AddHomeOrganisation( wxCommandEvent& event )
        frameCEOrg->ShowModal();
        delete frameCEOrg;
        frameCEOrg = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeOrganisation( wxCommandEvent& event )
@@ -929,7 +941,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 +973,7 @@ void frmContactEditor::DeleteHomeOrganisation( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboHomeOrganisations,
+       if (lboHomeOrganisations->GetItemCount() == 0 ||!GetSelectedItem(lboHomeOrganisations,
                &longSelected,
                &intSelectedData)){
                return;
@@ -996,7 +1008,8 @@ void frmContactEditor::AddHomeNote( wxCommandEvent& event )
        frameCENote->ShowModal();
        delete frameCENote;
        frameCENote = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeNote( wxCommandEvent& event )
@@ -1007,7 +1020,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 +1051,7 @@ void frmContactEditor::DeleteHomeNote( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboHomeNotes,
+       if (lboHomeNotes->GetItemCount() == 0 || !GetSelectedItem(lboHomeNotes,
                &longSelected,
                &intSelectedData)){
                return;