void frmConflictResolution::KeepLocalData( wxCommandEvent& event )
{
+
+ // Button 'Keep Local' was pressed.
+
ConflictResult = 1;
this->Close();
void frmConflictResolution::KeepServerData( wxCommandEvent& event )
{
+
+ // Button 'Keep Server' was pressed.
+
ConflictResult = 2;
this->Close();
void frmConflictResolution::DecideLater( wxCommandEvent& event )
{
+ // Button 'Decide Later' was pressed.
+
ConflictResult = 0;
this->Close();
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.
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