X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorVendor.cpp;h=2ca399b11e5d7a7780ca568216079313670e1828;hb=bfe817b5bfae33a1eb666c463643ec119cd1d66d;hp=c1340ef37877a4d77f6de12421dfc66d53af4990;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc;p=xestiaab%2F.git diff --git a/source/contacteditor/frmContactEditorVendor.cpp b/source/contacteditor/frmContactEditorVendor.cpp index c1340ef..2ca399b 100644 --- a/source/contacteditor/frmContactEditorVendor.cpp +++ b/source/contacteditor/frmContactEditorVendor.cpp @@ -1,3 +1,21 @@ +// frmContactEditorVendor.cpp - frmContactEditorVendor 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 "frmContactEditorVendor.h" #include #include "../common/textprocessing.h" @@ -11,6 +29,7 @@ frmContactEditorVendorADT( parent ) void frmContactEditorVendor::SetEditorMode(bool EditMode) { + // Set if the editor is adding or editing an address. // FALSE = Add // TRUE = Edit @@ -49,7 +68,8 @@ void frmContactEditorVendor::SetEditorMode(bool EditMode) striter = VendorListElementPtr->find(VendorListIndex); - if (striter->first == VendorListIndex){ + if (striter->first == VendorListIndex && + striter != VendorListElementPtr->end()){ strValue = striter->second; @@ -63,7 +83,8 @@ void frmContactEditorVendor::SetEditorMode(bool EditMode) striter = VendorListPtr->find(VendorListIndex); - if (striter->first == VendorListIndex){ + if (striter->first == VendorListIndex && + striter != VendorListPtr->end()){ strValue = striter->second; @@ -80,6 +101,8 @@ void frmContactEditorVendor::SetEditorMode(bool EditMode) void frmContactEditorVendor::ProcessAction( wxCommandEvent& event ) { + // Process action. + if (EditorMode == FALSE){ wxString strValue; @@ -162,7 +185,8 @@ void frmContactEditorVendor::SetupPointers( std::map *VendorList, wxListCtrl *VendorListCtrl, int VendorIndex ) { - + // Setup the pointers. + VendorListPtr = VendorList; VendorListPENPtr = VendorListPEN; VendorListElementPtr = VendorListElement; @@ -173,5 +197,9 @@ void frmContactEditorVendor::SetupPointers( std::map *VendorList, void frmContactEditorVendor::CloseWindow( wxCommandEvent& event ) { + + // Close the window. + this->Close(); + }