X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Other.cpp;h=171b3ae029fcb54757289d631da7998d73669604;hb=bfe817b5bfae33a1eb666c463643ec119cd1d66d;hp=4bd4575c8e75069ae1847f9994278755119b1b66;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Other.cpp b/source/contacteditor/frmContactEditor-Other.cpp
index 4bd4575..171b3ae 100644
--- a/source/contacteditor/frmContactEditor-Other.cpp
+++ b/source/contacteditor/frmContactEditor-Other.cpp
@@ -1,6 +1,6 @@
 // frmContactEditor-Other.cpp - frmContactEditor Other tab subroutines.
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2016 Xestia Software Development.
 //
 // This file is part of Xestia Address Book.
 //
@@ -22,113 +22,131 @@
 
 void frmContactEditor::AddVendorNamespace( wxCommandEvent& event )
 {
-    int intResult = 0;
+	
+	// Bring up the window for adding vendor namespace data.
     
-    frmContactEditorVendor *frameCEVen = new frmContactEditorVendor ( this );
-    frameCEVen->SetEditorMode(FALSE);
-    intResult = GetLastInt(&VendorList);
-    frameCEVen->SetupPointers(&VendorList,
-                              &VendorListPEN,
-                              &VendorListElement,
-                              lboVendorNamespace,
-                              (intValueSeek));
-    frameCEVen->ShowModal();
-    delete frameCEVen;
-    frameCEVen = NULL;
+	frmContactEditorVendor *frameCEVen = new frmContactEditorVendor ( this );
+	frameCEVen->SetEditorMode(FALSE);
+	frameCEVen->SetupPointers(&ContactEditorData.VendorList,
+		&ContactEditorData.VendorListPEN,
+                &ContactEditorData.VendorListElement,
+                lboVendorNamespace,
+                (intValueSeek));
+	frameCEVen->ShowModal();
+	delete frameCEVen;
+	frameCEVen = NULL;
+	
 }
 
 void frmContactEditor::ModifyVendorNamespace( wxCommandEvent& event )
 {
-    long longSelected = -1;
-    int intSelectedData = 0;
+	
+	// Bring up the window for modifying vendor namespace data.
+	
+	long longSelected = -1;
+	int intSelectedData = 0;
     
-    if (!GetSelectedItem(lboVendorNamespace,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
+	if (lboVendorNamespace->GetItemCount() == 0 || !GetSelectedItem(lboVendorNamespace,
+		&longSelected,
+		&intSelectedData)){
+		return;
+	}
     
-    frmContactEditorVendor *frameCEVen = new frmContactEditorVendor ( this );
-    frameCEVen->SetupPointers(&VendorList,
-                              &VendorListPEN,
-                              &VendorListElement,
-                              lboVendorNamespace,
-                              intSelectedData);
-    frameCEVen->SetEditorMode(TRUE);
-    frameCEVen->ShowModal();
-    delete frameCEVen;
-    frameCEVen = NULL;
+	frmContactEditorVendor *frameCEVen = new frmContactEditorVendor ( this );
+	frameCEVen->SetupPointers(&ContactEditorData.VendorList,
+		&ContactEditorData.VendorListPEN,
+		&ContactEditorData.VendorListElement,
+		lboVendorNamespace,
+		intSelectedData);
+	frameCEVen->SetEditorMode(TRUE);
+	frameCEVen->ShowModal();
+	delete frameCEVen;
+	frameCEVen = NULL;
+	
 }
 
 void frmContactEditor::DeleteVendorNamespace( wxCommandEvent& event )
 {
-    long longSelected = -1;
-    int intSelectedData = 0;
+	
+	// Bring up the window for deleting vendor namespace data.
+	
+	long longSelected = -1;
+	int intSelectedData = 0;
     
-    if (!GetSelectedItem(lboVendorNamespace,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
+	if (lboVendorNamespace->GetItemCount() == 0 || !GetSelectedItem(lboVendorNamespace,
+		&longSelected,
+                &intSelectedData)){
+		return;
+	}
     
-    lboVendorNamespace->DeleteItem(longSelected);
-    
-    DeleteMapData(intSelectedData, &VendorList, &VendorListPEN,
-                  &VendorListElement);
+	lboVendorNamespace->DeleteItem(longSelected);
     
+	DeleteMapData(intSelectedData, &ContactEditorData.VendorList, &ContactEditorData.VendorListPEN,
+		&ContactEditorData.VendorListElement);
+
 }
 
 void frmContactEditor::AddXToken( wxCommandEvent& event )
 {
-    int intResult = 0;
-    
-    frmContactEditorXToken *frameCEXT = new frmContactEditorXToken ( this );
-    frameCEXT->SetEditorMode(FALSE);
-    intResult = GetLastInt(&XTokenList);
-    frameCEXT->SetupPointers(&XTokenList,
-                             &XTokenListTokens,
-                             lboXToken,
-                             (intValueSeek));
-    frameCEXT->ShowModal();
-    delete frameCEXT;
-    frameCEXT = NULL;
+	
+	// Bring up the window for adding extended data.
+	    
+	frmContactEditorXToken *frameCEXT = new frmContactEditorXToken ( this );
+	frameCEXT->SetEditorMode(FALSE);
+	frameCEXT->SetupPointers(&ContactEditorData.XTokenList,
+		&ContactEditorData.XTokenListTokens,
+                lboXToken,
+                (intValueSeek));
+	frameCEXT->ShowModal();
+	delete frameCEXT;
+	frameCEXT = NULL;
+	
 }
 
 void frmContactEditor::ModifyXToken( wxCommandEvent& event )
 {
-    long longSelected = -1;
-    int intSelectedData = 0;
+	
+	// Bring up the window for modifying extended data.
+	
+	long longSelected = -1;
+	int intSelectedData = 0;
     
-    if (!GetSelectedItem(lboXToken,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
+	if (lboXToken->GetItemCount() == 0 || !GetSelectedItem(lboXToken,
+	
+		&longSelected,
+                &intSelectedData)){
+		return;
+		
+	}
     
-    frmContactEditorXToken *frameCEXT = new frmContactEditorXToken ( this );
-    frameCEXT->SetupPointers(&XTokenList,
-                             &XTokenListTokens,
-                             lboXToken,
-                             intSelectedData);
-    frameCEXT->SetEditorMode(TRUE);
-    frameCEXT->ShowModal();
-    delete frameCEXT;
-    frameCEXT = NULL;
+	frmContactEditorXToken *frameCEXT = new frmContactEditorXToken ( this );
+	frameCEXT->SetupPointers(&ContactEditorData.XTokenList,
+		&ContactEditorData.XTokenListTokens,
+                lboXToken,
+                intSelectedData);
+	frameCEXT->SetEditorMode(TRUE);
+	frameCEXT->ShowModal();
+	delete frameCEXT;
+	frameCEXT = NULL;
+	
 }
 
 void frmContactEditor::DeleteXToken( wxCommandEvent& event )
 {
-    long longSelected = -1;
-    int intSelectedData = 0;
+	
+	// Bring up the window for deleting extended data.
+	
+	long longSelected = -1;
+	int intSelectedData = 0;
     
-    if (!GetSelectedItem(lboXToken,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
+	if (lboXToken->GetItemCount() == 0 || !GetSelectedItem(lboXToken,
+		&longSelected,
+                &intSelectedData)){
+		return;
+	}
     
-    lboXToken->DeleteItem(longSelected);
+	lboXToken->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &XTokenList, &XTokenListTokens);
+	DeleteMapData(intSelectedData, &ContactEditorData.XTokenList, &ContactEditorData.XTokenListTokens);
     
 }