All items in the Category tab for the contact editor now use ContactDataObject.

diff --git a/source/contacteditor/frmContactEditor-Category.cpp b/source/contacteditor/frmContactEditor-Category.cpp
index dc82de9..0b1ab28 100644 (file)
--- 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