X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Logo.cpp;h=7aa33099d5152a2bad8bf28349b240669af0b3af;hb=4ecf020f6b1aab7c70d179826e620ad25b815810;hp=cf9e3f448bb871cf2d7f4a0aa8cdac1ed8e43f7d;hpb=79cd2c822bc89d6d671069cf591bb4759192ddd0;p=xestiaab%2F.git diff --git a/source/contacteditor/frmContactEditor-Logo.cpp b/source/contacteditor/frmContactEditor-Logo.cpp index cf9e3f4..7aa3309 100644 --- a/source/contacteditor/frmContactEditor-Logo.cpp +++ b/source/contacteditor/frmContactEditor-Logo.cpp @@ -46,8 +46,7 @@ void frmContactEditor::LoadLogo( wxListEvent& event ) wxMemoryInputStream istream(base64dec.c_str(), (size_t)base64dec.size()); wxImage photo; - //wxMemoryInputStream istream(base64dec, (size_t)base64dec.size()); - + if (pictypeiter->second == wxT("image/jpeg")){ if (!photo.LoadFile(istream, wxBITMAP_TYPE_JPEG)){ @@ -87,12 +86,9 @@ void frmContactEditor::AddLogo( wxCommandEvent& event ) { // Bring up the window to add a logo. - - int intResult = 0; - + frmContactEditorPicture *frameCELogo = new frmContactEditorPicture ( this ); frameCELogo->SetEditorMode(FALSE); - intResult = GetLastInt(&ContactEditorData.LogosList); frameCELogo->SetupPointers(&ContactEditorData.LogosList, &ContactEditorData.LogosListAltID, &ContactEditorData.LogosListPID,