From 78a3d08edf8e9b8b11ba87c5a6a4f9211ae107d3 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 14 Feb 2013 18:29:08 +0100 Subject: [PATCH 1/1] Feature #1711 CreaDevManager application implementation - Settings implemented. Warnings suppression. --- lib/creaDevManagerLib/wxCDMMainFrame.cpp | 2 +- lib/creaDevManagerLib/wxCDMSettingsDialog.cpp | 2 +- src/creawxVTKRenderWindowInteractor.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp index 98dfb28..5ecc185 100755 --- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp +++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp @@ -130,7 +130,7 @@ bool wxCDMMainFrame::Create( this->help = true; wxConfigBase* pConfig = wxConfigBase::Get(); - this->help = pConfig->Read(wxT("HELP"), this->help); + this->help = pConfig->Read(wxT("HELP"), this->help) != 0; this->model = new modelCDMMain(); diff --git a/lib/creaDevManagerLib/wxCDMSettingsDialog.cpp b/lib/creaDevManagerLib/wxCDMSettingsDialog.cpp index 306c5a8..50dc185 100644 --- a/lib/creaDevManagerLib/wxCDMSettingsDialog.cpp +++ b/lib/creaDevManagerLib/wxCDMSettingsDialog.cpp @@ -113,7 +113,7 @@ void wxCDMSettingsDialog::CreateControls() this->fileExplorer = new wxTextCtrl(this, -1, pConfig->Read(wxT("FILE_EXPLORER"), crea::std2wx(CDMUtilities::FILE_EXPLORER))); this->terminal = new wxTextCtrl(this, -1, pConfig->Read(wxT("TERMINAL"), crea::std2wx(CDMUtilities::TERMINAL))); this->helpEnabled = new wxCheckBox(this, -1, wxT("")); - this->helpEnabled->SetValue(pConfig->Read(wxT("HELP"), true)); + this->helpEnabled->SetValue(pConfig->Read(wxT("HELP"), true) != 0); formItems->Add(stxtTextEditor, 0, wxALIGN_CENTER_VERTICAL); diff --git a/src/creawxVTKRenderWindowInteractor.cxx b/src/creawxVTKRenderWindowInteractor.cxx index 68aa2e3..b83bcce 100644 --- a/src/creawxVTKRenderWindowInteractor.cxx +++ b/src/creawxVTKRenderWindowInteractor.cxx @@ -791,7 +791,7 @@ void creawxVTKRenderWindowInteractor::SetRenderWhenDisabled(int newValue) //resulting in a Render(), resulting in Update() being called whilst //still in progress. - RenderWhenDisabled = (bool)newValue; + RenderWhenDisabled = newValue != 0; } //--------------------------------------------------------------------------- // -- 2.46.2