X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorGroups.cpp;h=094347f95e350ade86a5ff270d72a444c174d455;hb=43a294d863a3cbcd825889adaa702f3a79dd7aa2;hp=46a825335c1255f46fc9f9fb4e9545d9cb0e44d2;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc;p=xestiaab%2F.git diff --git a/source/contacteditor/frmContactEditorGroups.cpp b/source/contacteditor/frmContactEditorGroups.cpp index 46a8253..094347f 100755 --- a/source/contacteditor/frmContactEditorGroups.cpp +++ b/source/contacteditor/frmContactEditorGroups.cpp @@ -1,8 +1,27 @@ +// frmContactEditorGroups.cpp - frmContactEditorGroups form. +// +// (c) 2012-2015 Xestia Software Development. +// +// This file is part of Xestia Address Book. +// +// Xestia Address Book is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by the +// Free Software Foundation, version 3 of the license. +// +// Xestia Address Book is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with Xestia Address Book. If not, see + #include "frmContactEditorGroups.h" #include #include #include "../vcard/vcard.h" #include "../common/dirs.h" +#include "../frmMain.h" frmContactEditorGroup::frmContactEditorGroup( wxWindow* parent ) : @@ -150,18 +169,18 @@ void frmContactEditorGroup::FetchContacts( wxInitDialogEvent& event ) } else { - ContactIndex = vCardNamesDsc.size() - 1; + ContactIndex = (int)(vCardNamesDsc.size() - 1); - for (std::map::iterator iter = vCardNamesDsc.begin(); - iter != vCardNamesDsc.end(); ++iter){ + for (std::map::iterator iter = vCardNamesDsc.begin(); + iter != vCardNamesDsc.end(); ++iter){ - chkContacts->InsertItems(1, &iter->first, 0); + chkContacts->InsertItems(1, &iter->first, 0); - ContactNamesData.insert(std::make_pair(ContactIndex, iter->second)); - - ContactIndex--; + ContactNamesData.insert(std::make_pair(ContactIndex, iter->second)); + + ContactIndex--; - } + } } @@ -192,8 +211,6 @@ void frmContactEditorGroup::ProcessData( wxCommandEvent& event ) } - std::map::iterator CDataIter = ContactNamesData.find(i); - wxListItem ItemData; ItemData.SetId(0); ItemData.SetText(chkContacts->GetString(i));