X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Key.cpp;h=3dd78761e1c3875cf585b43955b56f3cff8a2282;hb=074e2db3331d35762f1d2dcf06d98f15200fc225;hp=b72677e5e15dd5f9f1ca4b60d60f3c656eb7b941;hpb=491926291f008129afe98913e5737cd7e253b7cf;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Key.cpp b/source/contacteditor/frmContactEditor-Key.cpp
index b72677e..3dd7876 100644
--- a/source/contacteditor/frmContactEditor-Key.cpp
+++ b/source/contacteditor/frmContactEditor-Key.cpp
@@ -22,11 +22,10 @@
 void frmContactEditor::AddKey( wxCommandEvent& event )
 {
 	
-	int intResult = 0;
-    
+	// Bring up the window for adding a key.
+	    
 	frmContactEditorKey *frameCEKey = new frmContactEditorKey ( this );
 	frameCEKey->SetEditorMode(FALSE);
-	intResult = GetLastInt(&ContactEditorData.KeyList);
 	frameCEKey->SetupPointers(&ContactEditorData.KeyList,
 		&ContactEditorData.KeyListAltID,
                 &ContactEditorData.KeyListPID,
@@ -46,10 +45,12 @@ void frmContactEditor::AddKey( wxCommandEvent& event )
 void frmContactEditor::ModifyKey( wxCommandEvent& event )
 {
 	
+	// Bring up the window for modifying a key.
+	
 	long longSelected = -1;
 	int intSelectedData = 0;
     
-	if (!GetSelectedItem(lboKeys,
+	if (lboKeys->GetItemCount() == 0 || !GetSelectedItem(lboKeys,
 		&longSelected,
                 &intSelectedData)){
 		return;
@@ -76,10 +77,12 @@ void frmContactEditor::ModifyKey( wxCommandEvent& event )
 void frmContactEditor::DeleteKey( wxCommandEvent& event )
 {
 	
+	// Delete a key.
+	
 	long longSelected = -1;
 	int intSelectedData = 0;
     
-	if (!GetSelectedItem(lboKeys,
+	if (lboKeys->GetItemCount() == 0 || !GetSelectedItem(lboKeys,
 		&longSelected,
 		&intSelectedData)){
 		return;