From 3519eab2e994a515e9298d813649e6ae37849644 Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Wed, 26 Nov 2014 23:36:50 -0500 Subject: [PATCH] extras/CheckListBox: Added 'IsFullyChecked()' - To review whether this is really needed - GuiConfigData: Null pointer check --- extras/gui/GuiConfigData.ec | 3 ++- extras/gui/controls/CheckListBox.ec | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/extras/gui/GuiConfigData.ec b/extras/gui/GuiConfigData.ec index 4e0f126..3c3b60a 100644 --- a/extras/gui/GuiConfigData.ec +++ b/extras/gui/GuiConfigData.ec @@ -260,7 +260,8 @@ class SavedConfigWindow : Window if(result) { GuiConfigData data = getGuiConfigData(); - data.timer.Start(); + if(data) + data.timer.Start(); } return result; } diff --git a/extras/gui/controls/CheckListBox.ec b/extras/gui/controls/CheckListBox.ec index 5e8e035..ab4fed4 100644 --- a/extras/gui/controls/CheckListBox.ec +++ b/extras/gui/controls/CheckListBox.ec @@ -354,6 +354,13 @@ public: return false; } + bool IsFullyChecked(DataRow row) + { + DataRow parent; + for(parent = row; parent; parent = parent.parent) if(rowChecks.Find(parent)) return true; + return false; + } + virtual void Window::NotifyChecked(CheckListBox listBox, DataRow row); void SetDisabled(DataRow row, bool disabled) -- 1.8.3.1