X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorCalAdr.cpp;h=ac26f5a0e02a26dbda5672c459662c54b163ed60;hb=b7da64cd1d2133700e97d3542ff364ebe1de3a89;hp=f6908111cd0fbca103c7439ed7d5599597b2d7d1;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorCalAdr.cpp b/source/contacteditor/frmContactEditorCalAdr.cpp
index f690811..ac26f5a 100644
--- a/source/contacteditor/frmContactEditorCalAdr.cpp
+++ b/source/contacteditor/frmContactEditorCalAdr.cpp
@@ -24,25 +24,36 @@ frmContactEditorCalAdr::frmContactEditorCalAdr( wxWindow* parent )
 :
 frmContactEditorCalAdrADT( parent )
 {
+	
+	// Setup the window.
+	
 	EditorMode = FALSE;
 	sliPriority->Disable();
 	
 	cmbType->Append(wxT(""));
 	cmbType->Append(_("Home"));
-	cmbType->Append(_("Work"));	
+	cmbType->Append(_("Work"));
+	
 }
 
 void frmContactEditorCalAdr::EnablePriority( wxCommandEvent& event )
 {
+	
+	// Enable/disable the priority setting.
+	
 	if (chkUsePref->IsChecked()){
 		sliPriority->Enable();
 	} else {
 		sliPriority->Disable();
 	}
+	
 }
 
 void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
 {
+	
+	// Process action.
+	
 	long ListCtrlIndex;
 	
 	if (EditorMode == FALSE){
@@ -171,10 +182,14 @@ void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
 		this->Close();	
 	
 	}
+	
 }
 
 void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
 {
+	
+	// Set the editor mode.
+	
 	// Set if the editor is adding or editing an address.
 	// FALSE = Add
 	// TRUE = Edit
@@ -213,7 +228,8 @@ void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
 		
 		striter = CalAdrListTypePtr->find(CalAdrListIndex);	
 		
-		if (striter->first == CalAdrListIndex){
+		if (striter->first == CalAdrListIndex && 
+			striter != CalAdrListTypePtr->end()){
 		
 			strValue = striter->second;
 		
@@ -237,7 +253,8 @@ void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
 		
 		intiter = CalAdrListPrefPtr->find(CalAdrListIndex);
 		
-		if (intiter->first == CalAdrListIndex && intiter->second > 0){
+		if (intiter->first == CalAdrListIndex && intiter->second > 0 &&
+			intiter != CalAdrListPrefPtr->end()){
 		
 			sliPriority->SetValue(intiter->second);
 			sliPriority->Enable();
@@ -251,7 +268,11 @@ void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
 
 void frmContactEditorCalAdr::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close the window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorCalAdr::SetupPointers(std::map<int, wxString> *CalAdrList,
@@ -264,6 +285,8 @@ void frmContactEditorCalAdr::SetupPointers(std::map<int, wxString> *CalAdrList,
 	int CalAdrIndex )
 {
 
+	// Setup the pointers.
+	
 	CalAdrListPtr = CalAdrList;
 	CalAdrListAltIDPtr = CalAdrListAltID;
 	CalAdrListPIDPtr = CalAdrListPID;