X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Groups.cpp;h=b3e5f102bde030874e14e960d83518dfd9929a37;hb=ada42724cf083b0a311cf22260485d61516c25c8;hp=1279064e21adf8067b5ee09c556615e18f5bd952;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Groups.cpp b/source/contacteditor/frmContactEditor-Groups.cpp
index 1279064..b3e5f10 100644
--- a/source/contacteditor/frmContactEditor-Groups.cpp
+++ b/source/contacteditor/frmContactEditor-Groups.cpp
@@ -1,6 +1,6 @@
 // frmContactEditor-Groups.cpp - frmContactEditor Groups tab subroutines.
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2016 Xestia Software Development.
 //
 // This file is part of Xestia Address Book.
 //
@@ -23,44 +23,48 @@
 void frmContactEditor::AddGroup( wxCommandEvent& event )
 {
     
-    int intResult = 0;
+	// Bring up window to add a group.
+	
+	int intResult = 0;
     
-    XABViewMode XVMData = MainPtr->GetViewMode();
+	XABViewMode XVMData = MainPtr->GetViewMode();
     
-    frmContactEditorGroup *frameCEGroup = new frmContactEditorGroup ( this );
-    frameCEGroup->SetEditorMode(FALSE, XVMData);
-    intResult = GetLastInt(&GroupsList);
-    frameCEGroup->SetupPointers(&GroupsList,
-                                lboGroups,
-                                wxSContactAccount,
-                                intValueSeek);
-    frameCEGroup->ShowModal();
-    delete frameCEGroup;
-    frameCEGroup = NULL;
+	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;
     
 }
 
 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