Implemented all remaining elements to use ContactDataObject.

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

diff --git a/source/contacteditor/frmContactEditor-Logo.cpp b/source/contacteditor/frmContactEditor-Logo.cpp
index 5f0eba8..8205da7 100644 (file)
--- a/source/contacteditor/frmContactEditor-Logo.cpp
+++ b/source/contacteditor/frmContactEditor-Logo.cpp
@@ -35,22 +35,46 @@ void frmContactEditor::LoadLogo( wxListEvent& event )
     std::string base64dec;
     
     std::map<int,std::string>::iterator initier;
+    std::map<int,wxString>::iterator pictypeiter;
     
-    initier = LogosList.find(intSelectedData);
+    initier = ContactEditorData.LogosList.find(intSelectedData);
+    pictypeiter = ContactEditorData.LogosListPictureType.find(intSelectedData);
     
     base64dec = base64_decode(initier->second);
     
-    
     wxMemoryInputStream istream(base64dec.c_str(), (size_t)base64dec.size());
     wxImage photo;
     //wxMemoryInputStream istream(base64dec, (size_t)base64dec.size());
     
-    if (!photo.LoadFile(istream, wxBITMAP_TYPE_ANY)){
+    if (pictypeiter->second == wxT("image/jpeg")){
         
-        return;
+        if (!photo.LoadFile(istream, wxBITMAP_TYPE_JPEG)){
         
-    }
+            return;
+        
+        }
+        
+    } else if (pictypeiter->second == wxT("image/png")){
+        
+        if (!photo.LoadFile(istream, wxBITMAP_TYPE_PNG)){
+            
+            return;
+            
+        }
+        
+    } else if (pictypeiter->second == wxT("image/gif")){
+        
+        if (!photo.LoadFile(istream, wxBITMAP_TYPE_GIF)){
+            
+            return;
+            
+        }
+        
+    } else {
     
+        return;
+    
+    }
     
     LogoImage = (wxBitmap)photo;
     imgLogo->SetBitmap(LogoImage);
@@ -155,8 +179,8 @@ void frmContactEditor::SaveLogo( wxCommandEvent &event )
        std::map<int,std::string>::iterator initier;
        std::map<int,wxString>::iterator logotypeiter;
     
-       initier = LogosList.find(intSelectedData);
-       logotypeiter = LogosListPictureType.find(intSelectedData);
+       initier = ContactEditorData.LogosList.find(intSelectedData);
+       logotypeiter = ContactEditorData.LogosListPictureType.find(intSelectedData);
        
        if (logotypeiter->second == wxT("image/jpeg")){
     
@@ -196,7 +220,7 @@ void frmContactEditor::SaveLogo( wxCommandEvent &event )
        
                std::string base64dec;
                
-               initier = LogosList.find(intSelectedData);
+               initier = ContactEditorData.LogosList.find(intSelectedData);
                base64dec = base64_decode(initier->second);
                
                LogoFile.Write(base64dec.c_str(), (size_t)base64dec.size());