X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Calendar.cpp;h=aa9b3defe2a64c0a03a13afd93a12d33d9227eae;hb=bac054ea5eda94fe663d8b1a7c680ae80de8075c;hp=233e7a11426a78f4b96176d143c755d163d4c122;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Calendar.cpp b/source/contacteditor/frmContactEditor-Calendar.cpp
index 233e7a1..aa9b3de 100644
--- a/source/contacteditor/frmContactEditor-Calendar.cpp
+++ b/source/contacteditor/frmContactEditor-Calendar.cpp
@@ -1,6 +1,6 @@
 // frmContactEditor-Calendar.cpp - frmContactEditor Calendar tab subroutines.
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2016 Xestia Software Development.
 //
 // This file is part of Xestia Address Book.
 //
@@ -21,195 +21,235 @@
 
 void frmContactEditor::AddCalendarAddress( wxCommandEvent& event )
 {
-    int intResult = 0;
-    
-    frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
-    frameCECalAdr->SetEditorMode(FALSE);
-    intResult = GetLastInt(&CalendarList);
-    frameCECalAdr->SetupPointers(&CalendarList,
-                                 &CalendarListAltID,
-                                 &CalendarListPID,
-                                 &CalendarListType,
-                                 &CalendarListTokens,
-                                 &CalendarListPref,
-                                 lboCalendarAddresses,
-                                 (intValueSeek));
-    frameCECalAdr->ShowModal();
-    delete frameCECalAdr;
-    frameCECalAdr = NULL;
+
+	// Bring up the window to add the calendar address.
+    
+	frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
+	frameCECalAdr->SetEditorMode(FALSE);
+	frameCECalAdr->SetupPointers(&ContactEditorData.CalendarList,
+		&ContactEditorData.CalendarListAltID,
+		&ContactEditorData.CalendarListPID,
+		&ContactEditorData.CalendarListType,
+		&ContactEditorData.CalendarListTokens,
+		&ContactEditorData.CalendarListPref,
+		lboCalendarAddresses,
+		(intValueSeek));
+	frameCECalAdr->ShowModal();
+	delete frameCECalAdr;
+	frameCECalAdr = NULL;
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyCalendarAddress( wxCommandEvent& event )
 {
-    long longSelected = -1;
-    int intSelectedData = 0;
-    
-    if (!GetSelectedItem(lboCalendarAddresses,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
-    
-    frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
-    frameCECalAdr->SetupPointers(&CalendarList,
-                                 &CalendarListAltID,
-                                 &CalendarListPID,
-                                 &CalendarListType,
-                                 &CalendarListTokens,
-                                 &CalendarListPref,
-                                 lboCalendarAddresses,
-                                 intSelectedData);
-    frameCECalAdr->SetEditorMode(TRUE);
-    frameCECalAdr->ShowModal();
-    delete frameCECalAdr;
-    frameCECalAdr = NULL;
+
+	// Bring up the window to modify the calendar address.
+
+	long longSelected = -1;
+	int intSelectedData = 0;
+    
+	if (lboCalendarAddresses->GetItemCount() == 0 || !GetSelectedItem(lboCalendarAddresses,
+		&longSelected,
+		&intSelectedData)){
+		
+		return;
+		
+	}
+    
+	frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
+	frameCECalAdr->SetupPointers(&ContactEditorData.CalendarList,
+		&ContactEditorData.CalendarListAltID,
+		&ContactEditorData.CalendarListPID,
+		&ContactEditorData.CalendarListType,
+		&ContactEditorData.CalendarListTokens,
+		&ContactEditorData.CalendarListPref,
+		lboCalendarAddresses,
+		intSelectedData);
+	frameCECalAdr->SetEditorMode(TRUE);
+	frameCECalAdr->ShowModal();
+	delete frameCECalAdr;
+	frameCECalAdr = NULL;
+	
 }
 
 void frmContactEditor::DeleteCalendarAddress( wxCommandEvent& event )
 {
-    long longSelected = -1;
-    int intSelectedData = 0;
+
+	// Bring up the window to delete the calendar address.
+
+	long longSelected = -1;
+	int intSelectedData = 0;
     
-    if (!GetSelectedItem(lboCalendarAddresses,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
+	if (lboCalendarAddresses->GetItemCount() == 0 || !GetSelectedItem(lboCalendarAddresses,
+		&longSelected,
+		&intSelectedData)){
+		
+		return;
+		
+	}
     
-    lboCalendarAddresses->DeleteItem(longSelected);
+	lboCalendarAddresses->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &CalendarList, &CalendarListAltID,
-                  &CalendarListPID, &CalendarListType, &CalendarListTokens,
-                  &CalendarListPref);
+	DeleteMapData(intSelectedData, &ContactEditorData.CalendarList, &ContactEditorData.CalendarListAltID,
+		&ContactEditorData.CalendarListPID, &ContactEditorData.CalendarListType, &ContactEditorData.CalendarListTokens,
+		&ContactEditorData.CalendarListPref);
     
 }
 
 void frmContactEditor::AddCalendarRequest( wxCommandEvent& event )
 {
-    int intResult = 0;
-    
-    frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
-    frameCECalAdr->SetEditorMode(FALSE);
-    intResult = GetLastInt(&CalendarRequestList);
-    frameCECalAdr->SetupPointers(&CalendarRequestList,
-                                 &CalendarRequestListAltID,
-                                 &CalendarRequestListPID,
-                                 &CalendarRequestListType,
-                                 &CalendarRequestListTokens,
-                                 &CalendarRequestListPref,
-                                 lboCalendarRequestAddress,
-                                 (intValueSeek));
-    frameCECalAdr->ShowModal();
-    delete frameCECalAdr;
-    frameCECalAdr = NULL;
+
+	// Bring up the window to add a calendar request address.
+    
+	frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
+	frameCECalAdr->SetEditorMode(FALSE);
+	frameCECalAdr->SetupPointers(&ContactEditorData.CalendarRequestList,
+		&ContactEditorData.CalendarRequestListAltID,
+		&ContactEditorData.CalendarRequestListPID,
+		&ContactEditorData.CalendarRequestListType,
+		&ContactEditorData.CalendarRequestListTokens,
+		&ContactEditorData.CalendarRequestListPref,
+		lboCalendarRequestAddress,
+		(intValueSeek));
+	frameCECalAdr->ShowModal();
+	delete frameCECalAdr;
+	frameCECalAdr = NULL;
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyCalendarRequest( wxCommandEvent& event )
 {
-    long longSelected = -1;
-    int intSelectedData = 0;
-    
-    if (!GetSelectedItem(lboCalendarRequestAddress,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
-    
-    frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
-    frameCECalAdr->SetupPointers(&CalendarList,
-                                 &CalendarRequestListAltID,
-                                 &CalendarRequestListPID,
-                                 &CalendarRequestListType,
-                                 &CalendarRequestListTokens,
-                                 &CalendarRequestListPref,
-                                 lboCalendarRequestAddress,
-                                 intSelectedData);
-    frameCECalAdr->SetEditorMode(TRUE);
-    frameCECalAdr->ShowModal();
-    delete frameCECalAdr;
-    frameCECalAdr = NULL;
+
+	// Bring up the window to modify a calendar request address.
+
+	long longSelected = -1;
+	int intSelectedData = 0;
+    
+	if (lboCalendarRequestAddress->GetItemCount() == 0 || !GetSelectedItem(lboCalendarRequestAddress,
+		&longSelected,
+		&intSelectedData)){
+		
+		return;
+		
+	}
+    
+	frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
+	frameCECalAdr->SetupPointers(&ContactEditorData.CalendarRequestList,
+		&ContactEditorData.CalendarRequestListAltID,
+		&ContactEditorData.CalendarRequestListPID,
+		&ContactEditorData.CalendarRequestListType,
+		&ContactEditorData.CalendarRequestListTokens,
+		&ContactEditorData.CalendarRequestListPref,
+		lboCalendarRequestAddress,
+		intSelectedData);
+	frameCECalAdr->SetEditorMode(TRUE);
+	frameCECalAdr->ShowModal();
+	delete frameCECalAdr;
+	frameCECalAdr = NULL;
+	
 }
 
 void frmContactEditor::DeleteCalendarRequest( wxCommandEvent& event )
 {
-    long longSelected = -1;
-    int intSelectedData = 0;
-    
-    if (!GetSelectedItem(lboCalendarRequestAddress,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
-    
-    lboCalendarRequestAddress->DeleteItem(longSelected);
-    
-    DeleteMapData(intSelectedData, &CalendarRequestList,
-                  &CalendarRequestListAltID, &CalendarRequestListPID,
-                  &CalendarRequestListType, &CalendarRequestListTokens,
-                  &CalendarRequestListPref);
+
+	// Bring up the window to delete a calendar request address.
+
+	long longSelected = -1;
+	int intSelectedData = 0;
+    
+	if (lboCalendarRequestAddress->GetItemCount() == 0 || !GetSelectedItem(lboCalendarRequestAddress,
+		&longSelected,
+		&intSelectedData)){
+		
+		return;
+		
+	}
+    
+	lboCalendarRequestAddress->DeleteItem(longSelected);
+    
+	DeleteMapData(intSelectedData, &ContactEditorData.CalendarRequestList,
+		&ContactEditorData.CalendarRequestListAltID, &ContactEditorData.CalendarRequestListPID,
+		&ContactEditorData.CalendarRequestListType, &ContactEditorData.CalendarRequestListTokens,
+		&ContactEditorData.CalendarRequestListPref);
+		
 }
 
 void frmContactEditor::AddFreeBusy( wxCommandEvent& event )
 {
-    int intResult = 0;
-    
-    frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
-    frameCECalAdr->SetEditorMode(FALSE);
-    intResult = GetLastInt(&FreeBusyList);
-    frameCECalAdr->SetupPointers(&FreeBusyList,
-                                 &FreeBusyListAltID,
-                                 &FreeBusyListPID,
-                                 &FreeBusyListType,
-                                 &FreeBusyListTokens,
-                                 &FreeBusyListPref,
-                                 lboFreeBusyAddresses,
-                                 (intValueSeek));
-    frameCECalAdr->ShowModal();
-    delete frameCECalAdr;
-    frameCECalAdr = NULL;
+
+	// Bring up the window to add a calendar free/busy address.
+    
+	frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
+	frameCECalAdr->SetEditorMode(FALSE);
+	frameCECalAdr->SetupPointers(&ContactEditorData.FreeBusyList,
+		&ContactEditorData.FreeBusyListAltID,
+		&ContactEditorData.FreeBusyListPID,
+		&ContactEditorData.FreeBusyListType,
+		&ContactEditorData.FreeBusyListTokens,
+		&ContactEditorData.FreeBusyListPref,
+		lboFreeBusyAddresses,
+		(intValueSeek));
+	frameCECalAdr->ShowModal();
+	delete frameCECalAdr;
+	frameCECalAdr = NULL;
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyFreeBusy( wxCommandEvent& event )
 {
-    long longSelected = -1;
-    int intSelectedData = 0;
-    
-    if (!GetSelectedItem(lboFreeBusyAddresses,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
-    
-    frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
-    frameCECalAdr->SetupPointers(&FreeBusyList,
-                                 &FreeBusyListAltID,
-                                 &FreeBusyListPID,
-                                 &FreeBusyListType,
-                                 &FreeBusyListTokens,
-                                 &FreeBusyListPref,
-                                 lboFreeBusyAddresses,
-                                 intSelectedData);
-    frameCECalAdr->SetEditorMode(TRUE);
-    frameCECalAdr->ShowModal();
-    delete frameCECalAdr;
-    frameCECalAdr = NULL;
+
+	// Bring up the window to modify a calendar free/busy address.
+
+	long longSelected = -1;
+	int intSelectedData = 0;
+    
+	if (lboFreeBusyAddresses->GetItemCount() == 0 || !GetSelectedItem(lboFreeBusyAddresses,
+		&longSelected,
+		&intSelectedData)){
+		
+		return;
+		
+	}
+    
+	frmContactEditorCalAdr *frameCECalAdr = new frmContactEditorCalAdr ( this );
+	frameCECalAdr->SetupPointers(&ContactEditorData.FreeBusyList,
+		&ContactEditorData.FreeBusyListAltID,
+		&ContactEditorData.FreeBusyListPID,
+		&ContactEditorData.FreeBusyListType,
+		&ContactEditorData.FreeBusyListTokens,
+		&ContactEditorData.FreeBusyListPref,
+		lboFreeBusyAddresses,
+		intSelectedData);
+	frameCECalAdr->SetEditorMode(TRUE);
+	frameCECalAdr->ShowModal();
+	delete frameCECalAdr;
+	frameCECalAdr = NULL;
+	
 }
 
 void frmContactEditor::DeleteFreeBusy( wxCommandEvent& event )
 {
-    long longSelected = -1;
-    int intSelectedData = 0;
-    
-    if (!GetSelectedItem(lboFreeBusyAddresses,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
-    
-    lboFreeBusyAddresses->DeleteItem(longSelected);
-    
-    DeleteMapData(intSelectedData, &FreeBusyList, &FreeBusyListAltID,
-                  &FreeBusyListPID, &FreeBusyListType, &FreeBusyListTokens,
-                  &FreeBusyListPref);
+
+	// Bring up the window to delete a calendar free/busy address.
+
+	long longSelected = -1;
+	int intSelectedData = 0;
+    
+	if (lboFreeBusyAddresses->GetItemCount() == 0 || !GetSelectedItem(lboFreeBusyAddresses,
+		&longSelected,
+		&intSelectedData)){
+		
+		return;
+		
+	}
+    
+	lboFreeBusyAddresses->DeleteItem(longSelected);
+    
+	DeleteMapData(intSelectedData, &ContactEditorData.FreeBusyList, &ContactEditorData.FreeBusyListAltID,
+		&ContactEditorData.FreeBusyListPID, &ContactEditorData.FreeBusyListType, &ContactEditorData.FreeBusyListTokens,
+		&ContactEditorData.FreeBusyListPref);
     
 }