- wxbRestorePanel : Corrected incorrect casting of event functions (reported by...

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1338 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/wx-console/CHANGELOG b/bacula/src/wx-console/CHANGELOG
index 85b7e8d4336e884e97c7045283905dab294a6bca..ab1c3270e86b23a8a1f3a7d257a86471e6273ce0 100644 (file)
--- 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 4a2d2e6eda7ece00ce2d2a3481badad9723e5f79..5dad78c9115cec6371b91cdb60da90a4b382385e 100644 (file)
--- 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 015a6d4ceef995fb8f5590f9c466805b91053447..45121595cbd3b570ec1d13c9c5cd1ae22f7ab34c 100644 (file)
--- 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 */