"));
- PageData.append(wxT(""));
+ PageData.append(wxT(" | "));
PageData.append(wxT(""));
PageData.append(vCardObj->Get(wxT("FN")));
PageData.append(wxT(""));
PageData.append(wxT(" | "));
- PageData.append(wxT(""));
+ PageData.append(wxT(" | "));
// Define common variables for ADR.
@@ -417,12 +422,13 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
ContactData = vCardObj->GetByPartial(wxT("PHOTO"));
bool AddBreak = FALSE;
+ wxString TypePageData;
if (ContactData.PropCount > 1){
- PageData.append(wxT(""));
+ TypePageData.append(wxT(""));
AddBreak = TRUE;
}
@@ -431,9 +437,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount > 1){
- PageData.append(wxT(""));
+ TypePageData.append(wxT(""));
AddBreak = TRUE;
}
@@ -442,9 +448,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount >= 1){
- PageData.append(wxT(""));
+ TypePageData.append(wxT(""));
AddBreak = TRUE;
}
@@ -453,9 +459,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount >= 1){
- PageData.append(wxT(""));
+ TypePageData.append(wxT(""));
AddBreak = TRUE;
}
@@ -464,9 +470,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount >= 1){
- PageData.append(wxT(""));
+ TypePageData.append(wxT(""));
AddBreak = TRUE;
}
@@ -475,13 +481,21 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount >= 1){
- PageData.append(wxT(""));
+ TypePageData.append(wxT(""));
AddBreak = TRUE;
}
+ if (!TypePageData.IsEmpty()){
+
+ PageData.append("");
+ PageData.append(TypePageData);
+ PageData.append(" | ");
+
+ }
+
if (AddBreak == TRUE){
PageData.append(wxT("
"));
@@ -526,6 +540,8 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
}
+ PageData.append("");
+
if (DataDisplay == TRUE){
DataLines.Trim();
@@ -1618,6 +1634,8 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
// Display the HTML document on the screen.
+ PageData.append(" | ");
+
PageData.append(wxT(""));
PageData.append(wxT(" |