Move INSTALL, LICENSE, README, THANKS and TODO into root directory

[xestiaab/.git] / source / frmConflictResolution.cpp

diff --git a/source/frmConflictResolution.cpp b/source/frmConflictResolution.cpp
index 33a99fe..1779161 100644 (file)
--- 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,11 +58,13 @@ void frmConflictResolution::DecideLater( wxCommandEvent& event )
 
 int frmConflictResolution::GetResult(){
 
+       // Get the result of the dialog.
+       
        return ConflictResult;
 
 }
 
-void frmConflictResolution::LoadData(vCard *LocalData, vCard *ServerData, std::map<wxString, wxString> *MemoryFSList){
+void frmConflictResolution::LoadData(vCard *LocalData, vCard *ServerData, std::map<wxString, wxString> *MemoryFSList, wxString backgroundColour){
 
        // Load the local data.
 
@@ -62,11 +72,11 @@ void frmConflictResolution::LoadData(vCard *LocalData, vCard *ServerData, std::m
        wxString ServerSID = wxString::Format(wxT("%i"), rand() % 32768);
 
        LoadContactData(LocalData, htmClient, ClientSID, 
-       wxT(""), MemoryFSList);
+       wxT(""), MemoryFSList, backgroundColour);
        
        // Load the server data.
        
        LoadContactData(ServerData, htmServer, ServerSID, 
-       wxT(""), MemoryFSList);         
+       wxT(""), MemoryFSList, backgroundColour);               
 
 }
\ No newline at end of file