From 473056956cd58cb9ea166551e9a8961e00c9c88e Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Fri, 1 Jan 2016 14:15:12 +0000 Subject: [PATCH] All items in the Logos tab in the contact editor now use ContactDataObject. --- .../contacteditor/frmContactEditor-Logo.cpp | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/source/contacteditor/frmContactEditor-Logo.cpp b/source/contacteditor/frmContactEditor-Logo.cpp index 8205da7..fe3da0d 100644 --- a/source/contacteditor/frmContactEditor-Logo.cpp +++ b/source/contacteditor/frmContactEditor-Logo.cpp @@ -1,6 +1,6 @@ // frmContactEditor-Logo.cpp - frmContactEditor Logo tab subroutines. // -// (c) 2012-2015 Xestia Software Development. +// (c) 2012-2016 Xestia Software Development. // // This file is part of Xestia Address Book. // @@ -87,16 +87,16 @@ void frmContactEditor::AddLogo( wxCommandEvent& event ) frmContactEditorPicture *frameCELogo = new frmContactEditorPicture ( this ); frameCELogo->SetEditorMode(FALSE); - intResult = GetLastInt(&LogosList); - frameCELogo->SetupPointers(&LogosList, - &LogosListAltID, - &LogosListPID, - &LogosListType, - &LogosListPicEncType, - &LogosListPictureType, - &LogosListTokens, - &LogosListMediatype, - &LogosListPref, + intResult = GetLastInt(&ContactEditorData.LogosList); + frameCELogo->SetupPointers(&ContactEditorData.LogosList, + &ContactEditorData.LogosListAltID, + &ContactEditorData.LogosListPID, + &ContactEditorData.LogosListType, + &ContactEditorData.LogosListPicEncType, + &ContactEditorData.LogosListPictureType, + &ContactEditorData.LogosListTokens, + &ContactEditorData.LogosListMediatype, + &ContactEditorData.LogosListPref, lboLogos, (intValueSeek)); frameCELogo->ShowModal(); @@ -116,15 +116,15 @@ void frmContactEditor::ModifyLogo( wxCommandEvent& event ) } frmContactEditorPicture *frameCELogo = new frmContactEditorPicture ( this ); - frameCELogo->SetupPointers(&LogosList, - &LogosListAltID, - &LogosListPID, - &LogosListType, - &LogosListPicEncType, - &LogosListPictureType, - &LogosListTokens, - &LogosListMediatype, - &LogosListPref, + frameCELogo->SetupPointers(&ContactEditorData.LogosList, + &ContactEditorData.LogosListAltID, + &ContactEditorData.LogosListPID, + &ContactEditorData.LogosListType, + &ContactEditorData.LogosListPicEncType, + &ContactEditorData.LogosListPictureType, + &ContactEditorData.LogosListTokens, + &ContactEditorData.LogosListMediatype, + &ContactEditorData.LogosListPref, lboLogos, intSelectedData); frameCELogo->SetEditorMode(TRUE); @@ -147,9 +147,9 @@ void frmContactEditor::DeleteLogo( wxCommandEvent& event ) lboLogos->DeleteItem(longSelected); DeleteMapData(intSelectedData, - &LogosList, &LogosListAltID, &LogosListPID, &LogosListType, - &LogosListPicEncType, &LogosListPictureType, &LogosListTokens, - &LogosListMediatype, &LogosListPref); + &ContactEditorData.LogosList, &ContactEditorData.LogosListAltID, &ContactEditorData.LogosListPID, &ContactEditorData.LogosListType, + &ContactEditorData.LogosListPicEncType, &ContactEditorData.LogosListPictureType, &ContactEditorData.LogosListTokens, + &ContactEditorData.LogosListMediatype, &ContactEditorData.LogosListPref); wxMemoryInputStream istream(misc_emptyimage_png, sizeof(misc_emptyimage_png)); wxImage misc_emptyimage_png(istream, wxBITMAP_TYPE_PNG); -- 2.39.5