All items within the Pictures tab of the contact editor now use ContactDataObject.

diff --git a/source/contacteditor/frmContactEditor-Picture.cpp b/source/contacteditor/frmContactEditor-Picture.cpp
index 402f672..c99057e 100644 (file)
--- a/source/contacteditor/frmContactEditor-Picture.cpp
+++ b/source/contacteditor/frmContactEditor-Picture.cpp
@@ -1,6 +1,6 @@
 // frmContactEditor-Picture.cpp - frmContactEditor Picture tab subroutines.
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2016 Xestia Software Development.
 //
 // This file is part of Xestia Address Book.
 //
@@ -27,16 +27,16 @@ void frmContactEditor::AddPicture( wxCommandEvent& event )
     
     frmContactEditorPicture *frameCEPicture = new frmContactEditorPicture ( this );
     frameCEPicture->SetEditorMode(FALSE);
-    intResult = GetLastInt(&PicturesList);
-    frameCEPicture->SetupPointers(&PicturesList,
-                                  &PicturesListAltID,
-                                  &PicturesListPID,
-                                  &PicturesListType,
-                                  &PicturesListPicEncType,
-                                  &PicturesListPictureType,
-                                  &PicturesListTokens,
-                                  &PicturesListMediatype,
-                                  &PicturesListPref,
+    intResult = GetLastInt(&ContactEditorData.PicturesList);
+    frameCEPicture->SetupPointers(&ContactEditorData.PicturesList,
+                                  &ContactEditorData.PicturesListAltID,
+                                  &ContactEditorData.PicturesListPID,
+                                  &ContactEditorData.PicturesListType,
+                                  &ContactEditorData.PicturesListPicEncType,
+                                  &ContactEditorData.PicturesListPictureType,
+                                  &ContactEditorData.PicturesListTokens,
+                                  &ContactEditorData.PicturesListMediatype,
+                                  &ContactEditorData.PicturesListPref,
                                   lboPictures,
                                   (intValueSeek));
     frameCEPicture->ShowModal();
@@ -56,15 +56,15 @@ void frmContactEditor::ModifyPicture( wxCommandEvent& event )
     }
     
     frmContactEditorPicture *frameCEPicture = new frmContactEditorPicture ( this );
-    frameCEPicture->SetupPointers(&PicturesList,
-                                  &PicturesListAltID,
-                                  &PicturesListPID,
-                                  &PicturesListType,
-                                  &PicturesListPicEncType,
-                                  &PicturesListPictureType,
-                                  &PicturesListTokens,
-                                  &PicturesListMediatype,
-                                  &PicturesListPref,
+    frameCEPicture->SetupPointers(&ContactEditorData.PicturesList,
+                                  &ContactEditorData.PicturesListAltID,
+                                  &ContactEditorData.PicturesListPID,
+                                  &ContactEditorData.PicturesListType,
+                                  &ContactEditorData.PicturesListPicEncType,
+                                  &ContactEditorData.PicturesListPictureType,
+                                  &ContactEditorData.PicturesListTokens,
+                                  &ContactEditorData.PicturesListMediatype,
+                                  &ContactEditorData.PicturesListPref,
                                   lboPictures,
                                   intSelectedData);
     frameCEPicture->SetEditorMode(TRUE);
@@ -88,9 +88,9 @@ void frmContactEditor::DeletePicture( wxCommandEvent& event )
     lboPictures->DeleteItem(longSelected);
     
     DeleteMapData(intSelectedData,
-                  &PicturesList, &PicturesListAltID, &PicturesListPID, &PicturesListType,
-                  &PicturesListPicEncType, &PicturesListPictureType, &PicturesListTokens,
-                  &PicturesListMediatype, &PicturesListPref);
+                  &ContactEditorData.PicturesList, &ContactEditorData.PicturesListAltID, &ContactEditorData.PicturesListPID, &ContactEditorData.PicturesListType,
+                  &ContactEditorData.PicturesListPicEncType, &ContactEditorData.PicturesListPictureType, &ContactEditorData.PicturesListTokens,
+                  &ContactEditorData.PicturesListMediatype, &ContactEditorData.PicturesListPref);
     
     wxMemoryInputStream istream(misc_emptyimage_png, sizeof(misc_emptyimage_png));
     wxImage misc_emptyimage_png(istream, wxBITMAP_TYPE_PNG);