X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Key.cpp;h=1242984eeaafa8f1e8032a7d989a4f3b078180d9;hb=c139f797277a0cd85fe9f0b6b8244b791e0cf9ab;hp=435eb38de03c69d63ffb8bea84ec2dd36548f333;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git diff --git a/source/contacteditor/frmContactEditor-Key.cpp b/source/contacteditor/frmContactEditor-Key.cpp index 435eb38..1242984 100644 --- a/source/contacteditor/frmContactEditor-Key.cpp +++ b/source/contacteditor/frmContactEditor-Key.cpp @@ -1,6 +1,6 @@ // frmContactEditor-Key.cpp - frmContactEditor Key tab subroutines. // -// (c) 2012-2015 Xestia Software Development. +// (c) 2012-2016 Xestia Software Development. // // This file is part of Xestia Address Book. // @@ -25,15 +25,15 @@ void frmContactEditor::AddKey( wxCommandEvent& event ) frmContactEditorKey *frameCEKey = new frmContactEditorKey ( this ); frameCEKey->SetEditorMode(FALSE); - intResult = GetLastInt(&KeyList); - frameCEKey->SetupPointers(&KeyList, - &KeyListAltID, - &KeyListPID, - &KeyListKeyType, - &KeyListDataType, - &KeyListType, - &KeyListTokens, - &KeyListPref, + intResult = GetLastInt(&ContactEditorData.KeyList); + frameCEKey->SetupPointers(&ContactEditorData.KeyList, + &ContactEditorData.KeyListAltID, + &ContactEditorData.KeyListPID, + &ContactEditorData.KeyListKeyType, + &ContactEditorData.KeyListDataType, + &ContactEditorData.KeyListType, + &ContactEditorData.KeyListTokens, + &ContactEditorData.KeyListPref, lboKeys, (intValueSeek)); frameCEKey->ShowModal(); @@ -53,14 +53,14 @@ void frmContactEditor::ModifyKey( wxCommandEvent& event ) } frmContactEditorKey *frameCEKey = new frmContactEditorKey ( this ); - frameCEKey->SetupPointers(&KeyList, - &KeyListAltID, - &KeyListPID, - &KeyListKeyType, - &KeyListDataType, - &KeyListType, - &KeyListTokens, - &KeyListPref, + frameCEKey->SetupPointers(&ContactEditorData.KeyList, + &ContactEditorData.KeyListAltID, + &ContactEditorData.KeyListPID, + &ContactEditorData.KeyListKeyType, + &ContactEditorData.KeyListDataType, + &ContactEditorData.KeyListType, + &ContactEditorData.KeyListTokens, + &ContactEditorData.KeyListPref, lboKeys, intSelectedData); frameCEKey->SetEditorMode(TRUE); @@ -82,8 +82,8 @@ void frmContactEditor::DeleteKey( wxCommandEvent& event ) lboKeys->DeleteItem(longSelected); - DeleteMapData(intSelectedData, &KeyList, &KeyListAltID, - &KeyListPID, &KeyListKeyType, &KeyListDataType, &KeyListType, - &KeyListTokens, &KeyListPref); + DeleteMapData(intSelectedData, &ContactEditorData.KeyList, &ContactEditorData.KeyListAltID, + &ContactEditorData.KeyListPID, &ContactEditorData.KeyListKeyType, &ContactEditorData.KeyListDataType, &ContactEditorData.KeyListType, + &ContactEditorData.KeyListTokens, &ContactEditorData.KeyListPref); }