frmContactEditor: Fix issue with intValueSeek not being incremented properly

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

diff --git a/source/contacteditor/frmContactEditor-Calendar.cpp b/source/contacteditor/frmContactEditor-Calendar.cpp
index c310210..aa9b3de 100644 (file)
--- a/source/contacteditor/frmContactEditor-Calendar.cpp
+++ b/source/contacteditor/frmContactEditor-Calendar.cpp
@@ -23,12 +23,9 @@ void frmContactEditor::AddCalendarAddress( wxCommandEvent& event )
 {
 
        // Bring up the window to add the calendar address.
-
-       int intResult = 0;
     
        frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
        frameCECalAdr->SetEditorMode(FALSE);
-       intResult = GetLastInt(&ContactEditorData.CalendarList);
        frameCECalAdr->SetupPointers(&ContactEditorData.CalendarList,
                &ContactEditorData.CalendarListAltID,
                &ContactEditorData.CalendarListPID,
@@ -40,7 +37,8 @@ void frmContactEditor::AddCalendarAddress( wxCommandEvent& event )
        frameCECalAdr->ShowModal();
        delete frameCECalAdr;
        frameCECalAdr = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyCalendarAddress( wxCommandEvent& event )
@@ -51,7 +49,7 @@ void frmContactEditor::ModifyCalendarAddress( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboCalendarAddresses,
+       if (lboCalendarAddresses->GetItemCount() == 0 || !GetSelectedItem(lboCalendarAddresses,
                &longSelected,
                &intSelectedData)){
                
@@ -83,7 +81,7 @@ void frmContactEditor::DeleteCalendarAddress( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboCalendarAddresses,
+       if (lboCalendarAddresses->GetItemCount() == 0 || !GetSelectedItem(lboCalendarAddresses,
                &longSelected,
                &intSelectedData)){
                
@@ -103,12 +101,9 @@ void frmContactEditor::AddCalendarRequest( wxCommandEvent& event )
 {
 
        // Bring up the window to add a calendar request address.
-
-       int intResult = 0;
     
        frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
        frameCECalAdr->SetEditorMode(FALSE);
-       intResult = GetLastInt(&ContactEditorData.CalendarRequestList);
        frameCECalAdr->SetupPointers(&ContactEditorData.CalendarRequestList,
                &ContactEditorData.CalendarRequestListAltID,
                &ContactEditorData.CalendarRequestListPID,
@@ -120,7 +115,8 @@ void frmContactEditor::AddCalendarRequest( wxCommandEvent& event )
        frameCECalAdr->ShowModal();
        delete frameCECalAdr;
        frameCECalAdr = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyCalendarRequest( wxCommandEvent& event )
@@ -131,7 +127,7 @@ void frmContactEditor::ModifyCalendarRequest( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboCalendarRequestAddress,
+       if (lboCalendarRequestAddress->GetItemCount() == 0 || !GetSelectedItem(lboCalendarRequestAddress,
                &longSelected,
                &intSelectedData)){
                
@@ -163,7 +159,7 @@ void frmContactEditor::DeleteCalendarRequest( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboCalendarRequestAddress,
+       if (lboCalendarRequestAddress->GetItemCount() == 0 || !GetSelectedItem(lboCalendarRequestAddress,
                &longSelected,
                &intSelectedData)){
                
@@ -184,12 +180,9 @@ void frmContactEditor::AddFreeBusy( wxCommandEvent& event )
 {
 
        // Bring up the window to add a calendar free/busy address.
-
-       int intResult = 0;
     
        frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
        frameCECalAdr->SetEditorMode(FALSE);
-       intResult = GetLastInt(&ContactEditorData.FreeBusyList);
        frameCECalAdr->SetupPointers(&ContactEditorData.FreeBusyList,
                &ContactEditorData.FreeBusyListAltID,
                &ContactEditorData.FreeBusyListPID,
@@ -201,7 +194,8 @@ void frmContactEditor::AddFreeBusy( wxCommandEvent& event )
        frameCECalAdr->ShowModal();
        delete frameCECalAdr;
        frameCECalAdr = NULL;
-       
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyFreeBusy( wxCommandEvent& event )
@@ -212,7 +206,7 @@ void frmContactEditor::ModifyFreeBusy( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboFreeBusyAddresses,
+       if (lboFreeBusyAddresses->GetItemCount() == 0 || !GetSelectedItem(lboFreeBusyAddresses,
                &longSelected,
                &intSelectedData)){
                
@@ -244,7 +238,7 @@ void frmContactEditor::DeleteFreeBusy( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboFreeBusyAddresses,
+       if (lboFreeBusyAddresses->GetItemCount() == 0 || !GetSelectedItem(lboFreeBusyAddresses,
                &longSelected,
                &intSelectedData)){