X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Key.cpp;h=b9edcaf6c400a4e1b71a2ab909dd29c4471b6bd7;hb=f69e09d827e06435ea94bb73aa71ab5f9d5c035b;hp=43bf64f29694cc70b638060fc24c9a0fceca9139;hpb=ff25631b7adfad7c615c3f552478e4ebf91adf35;p=xestiaab%2F.git diff --git a/source/contacteditor/frmContactEditor-Key.cpp b/source/contacteditor/frmContactEditor-Key.cpp index 43bf64f..b9edcaf 100644 --- a/source/contacteditor/frmContactEditor-Key.cpp +++ b/source/contacteditor/frmContactEditor-Key.cpp @@ -23,12 +23,9 @@ void frmContactEditor::AddKey( wxCommandEvent& event ) { // Bring up the window for adding a key. - - int intResult = 0; - + frmContactEditorKey *frameCEKey = new frmContactEditorKey ( this ); frameCEKey->SetEditorMode(FALSE); - intResult = GetLastInt(&ContactEditorData.KeyList); frameCEKey->SetupPointers(&ContactEditorData.KeyList, &ContactEditorData.KeyListAltID, &ContactEditorData.KeyListPID, @@ -42,7 +39,8 @@ void frmContactEditor::AddKey( wxCommandEvent& event ) frameCEKey->ShowModal(); delete frameCEKey; frameCEKey = NULL; - + intValueSeek++; + } void frmContactEditor::ModifyKey( wxCommandEvent& event ) @@ -53,7 +51,7 @@ void frmContactEditor::ModifyKey( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboKeys, + if (lboKeys->GetItemCount() == 0 || !GetSelectedItem(lboKeys, &longSelected, &intSelectedData)){ return; @@ -85,7 +83,7 @@ void frmContactEditor::DeleteKey( wxCommandEvent& event ) long longSelected = -1; int intSelectedData = 0; - if (!GetSelectedItem(lboKeys, + if (lboKeys->GetItemCount() == 0 || !GetSelectedItem(lboKeys, &longSelected, &intSelectedData)){ return;