- wxbRestorePanel & wxbHistoryTextCtrl : Fixed unsigned comparisons.

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

diff --git a/bacula/src/wx-console/CHANGELOG b/bacula/src/wx-console/CHANGELOG
index 46dd48b3294fce385bbfe1c52f50b22e255ccc90..159340d771fe90d2edc030b7fdd0329cbef67544 100644 (file)
--- a/bacula/src/wx-console/CHANGELOG
+++ b/bacula/src/wx-console/CHANGELOG
@@ -1,4 +1,5 @@
 17-07-2004 :
+ - wxbRestorePanel & wxbHistoryTextCtrl : Fixed unsigned comparisons.
  - wxbRestorePanel : Fixed problem when the newly created job is not
     at the end of the list.
 

diff --git a/bacula/src/wx-console/wxbhistorytextctrl.cpp b/bacula/src/wx-console/wxbhistorytextctrl.cpp
index eb5120ef4c06e296e6e74a7b8beade2aa5437db3..b954cf4c7e2730f11e87ac1cb1347750479ca5e5 100644 (file)
--- a/bacula/src/wx-console/wxbhistorytextctrl.cpp
+++ b/bacula/src/wx-console/wxbhistorytextctrl.cpp
@@ -50,7 +50,7 @@ void wxbHistoryTextCtrl::HistoryAdd(wxString cmd) {
 void wxbHistoryTextCtrl::OnKeyUp(wxKeyEvent& event) {
    if (event.m_keyCode == WXK_UP) {
       if (index > 0) {
-         if (index == (history.Count()-1)) {
+         if (index == ((int)history.Count()-1)) {
             history[index] = GetValue();
          }
          index--;
@@ -59,7 +59,7 @@ void wxbHistoryTextCtrl::OnKeyUp(wxKeyEvent& event) {
       }
    }
    else if (event.m_keyCode == WXK_DOWN) {
-      if (index < (history.Count()-1)) {
+      if (index < ((int)history.Count()-1)) {
          index++;
          SetValue(history[index]);
          SetInsertionPointEnd();

diff --git a/bacula/src/wx-console/wxbrestorepanel.cpp b/bacula/src/wx-console/wxbrestorepanel.cpp
index e61adec92a042a84e70f6899fe46d49311214f63..51da80753ea5d8d4c4613ce3c1244e640ef37550 100644 (file)
--- a/bacula/src/wx-console/wxbrestorepanel.cpp
+++ b/bacula/src/wx-console/wxbrestorepanel.cpp
@@ -1121,8 +1121,8 @@ void wxbRestorePanel::CmdListJobs() {
       wxbDataTokenizer* dt = wxbUtils::WaitForEnd(configPanel->GetRowString("Client") + "\n", true);
 
       if (!tableparser->hasFinished()) {
-         for (int i = 0; i < dt->Count(); i++) {
-            if ((*dt)[i].Index("No results to list.") == 0) {
+         for (unsigned int i = 0; i < dt->Count(); i++) {
+            if ((*dt)[i].Find("No results to list.") == 0) {
                configPanel->AddRowChoice("Before", "No backup found for this client.");
                configPanel->SetRowSelection("Before", 0);
                configPanel->EnableApply(true); // Enabling the not existing apply button disables the ok button.
@@ -1130,7 +1130,7 @@ void wxbRestorePanel::CmdListJobs() {
                delete dt;
                return;
             }
-            else if (((*dt)[i].Index("ERROR") > -1) || ((*dt)[i].Index("Query failed") > -1)) {
+            else if (((*dt)[i].Find("ERROR") > -1) || ((*dt)[i].Find("Query failed") > -1)) {
                configPanel->AddRowChoice("Before", "Cannot get previous backups list, see console.");
                configPanel->SetRowSelection("Before", 0);
                configPanel->EnableApply(true); // Enabling the not existing apply button disables the ok button.