From afac9861ea075bd0c0bd0f5724c104466b96fb3d Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Fri, 1 Jan 2016 14:23:36 +0000 Subject: [PATCH] All items within the Sound tab of the Contact Editor now use ContactDataObject. --- .../contacteditor/frmContactEditor-Sound.cpp | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/source/contacteditor/frmContactEditor-Sound.cpp b/source/contacteditor/frmContactEditor-Sound.cpp index 2485121..f6b6643 100644 --- a/source/contacteditor/frmContactEditor-Sound.cpp +++ b/source/contacteditor/frmContactEditor-Sound.cpp @@ -1,6 +1,6 @@ // frmContactEditor-Sound.cpp - frmContactEditor Sound tab subroutines. // -// (c) 2012-2015 Xestia Software Development. +// (c) 2012-2016 Xestia Software Development. // // This file is part of Xestia Address Book. // @@ -28,16 +28,16 @@ void frmContactEditor::AddSound( wxCommandEvent& event ) frmContactEditorSound *frameCESound = new frmContactEditorSound ( this ); frameCESound->SetEditorMode(FALSE); - intResult = GetLastInt(&SoundsList); - frameCESound->SetupPointers(&SoundsList, - &SoundsListAltID, - &SoundsListPID, - &SoundsListType, - &SoundsListAudioType, - &SoundsListAudioEncType, - &SoundsListTokens, - &SoundsListMediatype, - &SoundsListPref, + intResult = GetLastInt(&ContactEditorData.SoundsList); + frameCESound->SetupPointers(&ContactEditorData.SoundsList, + &ContactEditorData.SoundsListAltID, + &ContactEditorData.SoundsListPID, + &ContactEditorData.SoundsListType, + &ContactEditorData.SoundsListAudioType, + &ContactEditorData.SoundsListAudioEncType, + &ContactEditorData.SoundsListTokens, + &ContactEditorData.SoundsListMediatype, + &ContactEditorData.SoundsListPref, lboSounds, (intValueSeek)); frameCESound->ShowModal(); @@ -57,15 +57,15 @@ void frmContactEditor::ModifySound( wxCommandEvent& event ) } frmContactEditorSound *frameCESound = new frmContactEditorSound ( this ); - frameCESound->SetupPointers(&SoundsList, - &SoundsListAltID, - &SoundsListPID, - &SoundsListType, - &SoundsListAudioType, - &SoundsListAudioEncType, - &SoundsListTokens, - &SoundsListMediatype, - &SoundsListPref, + frameCESound->SetupPointers(&ContactEditorData.SoundsList, + &ContactEditorData.SoundsListAltID, + &ContactEditorData.SoundsListPID, + &ContactEditorData.SoundsListType, + &ContactEditorData.SoundsListAudioType, + &ContactEditorData.SoundsListAudioEncType, + &ContactEditorData.SoundsListTokens, + &ContactEditorData.SoundsListMediatype, + &ContactEditorData.SoundsListPref, lboSounds, intSelectedData); frameCESound->SetEditorMode(TRUE); @@ -87,10 +87,10 @@ void frmContactEditor::DeleteSound( wxCommandEvent& event ) lboSounds->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &SoundsList, &SoundsListAltID, - &SoundsListPID, &SoundsListType, &SoundsListAudioType, - &SoundsListAudioEncType, &SoundsListTokens, &SoundsListMediatype, - &SoundsListPref); + DeleteMapData(intSelectedData, &ContactEditorData.SoundsList, &ContactEditorData.SoundsListAltID, + &ContactEditorData.SoundsListPID, &ContactEditorData.SoundsListType, &ContactEditorData.SoundsListAudioType, + &ContactEditorData.SoundsListAudioEncType, &ContactEditorData.SoundsListTokens, &ContactEditorData.SoundsListMediatype, + &ContactEditorData.SoundsListPref); } -- 2.39.5