X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Other.cpp;h=171b3ae029fcb54757289d631da7998d73669604;hb=074e2db3331d35762f1d2dcf06d98f15200fc225;hp=97519e6b98ed5aebd036daee1d4d36189c0f94dd;hpb=b4d439838e362c7ffa4587238580e42571ccf8ae;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Other.cpp b/source/contacteditor/frmContactEditor-Other.cpp
index 97519e6..171b3ae 100644
--- a/source/contacteditor/frmContactEditor-Other.cpp
+++ b/source/contacteditor/frmContactEditor-Other.cpp
@@ -23,11 +23,10 @@
 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(&ContactEditorData.VendorList);
 	frameCEVen->SetupPointers(&ContactEditorData.VendorList,
 		&ContactEditorData.VendorListPEN,
                 &ContactEditorData.VendorListElement,
@@ -42,10 +41,12 @@ void frmContactEditor::AddVendorNamespace( wxCommandEvent& event )
 void frmContactEditor::ModifyVendorNamespace( wxCommandEvent& event )
 {
 	
+	// Bring up the window for modifying vendor namespace data.
+	
 	long longSelected = -1;
 	int intSelectedData = 0;
     
-	if (!GetSelectedItem(lboVendorNamespace,
+	if (lboVendorNamespace->GetItemCount() == 0 || !GetSelectedItem(lboVendorNamespace,
 		&longSelected,
 		&intSelectedData)){
 		return;
@@ -66,10 +67,13 @@ void frmContactEditor::ModifyVendorNamespace( wxCommandEvent& event )
 
 void frmContactEditor::DeleteVendorNamespace( wxCommandEvent& event )
 {
+	
+	// Bring up the window for deleting vendor namespace data.
+	
 	long longSelected = -1;
 	int intSelectedData = 0;
     
-	if (!GetSelectedItem(lboVendorNamespace,
+	if (lboVendorNamespace->GetItemCount() == 0 || !GetSelectedItem(lboVendorNamespace,
 		&longSelected,
                 &intSelectedData)){
 		return;
@@ -85,11 +89,10 @@ void frmContactEditor::DeleteVendorNamespace( wxCommandEvent& event )
 void frmContactEditor::AddXToken( wxCommandEvent& event )
 {
 	
-	int intResult = 0;
-    
+	// Bring up the window for adding extended data.
+	    
 	frmContactEditorXToken *frameCEXT = new frmContactEditorXToken ( this );
 	frameCEXT->SetEditorMode(FALSE);
-	intResult = GetLastInt(&ContactEditorData.XTokenList);
 	frameCEXT->SetupPointers(&ContactEditorData.XTokenList,
 		&ContactEditorData.XTokenListTokens,
                 lboXToken,
@@ -103,10 +106,12 @@ void frmContactEditor::AddXToken( wxCommandEvent& event )
 void frmContactEditor::ModifyXToken( wxCommandEvent& event )
 {
 	
+	// Bring up the window for modifying extended data.
+	
 	long longSelected = -1;
 	int intSelectedData = 0;
     
-	if (!GetSelectedItem(lboXToken,
+	if (lboXToken->GetItemCount() == 0 || !GetSelectedItem(lboXToken,
 	
 		&longSelected,
                 &intSelectedData)){
@@ -129,10 +134,12 @@ void frmContactEditor::ModifyXToken( wxCommandEvent& event )
 void frmContactEditor::DeleteXToken( wxCommandEvent& event )
 {
 	
+	// Bring up the window for deleting extended data.
+	
 	long longSelected = -1;
 	int intSelectedData = 0;
     
-	if (!GetSelectedItem(lboXToken,
+	if (lboXToken->GetItemCount() == 0 || !GetSelectedItem(lboXToken,
 		&longSelected,
                 &intSelectedData)){
 		return;