From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 6 Mar 2016 23:04:57 +0000 (+0000)
Subject: Added basic comments to the functions of frmConflictResolution
X-Git-Tag: release-0.11~179
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=c139f797277a0cd85fe9f0b6b8244b791e0cf9ab;p=xestiaab%2F.git

Added basic comments to the functions of frmConflictResolution
---

diff --git a/source/frmConflictResolution.cpp b/source/frmConflictResolution.cpp
index 33a99fe..d5c0a3f 100644
--- a/source/frmConflictResolution.cpp
+++ b/source/frmConflictResolution.cpp
@@ -28,6 +28,9 @@ frmConflictResolutionADT( parent )
 
 void frmConflictResolution::KeepLocalData( wxCommandEvent& event )
 {
+	
+	// Button 'Keep Local' was pressed.
+	
 	ConflictResult = 1;
 	this->Close();
 
@@ -35,6 +38,9 @@ void frmConflictResolution::KeepLocalData( wxCommandEvent& event )
 
 void frmConflictResolution::KeepServerData( wxCommandEvent& event )
 {
+	
+	// Button 'Keep Server' was pressed.
+	
 	ConflictResult = 2;
 	this->Close();
 
@@ -43,6 +49,8 @@ void frmConflictResolution::KeepServerData( wxCommandEvent& event )
 void frmConflictResolution::DecideLater( wxCommandEvent& event )
 {
 
+	// Button 'Decide Later' was pressed.
+	
 	ConflictResult = 0;
 	this->Close();
 
@@ -50,6 +58,8 @@ void frmConflictResolution::DecideLater( wxCommandEvent& event )
 
 int frmConflictResolution::GetResult(){
 
+	// Get the result of the dialog.
+	
 	return ConflictResult;
 
 }