X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorGeoposition.cpp;h=4f9160541918342fdac09f7ba23a2e7f225e1e65;hb=d2af0d377f811147185b226142da45b71fc20d65;hp=d16f8a0f79ba2b3b52a8b672c0c8ae574c2c179e;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorGeoposition.cpp b/source/contacteditor/frmContactEditorGeoposition.cpp
index d16f8a0..4f91605 100644
--- a/source/contacteditor/frmContactEditorGeoposition.cpp
+++ b/source/contacteditor/frmContactEditorGeoposition.cpp
@@ -24,6 +24,9 @@ frmContactEditorGeoposition::frmContactEditorGeoposition( wxWindow* parent )
 :
 frmContactEditorGeopositionADT( parent )
 {
+	
+	// Setup the window.
+	
 	EditorMode = FALSE;
 	sliPriority->Disable();
 }
@@ -31,6 +34,8 @@ frmContactEditorGeopositionADT( parent )
 void frmContactEditorGeoposition::EnablePriority( wxCommandEvent& event )
 {
 
+	// Enable/Disable the priority setting.
+	
 	if (chkUsePref->IsChecked()){
 		sliPriority->Enable();
 	} else {
@@ -42,6 +47,8 @@ void frmContactEditorGeoposition::EnablePriority( wxCommandEvent& event )
 void frmContactEditorGeoposition::SetEditorMode(bool EditMode, SectionType SectType)
 {
 
+	// Setup the editor mode.
+	
 	// Set the editor mode for adding or editing a timezone.
 
 	if (EditMode == FALSE){
@@ -76,7 +83,8 @@ void frmContactEditorGeoposition::SetEditorMode(bool EditMode, SectionType SectT
 		
 		intiter = GeopositionListPrefPtr->find(GeopositionListIndex);
 		
-		if (intiter->first == GeopositionListIndex && intiter->second > 0){
+		if (intiter->first == GeopositionListIndex && intiter->second > 0 &&
+			intiter != GeopositionListPrefPtr->end()){
 		
 			sliPriority->SetValue(intiter->second);
 			sliPriority->Enable();
@@ -93,6 +101,8 @@ void frmContactEditorGeoposition::SetEditorMode(bool EditMode, SectionType SectT
 void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
 {
 
+	// Process action.
+	
 	long ListCtrlIndex;
 
 	if (EditorMode == FALSE){
@@ -203,13 +213,18 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
 
 void frmContactEditorGeoposition::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close this window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorGeoposition::SetupPointers(std::map<int, wxString> *GeopositionList,
 	std::map<int, wxString> *GeopositionListAltID,
 	std::map<int, wxString> *GeopositionListPID,
 	std::map<int, wxString> *GeopositionListType,
+	std::map<int, wxString> *GeopositionListDataType,
 	std::map<int, wxString> *GeopositionListTokens,
 	std::map<int, wxString> *GeopositionListMediatype,	
 	std::map<int, int> *GeopositionListPref,
@@ -224,6 +239,7 @@ void frmContactEditorGeoposition::SetupPointers(std::map<int, wxString> *Geoposi
 	GeopositionListAltIDPtr = GeopositionListAltID;
 	GeopositionListPIDPtr = GeopositionListPID;
 	GeopositionListTypePtr = GeopositionListType;
+	GeopositionListDataTypePtr = GeopositionListDataType;
 	GeopositionListTokensPtr = GeopositionListTokens;
 	GeopositionListPrefPtr = GeopositionListPref;
 	GeopositionListCtrlPtr = GeopositionListCtrl;