From 8829b6f7ba4f91a1b4708a7fee0e3b7782e4f2e7 Mon Sep 17 00:00:00 2001
From: Nicolas Boichat <nicolas@boichat.ch>
Date: Sun, 2 May 2004 10:07:35 +0000
Subject: [PATCH]  - wxbRestorePanel : Corrected incorrect casting of event
 functions (reported by Aristedes Maniatis)

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1338 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/wx-console/CHANGELOG           |  6 +++++-
 bacula/src/wx-console/wxbrestorepanel.cpp | 17 ++++++++++++-----
 bacula/src/wx-console/wxbrestorepanel.h   | 17 ++++++++++++-----
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/bacula/src/wx-console/CHANGELOG b/bacula/src/wx-console/CHANGELOG
index 85b7e8d433..ab1c3270e8 100644
--- a/bacula/src/wx-console/CHANGELOG
+++ b/bacula/src/wx-console/CHANGELOG
@@ -1,4 +1,8 @@
-31-04-2004 :
+02-05-2004 :
+ - wxbRestorePanel : Corrected incorrect casting of event
+      functions (reported by Aristedes Maniatis)
+
+01-05-2004 :
  - wxbRestorePanel : Corrected a problem when you double-clicked an 
       a folder in the list, the list was then refreshed two times
       (instead of one) in the new directory
diff --git a/bacula/src/wx-console/wxbrestorepanel.cpp b/bacula/src/wx-console/wxbrestorepanel.cpp
index 4a2d2e6eda..5dad78c911 100644
--- a/bacula/src/wx-console/wxbrestorepanel.cpp
+++ b/bacula/src/wx-console/wxbrestorepanel.cpp
@@ -1,3 +1,10 @@
+/*
+ *
+ *   wxbPanel for restoring files
+ *
+ *    Nicolas Boichat, April-May 2004
+ *
+ */
 /*
    Copyright (C) 2004 Kern Sibbald and John Walker
 
@@ -1761,14 +1768,14 @@ void wxbRestorePanel::EnableConfig(bool enable) {
    Event handling
   ----------------------------------------------------------------------------*/
 
-void wxbRestorePanel::OnCancel(wxEvent& WXUNUSED(event)) {
+void wxbRestorePanel::OnCancel(wxCommandEvent& WXUNUSED(event)) {
    cancel->Enable(false);
    SetCursor(*wxHOURGLASS_CURSOR);
    CmdCancel();
    SetCursor(*wxSTANDARD_CURSOR);
 }
 
-void wxbRestorePanel::OnStart(wxEvent& WXUNUSED(event)) {
+void wxbRestorePanel::OnStart(wxCommandEvent& WXUNUSED(event)) {
    if (working) {
       return;
    }
@@ -1921,7 +1928,7 @@ void wxbRestorePanel::OnConfigUpdated(wxCommandEvent& event) {
    }
 }
 
-void wxbRestorePanel::OnConfigOk(wxEvent& WXUNUSED(event)) {
+void wxbRestorePanel::OnConfigOk(wxCommandEvent& WXUNUSED(event)) {
    if (status != configuring) return;
    if (working) {
       return;
@@ -1933,7 +1940,7 @@ void wxbRestorePanel::OnConfigOk(wxEvent& WXUNUSED(event)) {
    SetCursor(*wxSTANDARD_CURSOR);
 }
 
-void wxbRestorePanel::OnConfigApply(wxEvent& WXUNUSED(event)) {
+void wxbRestorePanel::OnConfigApply(wxCommandEvent& WXUNUSED(event)) {
    if (status != configuring) return;
    if (working) {
       return;
@@ -1948,7 +1955,7 @@ void wxbRestorePanel::OnConfigApply(wxEvent& WXUNUSED(event)) {
    SetCursor(*wxSTANDARD_CURSOR);
 }
 
-void wxbRestorePanel::OnConfigCancel(wxEvent& WXUNUSED(event)) {
+void wxbRestorePanel::OnConfigCancel(wxCommandEvent& WXUNUSED(event)) {
    if (status != configuring) return;
    if (working) {
       return;
diff --git a/bacula/src/wx-console/wxbrestorepanel.h b/bacula/src/wx-console/wxbrestorepanel.h
index 015a6d4cee..45121595cb 100644
--- a/bacula/src/wx-console/wxbrestorepanel.h
+++ b/bacula/src/wx-console/wxbrestorepanel.h
@@ -1,3 +1,10 @@
+/*
+ *
+ *   wxbPanel for restoring files
+ *
+ *    Nicolas Boichat, April-May 2004
+ *
+ */
 /*
    Copyright (C) 2004 Kern Sibbald and John Walker
 
@@ -155,8 +162,8 @@ class wxbRestorePanel : public wxbPanel
       void EnableConfig(bool enable);
 
 /* Event handling */
-      void OnStart(wxEvent& WXUNUSED(event));
-      void OnCancel(wxEvent& WXUNUSED(event));
+      void OnStart(wxCommandEvent& WXUNUSED(event));
+      void OnCancel(wxCommandEvent& WXUNUSED(event));
       void OnTreeChanging(wxTreeEvent& event);
       void OnTreeExpanding(wxTreeEvent& event);
       void OnTreeChanged(wxTreeEvent& event);
@@ -164,9 +171,9 @@ class wxbRestorePanel : public wxbPanel
       void OnListMarked(wxbListMarkedEvent& event);
       void OnListActivated(wxListEvent& event);
       void OnConfigUpdated(wxCommandEvent& event);
-      void OnConfigOk(wxEvent& WXUNUSED(event));
-      void OnConfigApply(wxEvent& WXUNUSED(event));
-      void OnConfigCancel(wxEvent& WXUNUSED(event));
+      void OnConfigOk(wxCommandEvent& WXUNUSED(event));
+      void OnConfigApply(wxCommandEvent& WXUNUSED(event));
+      void OnConfigCancel(wxCommandEvent& WXUNUSED(event));
 
 /* Components */
       wxBoxSizer *centerSizer; /* Center sizer */
-- 
2.39.5