All items in the Logos tab in the contact editor now use ContactDataObject.

diff --git a/source/contacteditor/frmContactEditor-Logo.cpp b/source/contacteditor/frmContactEditor-Logo.cpp
index 8205da7..fe3da0d 100644 (file)
--- 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);