X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorGroups.cpp;h=90dccf660c228d9f01ddec4fa4c23aa8f416e4a6;hb=e7eaa503e46395e1126c901b1ff0d25388259ba5;hp=46a825335c1255f46fc9f9fb4e9545d9cb0e44d2;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc;p=xestiaab%2F.git diff --git a/source/contacteditor/frmContactEditorGroups.cpp b/source/contacteditor/frmContactEditorGroups.cpp index 46a8253..90dccf6 100755 --- a/source/contacteditor/frmContactEditorGroups.cpp +++ b/source/contacteditor/frmContactEditorGroups.cpp @@ -3,6 +3,7 @@ #include #include "../vcard/vcard.h" #include "../common/dirs.h" +#include "../frmMain.h" frmContactEditorGroup::frmContactEditorGroup( wxWindow* parent ) : @@ -150,18 +151,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 +193,6 @@ void frmContactEditorGroup::ProcessData( wxCommandEvent& event ) } - std::map::iterator CDataIter = ContactNamesData.find(i); - wxListItem ItemData; ItemData.SetId(0); ItemData.SetText(chkContacts->GetString(i));