getcontactinfo.cpp: Fix issue with using wxTransparentColour

[xestiaab/.git] / source / common / getcontactinfo.cpp

diff --git a/source/common/getcontactinfo.cpp b/source/common/getcontactinfo.cpp
index b997279..a07ec4a 100644 (file)
--- a/source/common/getcontactinfo.cpp
+++ b/source/common/getcontactinfo.cpp
@@ -32,13 +32,14 @@
 #include "../vcard/vcard34conv.h"
 
 void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID, 
-       wxString OldSID, std::map<wxString, wxString> *MemoryFSList){
+       wxString OldSID, std::map<wxString, wxString> *MemoryFSList, wxColour backgroundColour){
 
        // Load the vCard contact data into the wxHTMLWindow given.
 
        // Show message to user that the contact information is loading.
 
        HTMLObj->SetBorders(0);
+       HTMLObj->SetBackgroundColour(wxColour(160,160,160,0));
                
        wxString PageData;
        
@@ -467,6 +468,8 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
        
        }
        
+       // TODO: Setup the second table.
+       
        // Process Birthday
        
        ContactData = vCardObj->GetByPartial(wxT("BDAY"));
@@ -551,7 +554,13 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
                
        }
        
-       PageData.append("<table CELLPADDING=4 style=\"{width: 100%;}\"><tr><td>");
+       if (backgroundColour != wxTransparentColour){
+               PageData.append("<table CELLPADDING=4 style=\"{background-color: ");
+               PageData.append(backgroundColour.GetAsString(wxC2S_CSS_SYNTAX));
+               PageData.append("; width: 100%;}\"><tr><td>");          
+       } else {
+               PageData.append("<table CELLPADDING=4 style=\"{width: 100%;}\"><tr><td>");
+       }
        
        if (DataDisplay == TRUE){