X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Category.cpp;h=f3e919f8c2b0cb462f0e785317886e2759d116a5;hb=ee9b71949005734012f18251774807c38b989ae2;hp=dc82de9ecdb3911edd8d48307a1cfbdc1316ea31;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Category.cpp b/source/contacteditor/frmContactEditor-Category.cpp
index dc82de9..f3e919f 100644
--- a/source/contacteditor/frmContactEditor-Category.cpp
+++ b/source/contacteditor/frmContactEditor-Category.cpp
@@ -1,6 +1,6 @@
 // frmContactEditor-Category.cpp - frmContactEditor Category tab subroutines.
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2016 Xestia Software Development.
 //
 // This file is part of Xestia Address Book.
 //
@@ -21,66 +21,79 @@
 
 void frmContactEditor::AddCategory( wxCommandEvent& event )
 {
-    int intResult = 0;
+
+	// Bring up the window to add a category.
     
-    frmContactEditorCategory *frameCECategory = new frmContactEditorCategory ( this );
-    frameCECategory->SetEditorMode(FALSE);
-    intResult = GetLastInt(&CategoriesList);
-    frameCECategory->SetupPointers(&CategoriesList,
-                                   &CategoriesListAltID,
-                                   &CategoriesListPID,
-                                   &CategoriesListType,
-                                   &CategoriesListTokens,
-                                   &CategoriesListPref,
-                                   lboCategories,
-                                   (intValueSeek));
-    frameCECategory->ShowModal();
-    delete frameCECategory;
-    frameCECategory = NULL;
+	frmContactEditorCategory *frameCECategory = new frmContactEditorCategory ( this );
+	frameCECategory->SetEditorMode(FALSE);
+	frameCECategory->SetupPointers(&ContactEditorData.CategoriesList,
+		&ContactEditorData.CategoriesListAltID,
+		&ContactEditorData.CategoriesListPID,
+		&ContactEditorData.CategoriesListType,
+		&ContactEditorData.CategoriesListTokens,
+		&ContactEditorData.CategoriesListPref,
+		lboCategories,
+		(intValueSeek));
+	frameCECategory->ShowModal();
+	delete frameCECategory;
+	frameCECategory = NULL;
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyCategory( wxCommandEvent& event )
 {
-    long longSelected = -1;
-    int intSelectedData = 0;
+
+	// Bring up the window to edit a category.
+
+	long longSelected = -1;
+	int intSelectedData = 0;
     
-    if (!GetSelectedItem(lboCategories,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
+	if (lboCategories->GetItemCount() == 0 || !GetSelectedItem(lboCategories,
+		&longSelected,
+		&intSelectedData)){
+		
+		return;
+		
+	}
     
-    frmContactEditorCategory *frameCECategory = new frmContactEditorCategory ( this );
-    frameCECategory->SetupPointers(&CategoriesList,
-                                   &CategoriesListAltID,
-                                   &CategoriesListPID,
-                                   &CategoriesListType,
-                                   &CategoriesListTokens,
-                                   &CategoriesListPref,
-                                   lboCategories,
-                                   intSelectedData);
-    frameCECategory->SetEditorMode(TRUE);
-    frameCECategory->ShowModal();
-    delete frameCECategory;
-    frameCECategory = NULL;
+	frmContactEditorCategory *frameCECategory = new frmContactEditorCategory ( this );
+	frameCECategory->SetupPointers(&ContactEditorData.CategoriesList,
+		&ContactEditorData.CategoriesListAltID,
+		&ContactEditorData.CategoriesListPID,
+		&ContactEditorData.CategoriesListType,
+		&ContactEditorData.CategoriesListTokens,
+		&ContactEditorData.CategoriesListPref,
+		lboCategories,
+		intSelectedData);
+	frameCECategory->SetEditorMode(TRUE);
+	frameCECategory->ShowModal();
+	delete frameCECategory;
+	frameCECategory = NULL;
+	
 }
 
 void frmContactEditor::DeleteCategory( wxCommandEvent& event )
 {
-    long longSelected = -1;
-    int intSelectedData = 0;
-    
-    if (!GetSelectedItem(lboCategories,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
+
+	// Bring up the window to delete the category.
+
+	long longSelected = -1;
+	int intSelectedData = 0;
     
-    lboCategories->DeleteItem(longSelected);
+	if (lboCategories->GetItemCount() == 0 || !GetSelectedItem(lboCategories,
+		&longSelected,
+		&intSelectedData)){
+		
+		return;
+		
+	}
     
-    DeleteMapData(intSelectedData, &CategoriesList,
-                  &CategoriesListAltID, &CategoriesListPID,
-                  &CategoriesListType, &CategoriesListTokens,
-                  &CategoriesListPref);
+	lboCategories->DeleteItem(longSelected);
     
+	DeleteMapData(intSelectedData, &ContactEditorData.CategoriesList,
+		&ContactEditorData.CategoriesListAltID, &ContactEditorData.CategoriesListPID,
+		&ContactEditorData.CategoriesListType, &ContactEditorData.CategoriesListTokens,
+		&ContactEditorData.CategoriesListPref);
+ 
 }
\ No newline at end of file