From: Nicolas Boichat <nicolas@boichat.ch>
Date: Sat, 3 Jul 2004 13:28:15 +0000 (+0000)
Subject: wxbConfigPanel : Fixed ?: operator cast problem with gcc 2.95.
X-Git-Tag: Release-1.35.1~80
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=469fae29fa0c2670c46252ffedaf59a526225fe5;p=bacula%2Fbacula

wxbConfigPanel : Fixed ?: operator cast problem with gcc 2.95.


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

diff --git a/bacula/src/wx-console/CHANGELOG b/bacula/src/wx-console/CHANGELOG
index 702bd49410..2d31e0e75c 100644
--- a/bacula/src/wx-console/CHANGELOG
+++ b/bacula/src/wx-console/CHANGELOG
@@ -1,3 +1,6 @@
+03-07-2004 :
+ - wxbConfigPanel : Fixed ?: operator cast problem with gcc 2.95.
+
 25-06-2004 :
  - wxbRestorePanel : Fix file size truncated if >100mb.
 
diff --git a/bacula/src/wx-console/wxbconfigpanel.cpp b/bacula/src/wx-console/wxbconfigpanel.cpp
index 793f03418f..b57530e349 100644
--- a/bacula/src/wx-console/wxbconfigpanel.cpp
+++ b/bacula/src/wx-console/wxbconfigpanel.cpp
@@ -88,13 +88,13 @@ wxString wxbConfigParam::GetTitle() {
 wxString wxbConfigParam::GetValue() {
    switch (type) {
    case text:
-      return (statictext != NULL) ? statictext->GetLabel() : "";
+      return (statictext != NULL) ? statictext->GetLabel() : wxString("");
       break;
    case modifiableText:
-      return (textctrl != NULL) ? textctrl->GetValue() : "";      
+      return (textctrl != NULL) ? textctrl->GetValue() : wxString("");      
       break;
    case choice:
-      return (choicectrl != NULL) ? choicectrl->GetStringSelection() : "";
+      return (choicectrl != NULL) ? choicectrl->GetStringSelection() : wxString("");
       break;      
    }
    return "";