From 2171887a85a5eca924e73c23422a9fcc91e11bb2 Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Wed, 30 Dec 2015 00:22:36 +0000
Subject: [PATCH] Implemented GEO and URL to use ContactDataObject.

---
 .../contacteditor/frmContactEditor-Load.cpp   | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index d7f8134..14b20bd 100644
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -236,6 +236,32 @@ bool frmContactEditor::LoadContact(wxString Filename){
 		&ContactEditorData.BusinessLanguageListPref,
 		lboBusinessLanguages,
 		&LangCount);
+		
+	// Process the geoposition (GEO).
+	
+	LoadData(&ContactEditorData.GeneralGeographyList,
+		&ContactEditorData.GeneralGeographyListPref,
+		lboGeoposition,
+		&ContactEditorData.HomeGeographyList,
+		&ContactEditorData.HomeGeographyListPref,
+		lboHomeGeoposition,
+		&ContactEditorData.BusinessGeographyList,
+		&ContactEditorData.BusinessGeographyListPref,
+		lboBusinessGeoposition,
+		&GeoCount);
+		
+	// Process the website (URL).
+	
+	LoadData(&ContactEditorData.GeneralWebsiteList,
+		&ContactEditorData.GeneralWebsiteListPref,
+		lboWebsites,
+		&ContactEditorData.HomeWebsiteList,
+		&ContactEditorData.HomeWebsiteListPref,
+		lboHomeWebsites,
+		&ContactEditorData.BusinessWebsiteList,
+		&ContactEditorData.BusinessWebsiteListPref,
+		lboBusinessWebsites,
+		&URLCount);
 
 	for (std::map<int,wxString>::iterator iter = ContactFileLines.begin(); 
 	 iter != ContactFileLines.end(); ++iter){
@@ -422,25 +448,25 @@ bool frmContactEditor::LoadContact(wxString Filename){
 			
 			LoadLanguage(wxSPropertySeg1, wxSPropertySeg2, &LangCount);
 		
-		}*/ else if (wxSProperty == wxT("GEO")){
+		} else if (wxSProperty == wxT("GEO")){
 		
 			// See frmContactEditor-LoadGeo.cpp
 			
 			LoadGeo(wxSPropertySeg1, wxSPropertySeg2, &GeoCount);	
 		
-		} else if (wxSProperty == wxT("RELATED")){
+		}*/ else if (wxSProperty == wxT("RELATED")){
 			
 			// See fromContactEditor-LoadRelated.cpp
 			
 			LoadRelated(wxSPropertySeg1, wxSPropertySeg2, &RelatedCount);		
 		
-		} else if (wxSProperty == wxT("URL")){
+		}/* else if (wxSProperty == wxT("URL")){
 
 			// See frmContactEditor-LoadURL.cpp
 		
 			LoadURL(wxSPropertySeg1, wxSPropertySeg2, &URLCount);
 		
-		} else if (wxSProperty == wxT("TITLE")) {
+		}*/ else if (wxSProperty == wxT("TITLE")) {
 		
 			// See frmContactEditor-LoadTitle.cpp
 			
-- 
2.39.5