Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Using ContactDataObject for N.
[xestiaab/.git]
/
source
/
contacteditor
/
frmContactEditor-Load.cpp
diff --git
a/source/contacteditor/frmContactEditor-Load.cpp
b/source/contacteditor/frmContactEditor-Load.cpp
index
2217c94
..
4049a22
100644
(file)
--- a/
source/contacteditor/frmContactEditor-Load.cpp
+++ b/
source/contacteditor/frmContactEditor-Load.cpp
@@
-155,6
+155,12
@@
bool frmContactEditor::LoadContact(wxString Filename){
// Process the Gender (GENDER) (frmContactEditor-LoadGender.cpp)
LoadGender(&ContactEditorData.Gender, &ContactEditorData.GenderDetails);
// Process the Gender (GENDER) (frmContactEditor-LoadGender.cpp)
LoadGender(&ContactEditorData.Gender, &ContactEditorData.GenderDetails);
+
+ // Process the Name (N) (frmContactEditor-LoadName.cpp)
+
+ LoadName(&ContactEditorData.NameTitle, &ContactEditorData.NameForename,
+ &ContactEditorData.NameSurname, &ContactEditorData.NameOtherNames,
+ &ContactEditorData.NameSuffix);
for (std::map<int,wxString>::iterator iter = ContactFileLines.begin();
iter != ContactFileLines.end(); ++iter){
for (std::map<int,wxString>::iterator iter = ContactFileLines.begin();
iter != ContactFileLines.end(); ++iter){
@@
-275,13
+281,13
@@
bool frmContactEditor::LoadContact(wxString Filename){
LoadFN(wxSPropertySeg1, wxSPropertySeg2, &FNCount, &FNProcessed, &ContactData);
LoadFN(wxSPropertySeg1, wxSPropertySeg2, &FNCount, &FNProcessed, &ContactData);
- } else if (wxSProperty == wxT("N") && NameProcessed == FALSE){
+ }
/*
else if (wxSProperty == wxT("N") && NameProcessed == FALSE){
// See frmContactEditor-LoadName.cpp
LoadN(wxSPropertySeg1, wxSPropertySeg2, &NameProcessed, &ContactData);
// See frmContactEditor-LoadName.cpp
LoadN(wxSPropertySeg1, wxSPropertySeg2, &NameProcessed, &ContactData);
- } else if (wxSProperty == wxT("NICKNAME")){
+ }
*/
else if (wxSProperty == wxT("NICKNAME")){
// See frmContactEditor-LoadNickname.cpp
// See frmContactEditor-LoadNickname.cpp
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy