Introduced simplified LoadGender.

[xestiaab/.git] / source / contacteditor / frmContactEditor-Load.cpp

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index 6b97937..6d63680 100644 (file)
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -30,6 +30,7 @@
 #include "../vcard/vcard.h"
 #include "../common/textprocessing.h"
 #include "../common/dirs.h"
+#include "cdo/ContactDataObject.h"
 
 bool frmContactEditor::LoadContact(wxString Filename){
 
@@ -61,6 +62,8 @@ bool frmContactEditor::LoadContact(wxString Filename){
        
        }
        
+       ContactEditorData.LoadFile(Filename);
+       
        ContactFile.ReadAll(&wxSContactString, wxConvAuto());
        
        // Split the lines.
@@ -133,6 +136,10 @@ bool frmContactEditor::LoadContact(wxString Filename){
        int XTokenCount = 0;
        //int intValueSeek = 1;
 
+       // Process the Gender (GENDER).
+       
+       LoadGender(&ContactEditorData.Gender, &ContactEditorData.GenderDetails);
+
        for (std::map<int,wxString>::iterator iter = ContactFileLines.begin(); 
         iter != ContactFileLines.end(); ++iter){
        
@@ -268,7 +275,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
                
                        // See frmContactEditor-LoadGender.cpp
                
-                       LoadGender(wxSPropertySeg1, wxSPropertySeg2, &GenderProcessed, &ContactData);
+                       //LoadGender(wxSPropertySeg1, wxSPropertySeg2, &GenderProcessed, &ContactData);
                
                } else if (wxSProperty == wxT("BDAY") && BirthdayProcessed == FALSE){