[dasher: 95/217] More fixes for accessing deleted objects.
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher: 95/217] More fixes for accessing deleted objects.
- Date: Sat, 27 Feb 2016 12:08:19 +0000 (UTC)
commit 22bd963d409b0f5a3683bf25761e5fac3cce9136
Author: ipomoena <amajorek google com>
Date: Mon Oct 19 18:09:58 2015 -0700
More fixes for accessing deleted objects.
Src/DasherCore/ControlManager.h | 1 +
Src/DasherCore/DasherNode.h | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/Src/DasherCore/ControlManager.h b/Src/DasherCore/ControlManager.h
index 88c92d9..9213423 100644
--- a/Src/DasherCore/ControlManager.h
+++ b/Src/DasherCore/ControlManager.h
@@ -63,6 +63,7 @@ namespace Dasher {
public:
CControlBase *mgr() const {return m_pMgr;}
CContNode(int iOffset, int iColour, NodeTemplate *pTemplate, CControlBase *pMgr);
+ CDasherScreen::Label *getLabel() { return m_pTemplate->m_pLabel; }
bool bShove() {return false;}
double SpeedMul() {return 0.5;}
diff --git a/Src/DasherCore/DasherNode.h b/Src/DasherCore/DasherNode.h
index 2dc890f..3b6ff85 100644
--- a/Src/DasherCore/DasherNode.h
+++ b/Src/DasherCore/DasherNode.h
@@ -90,7 +90,7 @@ class Dasher::CDasherNode:private NoClones {
/// Colour; note invisible nodes just have the same colour as their parent.
/// (so we know what colour to use when their parents are deleted)
inline int getColour() {return m_iColour;}
- inline CDasherScreen::Label *getLabel() {return m_pLabel;}
+ virtual CDasherScreen::Label *getLabel() { return m_pLabel; }
///Whether labels on child nodes should be displaced to the right of this node's label.
/// (Default implementation returns true, subclasses should override if appropriate)
virtual bool bShove() {return true;}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]