frmContactEditor: Fix issue with intValueSeek not being incremented properly

[xestiaab/.git] / source / contacteditor / frmContactEditor-Groups.cpp

diff --git a/source/contacteditor/frmContactEditor-Groups.cpp b/source/contacteditor/frmContactEditor-Groups.cpp
index 91329ae..225fa2a 100644 (file)
--- a/source/contacteditor/frmContactEditor-Groups.cpp
+++ b/source/contacteditor/frmContactEditor-Groups.cpp
@@ -1,3 +1,21 @@
+// frmContactEditor-Groups.cpp - frmContactEditor Groups tab subroutines.
+//
+// (c) 2012-2016 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 "frmContactEditor.h"
 #include "frmContactEditorGroups.h"
 #include "../frmMain.h"
@@ -5,44 +23,49 @@
 void frmContactEditor::AddGroup( wxCommandEvent& event )
 {
     
-    int intResult = 0;
-    
-    XABViewMode XVMData = MainPtr->GetViewMode();
+       // Bring up window to add a group.
+       
+       int intResult = 0;
     
-    frmContactEditorGroup *frameCEGroup = new frmContactEditorGroup ( this );
-    frameCEGroup->SetEditorMode(FALSE, XVMData);
-    intResult = GetLastInt(&GroupsList);
-    frameCEGroup->SetupPointers(&GroupsList,
-                                lboGroups,
-                                wxSContactAccount,
-                                intValueSeek);
-    frameCEGroup->ShowModal();
-    delete frameCEGroup;
-    frameCEGroup = NULL;
+       XABViewMode XVMData = MainPtr->GetViewMode();
     
+       frmContactEditorGroup *frameCEGroup = new frmContactEditorGroup ( this );
+       frameCEGroup->SetEditorMode(FALSE, XVMData);
+       intResult = GetLastInt(&ContactEditorData.GroupsList);
+       frameCEGroup->SetupPointers(&ContactEditorData.GroupsList,
+               lboGroups,
+               wxSContactAccount,
+               intValueSeek);
+       frameCEGroup->ShowModal();
+       delete frameCEGroup;
+       frameCEGroup = NULL;
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGroup( wxCommandEvent& event )
 {
-    
-    return;
+       
+       return;
     
 }
 
 void frmContactEditor::DeleteGroup( wxCommandEvent& event )
 {
     
-    long longSelected = -1;
-    int intSelectedData = 0;
-    
-    if (!GetSelectedItem(lboGroups,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
+       // Bring up window to delete a group.
+       
+       long longSelected = -1;
+       int intSelectedData = 0;
     
-    lboGroups->DeleteItem(longSelected);
+       if (lboGroups->GetItemCount() == 0 || !GetSelectedItem(lboGroups,
+               &longSelected,
+               &intSelectedData)){
+               return;
+       }
     
-    DeleteMapData(intSelectedData, &GroupsList);
+       lboGroups->DeleteItem(longSelected);
     
+       DeleteMapData(intSelectedData, &ContactEditorData.GroupsList);
+       
 }
\ No newline at end of file