X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Calendar.cpp;h=083dc8051cd8e7ef7a6c21e248bf1b5f86581c7a;hb=bfe817b5bfae33a1eb666c463643ec119cd1d66d;hp=c31021021f92cd203de85a712bf209b857f8b63e;hpb=d107053a144fbcc4d8429f2980573e24122caa0f;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Calendar.cpp b/source/contacteditor/frmContactEditor-Calendar.cpp
index c310210..083dc80 100644
--- 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,
@@ -51,7 +48,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 +80,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 +100,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,
@@ -131,7 +125,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 +157,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 +178,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,
@@ -212,7 +203,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 +235,7 @@ void frmContactEditor::DeleteFreeBusy( wxCommandEvent& event )
 	long longSelected = -1;
 	int intSelectedData = 0;
     
-	if (!GetSelectedItem(lboFreeBusyAddresses,
+	if (lboFreeBusyAddresses->GetItemCount() == 0 || !GetSelectedItem(lboFreeBusyAddresses,
 		&longSelected,
 		&intSelectedData)){