frmContactEditor: Fix issue with intValueSeek not being incremented properly

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

diff --git a/source/contacteditor/frmContactEditor-Business.cpp b/source/contacteditor/frmContactEditor-Business.cpp
index 7294d94..1641393 100644 (file)
--- a/source/contacteditor/frmContactEditor-Business.cpp
+++ b/source/contacteditor/frmContactEditor-Business.cpp
@@ -52,7 +52,8 @@ void frmContactEditor::AddBusinessNickname( wxCommandEvent& event )
        frameCENickname->ShowModal();
        delete frameCENickname;
        frameCENickname = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessNickname( wxCommandEvent& event )
@@ -63,7 +64,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 +97,7 @@ void frmContactEditor::DeleteBusinessNickname( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboBusinessNicknames,
+       if (lboBusinessNicknames->GetItemCount() == 0 || !GetSelectedItem(lboBusinessNicknames,
                &longSelected,
                &intSelectedData)){
                
@@ -144,7 +145,8 @@ void frmContactEditor::AddBusinessAddress( wxCommandEvent& event )
        frameCEAddress->ShowModal();
        delete frameCEAddress;
        frameCEAddress = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessAddress( wxCommandEvent& event )
@@ -155,7 +157,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 +198,7 @@ void frmContactEditor::DeleteBusinessAddress( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboBusinessAddresses,
+       if (lboBusinessAddresses->GetItemCount() == 0 || !GetSelectedItem(lboBusinessAddresses,
                &longSelected,
                &intSelectedData)){
                
@@ -235,7 +237,8 @@ void frmContactEditor::AddBusinessEmail( wxCommandEvent& event )
        frameCEEmail->ShowModal();
        delete frameCEEmail;
        frameCEEmail = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessEmail( wxCommandEvent& event )
@@ -246,7 +249,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 +281,7 @@ void frmContactEditor::DeleteBusinessEmail( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboBusinessEmail,
+       if (lboBusinessEmail->GetItemCount() == 0 || !GetSelectedItem(lboBusinessEmail,
                          &longSelected,
                          &intSelectedData)){
                         
@@ -315,7 +318,8 @@ void frmContactEditor::AddBusinessIM( wxCommandEvent& event )
        frameCEIM->ShowModal();
        delete frameCEIM;
        frameCEIM = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessIM( wxCommandEvent& event )
@@ -326,7 +330,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 +364,7 @@ void frmContactEditor::DeleteBusinessIM( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboBusinessIM,
+       if (lboBusinessIM->GetItemCount() == 0 || !GetSelectedItem(lboBusinessIM,
                &longSelected,
                &intSelectedData)){
                
@@ -397,7 +401,8 @@ void frmContactEditor::AddBusinessTelephone( wxCommandEvent& event )
        frameCETel->ShowModal();
        delete frameCETel;
        frameCETel = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessTelephone( wxCommandEvent& event )
@@ -408,7 +413,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 +446,7 @@ void frmContactEditor::DeleteBusinessTelephone( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboBusinessTelephone,
+       if (lboBusinessTelephone->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTelephone,
                &longSelected,
                &intSelectedData)){
                
@@ -476,7 +481,8 @@ void frmContactEditor::AddBusinessLanguage( wxCommandEvent& event )
        frameCELang->ShowModal();
        delete frameCELang;
        frameCELang = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessLanguage( wxCommandEvent& event )
@@ -487,7 +493,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 +525,7 @@ void frmContactEditor::DeleteBusinessLanguage( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboBusinessLanguages,
+       if (lboBusinessLanguages->GetItemCount() == 0 || !GetSelectedItem(lboBusinessLanguages,
                &longSelected,
                &intSelectedData)){
                         
@@ -555,7 +561,8 @@ void frmContactEditor::AddBusinessTimezone( wxCommandEvent& event )
        frameCETZ->ShowModal();
        delete frameCETZ;
        frameCETZ = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessTimezone( wxCommandEvent& event )
@@ -566,7 +573,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 +606,7 @@ void frmContactEditor::DeleteBusinessTimezone( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboBusinessTimezones,
+       if (lboBusinessTimezones->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTimezones,
                &longSelected,
                &intSelectedData)){
                
@@ -636,7 +643,8 @@ void frmContactEditor::AddBusinessGeoposition( wxCommandEvent& event )
        frameCEGeo->ShowModal();
        delete frameCEGeo;
        frameCEGeo = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessGeoposition( wxCommandEvent& event )
@@ -647,7 +655,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 +689,7 @@ void frmContactEditor::DeleteBusinessGeoposition( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboBusinessGeoposition,
+       if (lboBusinessGeoposition->GetItemCount() == 0 || !GetSelectedItem(lboBusinessGeoposition,
                &longSelected,
                &intSelectedData)){
                
@@ -718,7 +726,8 @@ void frmContactEditor::AddBusinessWebsite( wxCommandEvent& event )
        frameCEWeb->ShowModal();
        delete frameCEWeb;
        frameCEWeb = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessWebsite( wxCommandEvent& event )
@@ -729,7 +738,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 +771,7 @@ void frmContactEditor::DeleteBusinessWebsite( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboBusinessWebsites,
+       if (lboBusinessWebsites->GetItemCount() == 0 || !GetSelectedItem(lboBusinessWebsites,
                &longSelected,
                &intSelectedData)){
                
@@ -798,7 +807,8 @@ void frmContactEditor::AddBusinessTitle( wxCommandEvent& event )
        frameCETitle->ShowModal();
        delete frameCETitle;
        frameCETitle = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessTitle( wxCommandEvent& event )
@@ -809,7 +819,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 +852,7 @@ void frmContactEditor::DeleteBusinessTitle( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboBusinessTitles,
+       if (lboBusinessTitles->GetItemCount() == 0 || !GetSelectedItem(lboBusinessTitles,
                &longSelected,
                &intSelectedData)){
                
@@ -850,7 +860,7 @@ void frmContactEditor::DeleteBusinessTitle( wxCommandEvent& event )
     
        }
     
-       lboTitles->DeleteItem(longSelected);
+       lboBusinessTitles->DeleteItem(longSelected);
     
        DeleteMapData(intSelectedData, &ContactEditorData.BusinessTitleList,
                &ContactEditorData.BusinessTitleListLanguage, &ContactEditorData.BusinessTitleListAltID,
@@ -878,7 +888,8 @@ void frmContactEditor::AddBusinessRole( wxCommandEvent& event )
        frameCERole->ShowModal();
        delete frameCERole;
        frameCERole = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessRole( wxCommandEvent& event )
@@ -889,7 +900,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 +933,7 @@ void frmContactEditor::DeleteBusinessRole( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboBusinessRoles,
+       if (lboBusinessRoles->GetItemCount() == 0 || !GetSelectedItem(lboBusinessRoles,
                &longSelected,
                &intSelectedData)){
                
@@ -959,7 +970,8 @@ void frmContactEditor::AddBusinessOrganisation( wxCommandEvent& event )
        frameCEOrg->ShowModal();
        delete frameCEOrg;
        frameCEOrg = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessOrganisation( wxCommandEvent& event )
@@ -970,7 +982,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 +1016,7 @@ void frmContactEditor::DeleteBusinessOrganisation( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboBusinessOrganisations,
+       if (lboBusinessOrganisations->GetItemCount() == 0 || !GetSelectedItem(lboBusinessOrganisations,
                &longSelected,
                &intSelectedData)){
                
@@ -1041,7 +1053,8 @@ void frmContactEditor::AddBusinessNote( wxCommandEvent& event )
        frameCENote->ShowModal();
        delete frameCENote;
        frameCENote = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessNote( wxCommandEvent& event )
@@ -1052,7 +1065,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 +1098,7 @@ void frmContactEditor::DeleteBusinessNote( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboBusinessNotes,
+       if (lboBusinessNotes->GetItemCount() == 0 || !GetSelectedItem(lboBusinessNotes,
                &longSelected,
                &intSelectedData)){