From 012aecddc050ea1e93ffa84ca510ed9a4085aa34 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Fri, 1 Jan 2016 14:01:54 +0000 Subject: [PATCH] All items in the Category tab for the contact editor now use ContactDataObject. --- .../frmContactEditor-Category.cpp | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/source/contacteditor/frmContactEditor-Category.cpp b/source/contacteditor/frmContactEditor-Category.cpp index dc82de9..0b1ab28 100644 --- a/source/contacteditor/frmContactEditor-Category.cpp +++ b/source/contacteditor/frmContactEditor-Category.cpp @@ -25,13 +25,13 @@ void frmContactEditor::AddCategory( wxCommandEvent& event ) frmContactEditorCategory *frameCECategory = new frmContactEditorCategory ( this ); frameCECategory->SetEditorMode(FALSE); - intResult = GetLastInt(&CategoriesList); - frameCECategory->SetupPointers(&CategoriesList, - &CategoriesListAltID, - &CategoriesListPID, - &CategoriesListType, - &CategoriesListTokens, - &CategoriesListPref, + intResult = GetLastInt(&ContactEditorData.CategoriesList); + frameCECategory->SetupPointers(&ContactEditorData.CategoriesList, + &ContactEditorData.CategoriesListAltID, + &ContactEditorData.CategoriesListPID, + &ContactEditorData.CategoriesListType, + &ContactEditorData.CategoriesListTokens, + &ContactEditorData.CategoriesListPref, lboCategories, (intValueSeek)); frameCECategory->ShowModal(); @@ -51,12 +51,12 @@ void frmContactEditor::ModifyCategory( wxCommandEvent& event ) } frmContactEditorCategory *frameCECategory = new frmContactEditorCategory ( this ); - frameCECategory->SetupPointers(&CategoriesList, - &CategoriesListAltID, - &CategoriesListPID, - &CategoriesListType, - &CategoriesListTokens, - &CategoriesListPref, + frameCECategory->SetupPointers(&ContactEditorData.CategoriesList, + &ContactEditorData.CategoriesListAltID, + &ContactEditorData.CategoriesListPID, + &ContactEditorData.CategoriesListType, + &ContactEditorData.CategoriesListTokens, + &ContactEditorData.CategoriesListPref, lboCategories, intSelectedData); frameCECategory->SetEditorMode(TRUE); @@ -78,9 +78,9 @@ void frmContactEditor::DeleteCategory( wxCommandEvent& event ) lboCategories->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &CategoriesList, - &CategoriesListAltID, &CategoriesListPID, - &CategoriesListType, &CategoriesListTokens, - &CategoriesListPref); + DeleteMapData(intSelectedData, &ContactEditorData.CategoriesList, + &ContactEditorData.CategoriesListAltID, &ContactEditorData.CategoriesListPID, + &ContactEditorData.CategoriesListType, &ContactEditorData.CategoriesListTokens, + &ContactEditorData.CategoriesListPref); } \ No newline at end of file -- 2.39.5