X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorCategory.cpp;h=bb6108321bc11fe13ee4c30211f6e69df0cab070;hb=5e38e618bf727f602379725148dd8e2a1d9132d1;hp=eba5dadbab76914ef17aa22e1409e5ec89628ab6;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorCategory.cpp b/source/contacteditor/frmContactEditorCategory.cpp
index eba5dad..bb61083 100644
--- a/source/contacteditor/frmContactEditorCategory.cpp
+++ b/source/contacteditor/frmContactEditorCategory.cpp
@@ -24,6 +24,9 @@ frmContactEditorCategory::frmContactEditorCategory( wxWindow* parent )
 :
 frmContactEditorCategoryADT( parent )
 {
+	
+	// Setup the window.
+	
 	EditorMode = FALSE;
 	sliPriority->Disable();
 
@@ -34,16 +37,22 @@ frmContactEditorCategoryADT( parent )
 
 void frmContactEditorCategory::EnablePriority( wxCommandEvent& event )
 {
+	
+	// Enable/disable the priority setting.
+	
 	if (chkUsePref->IsChecked()){
 		sliPriority->Enable();
 	} else {
 		sliPriority->Disable();
 	}
+	
 }
 
 void frmContactEditorCategory::ProcessAction( wxCommandEvent& event )
 {
 
+	// Process action.
+	
 	long ListCtrlIndex;
 	
 	if (EditorMode == FALSE){
@@ -173,6 +182,9 @@ void frmContactEditorCategory::ProcessAction( wxCommandEvent& event )
 
 void frmContactEditorCategory::SetEditorMode(bool EditMode)
 {
+	
+	// Set the editor mode.
+	
 	// Set if the editor is adding or editing an address.
 	// FALSE = Add
 	// TRUE = Edit
@@ -213,7 +225,8 @@ void frmContactEditorCategory::SetEditorMode(bool EditMode)
 		
 		striter = CategoryListTypePtr->find(CategoryListIndex);	
 		
-		if (striter->first == CategoryListIndex){
+		if (striter->first == CategoryListIndex &&
+			striter != CategoryListTypePtr->end()){
 		
 			strValue = striter->second;
 		
@@ -237,7 +250,8 @@ void frmContactEditorCategory::SetEditorMode(bool EditMode)
 		
 		intiter = CategoryListPrefPtr->find(CategoryListIndex);
 		
-		if (intiter->first == CategoryListIndex && intiter->second > 0){
+		if (intiter->first == CategoryListIndex && intiter->second > 0 &&
+			intiter != CategoryListPrefPtr->end()){
 		
 			sliPriority->SetValue(intiter->second);
 			sliPriority->Enable();
@@ -251,7 +265,11 @@ void frmContactEditorCategory::SetEditorMode(bool EditMode)
 
 void frmContactEditorCategory::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close this window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorCategory::SetupPointers(std::map<int, wxString> *CategoryList,
@@ -264,8 +282,9 @@ void frmContactEditorCategory::SetupPointers(std::map<int, wxString> *CategoryLi
 	int CategoryIndex )
 {
 
+	// Setup the pointers.
+	
 	CategoryListPtr = CategoryList;
-	//CategoryListSortAsPtr = CategoryListSortAs;
 	CategoryListAltIDPtr = CategoryListAltID;
 	CategoryListPIDPtr = CategoryListPID;
 	CategoryListTypePtr = CategoryListType;