Implemented GEO and URL to use ContactDataObject.

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index d7f8134..14b20bd 100644 (file)
--- 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