wxWidgets3.patch

   1 diff -ur bacula-5.2.13/src/wx-console/wxbmainframe.cpp bacula-5.2.13.wx/src/wx-console/wxbmainframe.cpp
   2 --- bacula-5.2.13/src/wx-console/wxbmainframe.cpp       2014-01-18 20:03:40.675365632 +0100
   3 +++ bacula-5.2.13.wx/src/wx-console/wxbmainframe.cpp    2014-01-18 20:03:00.478699256 +0100
   4 @@ -100,7 +100,7 @@
   5
   6  DEFINE_EVENT_TYPE(wxbTHREAD_EVENT)
   7
   8 -typedef void (wxEvtHandler::*wxThreadEventFunction)(wxbThreadEvent&);
   9 +//typedef void (wxEvtHandler::*wxThreadEventFunction)(wxbThreadEvent&);
  10
  11  #define EVT_THREAD_EVENT(id, fn) \
  12      DECLARE_EVENT_TABLE_ENTRY( \
  13 @@ -850,7 +850,7 @@
  14     evt.SetEventPrintObject(po);
  15
  16     if (wxbMainFrame::GetInstance()) {
  17 -      wxbMainFrame::GetInstance()->AddPendingEvent(evt);
  18 +      wxbMainFrame::GetInstance()->GetEventHandler()->AddPendingEvent(evt);
  19     }
  20  }
  21
  22 diff -ur bacula-5.2.13/src/wx-console/wxbrestorepanel.cpp bacula-5.2.13.wx/src/wx-console/wxbrestorepanel.cpp
  23 --- bacula-5.2.13/src/wx-console/wxbrestorepanel.cpp    2014-01-18 20:03:40.675365632 +0100
  24 +++ bacula-5.2.13.wx/src/wx-console/wxbrestorepanel.cpp 2014-01-18 20:00:54.408700169 +0100
  25 @@ -1276,8 +1276,8 @@
  26        for (int i = tableparser->GetCount()-1; i > -1; i--) {
  27           wxString str = (*tableparser)[i][3];
  28           wxDateTime datetime;
  29 -         const wxChar* chr;
  30 -         if ( ( (chr = datetime.ParseDate(str.GetData()) ) != NULL ) && ( datetime.ParseTime(++chr) != NULL ) && ! lastdatetime.IsEqualTo(datetime) ) {
  31 +         const wxChar* chr = datetime.ParseDate(str);
  32 +         if ( (chr != NULL) && ( datetime.ParseTime(++chr) != NULL ) && ! lastdatetime.IsEqualTo(datetime) ) {
  33              lastdatetime = datetime;
  34              datetime += wxTimeSpan::Seconds(1);
  35              configPanel->AddRowChoice(_("Before"),
  36 @@ -1937,9 +1937,9 @@
  37  void wxbRestorePanel::SetStatus(status_enum newstatus) {
  38     switch (newstatus) {
  39     case disabled:
  40 -      centerSizer->Remove(configPanel);
  41 -      centerSizer->Remove(restorePanel);
  42 -      centerSizer->Remove(treelistPanel);
  43 +      centerSizer->Detach(configPanel);
  44 +      centerSizer->Detach(restorePanel);
  45 +      centerSizer->Detach(treelistPanel);
  46        treelistPanel->Show(false);
  47        restorePanel->Show(false);
  48        centerSizer->Add(configPanel, 1, wxEXPAND);
  49 @@ -1958,9 +1958,9 @@
  50        cancelled = 0;
  51        break;
  52     case finished:
  53 -      centerSizer->Remove(configPanel);
  54 -      centerSizer->Remove(restorePanel);
  55 -      centerSizer->Remove(treelistPanel);
  56 +      centerSizer->Detach(configPanel);
  57 +      centerSizer->Detach(restorePanel);
  58 +      centerSizer->Detach(treelistPanel);
  59        treelistPanel->Show(false);
  60        restorePanel->Show(false);
  61        centerSizer->Add(configPanel, 1, wxEXPAND);
  62 @@ -2001,7 +2001,7 @@
  63     case choosing:
  64        start->Enable(true);
  65        start->SetLabel(_("Restore"));
  66 -      centerSizer->Remove(configPanel);
  67 +      centerSizer->Detach(configPanel);
  68        configPanel->Show(false);
  69        centerSizer->Add(treelistPanel, 1, wxEXPAND);
  70        treelistPanel->Show(true);
  71 @@ -2017,7 +2017,7 @@
  72        configPanel->Enable(false);
  73        tree->Enable(false);
  74        list->Enable(false);
  75 -      centerSizer->Remove(treelistPanel);
  76 +      centerSizer->Detach(treelistPanel);
  77        treelistPanel->Show(false);
  78        centerSizer->Add(restorePanel, 1, wxEXPAND);
  79        restorePanel->Show(true);