languages: wo and xh combined due to missing comma

[xestiaab/.git] / source / contacteditor / frmContactEditorTitles.cpp

diff --git a/source/contacteditor/frmContactEditorTitles.cpp b/source/contacteditor/frmContactEditorTitles.cpp
index 9c8861d..8f9b6bc 100644 (file)
--- a/source/contacteditor/frmContactEditorTitles.cpp
+++ b/source/contacteditor/frmContactEditorTitles.cpp
@@ -1,3 +1,21 @@
+// frmContactEditorTitles.cpp - frmContactEditorTitles 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 <http://www.gnu.org/licenses/>
+
 #include "frmContactEditorTitles.h"
 
 #include <map>
@@ -8,21 +26,31 @@ frmContactEditorTitles::frmContactEditorTitles( wxWindow* parent )
 :
 frmContactEditorTitlesADT( parent )
 {
+       
+       // Setup the window.
+       
        EditorMode = FALSE;
        sliPriority->Disable();
 }
 
 void frmContactEditorTitles::EnablePriority( wxCommandEvent& event )
 {
+       
+       // Enable/disable the priority setting.
+       
        if (chkUsePref->IsChecked()){
                sliPriority->Enable();
        } else {
                sliPriority->Disable();
        }
+       
 }
 
 void frmContactEditorTitles::ProcessAction( wxCommandEvent& event )
 {
+       
+       // Process action.
+       
        // Set if the editor is adding or editing an address.
        // FALSE = Add
        // TRUE = Edit
@@ -133,6 +161,9 @@ void frmContactEditorTitles::ProcessAction( wxCommandEvent& event )
 
 void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
 {
+       
+       // Set the editor mode.
+       
        // Set if the editor is adding or editing an address.
        // FALSE = Add
        // TRUE = Edit
@@ -157,7 +188,8 @@ void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
                
                striter = TitlesListPtr->find(TitlesListIndex);
                 
-               if (striter->first == TitlesListIndex){
+               if (striter->first == TitlesListIndex &&
+                       striter != TitlesListPtr->end()){
                
                        strValue = striter->second;
                
@@ -171,7 +203,8 @@ void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
                
                intiter = TitlesListPrefPtr->find(TitlesListIndex);
                
-               if (intiter->first == TitlesListIndex && intiter->second > 0){
+               if (intiter->first == TitlesListIndex && intiter->second > 0 &&
+                       intiter != TitlesListPrefPtr->end()){
                
                        sliPriority->SetValue(intiter->second);
                        sliPriority->Enable();
@@ -187,7 +220,11 @@ void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
 
 void frmContactEditorTitles::CloseWindow( wxCommandEvent& event )
 {
+       
+       // Close the window.
+       
        this->Close();
+       
 }
 
 void frmContactEditorTitles::SetupPointers(std::map<int, wxString> *TitlesList,
@@ -201,6 +238,8 @@ void frmContactEditorTitles::SetupPointers(std::map<int, wxString> *TitlesList,
        int TitlesIndex )
 {
 
+       // Setup the pointers.
+       
        TitlesListPtr = TitlesList;
        TitlesListLanguagePtr = TitlesListLanguage;
        TitlesListAltIDPtr = TitlesListAltID;