Implemented dtor for RenderElement removing all instances from browsers.

[u/mrichter/AliRoot.git] / EVE / Reve / RenderElement.h

diff --git a/EVE/Reve/RenderElement.h b/EVE/Reve/RenderElement.h
index 999d04293cf3aaddc79812fe37c67d42b21e1ebe..32dc814ae9b4e7d5200980b76916d9c13df2bf86 100644 (file)
--- a/EVE/Reve/RenderElement.h
+++ b/EVE/Reve/RenderElement.h
@@ -35,7 +35,8 @@ protected:
 
     ListTreeInfo() {}
     ListTreeInfo(TGListTree* lt, TGListTreeItem* lti) : fTree(lt), fItem(lti) {}
-    
+    virtual ~ListTreeInfo() {}
+
     bool operator==(const ListTreeInfo& x) const
     { return fTree == x.fTree && fItem == x.fItem; }
     bool operator<(const ListTreeInfo& x) const
@@ -51,9 +52,9 @@ protected:
 public:
   RenderElement();
   RenderElement(Color_t& main_color);
-  virtual ~RenderElement() {}
+  virtual ~RenderElement();
 
-  TObject* GetObject(Reve::Exc_t eh="RenderElement::GetObject ");
+  virtual TObject* GetObject(Reve::Exc_t eh="RenderElement::GetObject ");
 
   /*
     TRef&    GetSource() { return fSource; }
@@ -72,11 +73,11 @@ public:
   void SpawnEditor();                  // *MENU*
   void ExportToCINT(Text_t* var_name); // *MENU*
 
-  virtual Bool_t CanEditRnrElement()   { return true; }
+  virtual Bool_t CanEditRnrElement()   { return kTRUE; }
   virtual Bool_t GetRnrElement() const { return fRnrElement; }
   virtual void   SetRnrElement(Bool_t rnr);
 
-  virtual Bool_t CanEditMainColor()        { return false; }
+  virtual Bool_t CanEditMainColor()        { return kFALSE; }
   Color_t* GetMainColorPtr()               { return fMainColorPtr; }
   void     SetMainColorPtr(Color_t* color) { fMainColorPtr = color; }
 
@@ -85,7 +86,26 @@ public:
           void    SetMainColorByPixel(Pixel_t pixel);
 
   ClassDef(RenderElement, 1);
-}; // endclass Reve
+}; // endclass RenderElement
+
+/**************************************************************************/
+
+class RenderElementObjPtr : public RenderElement
+{
+protected:
+  TObject* fObject;
+
+public:
+  RenderElementObjPtr(TObject* obj);
+  RenderElementObjPtr(TObject* obj, Color_t& mainColor);
+  virtual ~RenderElementObjPtr();
+
+  virtual TObject* GetObject(Reve::Exc_t eh="RenderElementObjPtr::GetObject ");
+
+  virtual void SetRnrElement(Bool_t rnr);
+
+  ClassDef(RenderElementObjPtr, 1);
+}; // endclass RenderElementObjPtr
 
 /**************************************************************************/
 
@@ -102,6 +122,7 @@ protected:
 public:
   RenderElementListBase() {}
   RenderElementListBase(Color_t& col) : RenderElement(col) {}
+  virtual ~RenderElementListBase() {}
 
   virtual void AddElement(RenderElement* el) { fList.push_back(el); }
 
@@ -127,8 +148,9 @@ public:
   RenderElementList(const Text_t* n="RenderElementList", const Text_t* t="") :
     TNamed(n, t), RenderElementListBase(fColor), fColor(0)
   {}
+  virtual ~RenderElementList() {}
 
-  virtual Bool_t CanEditMainColor()  { return true; }
+  virtual Bool_t CanEditMainColor()  { return kTRUE; }
 
   virtual void Paint(Option_t* option = "") { PaintElements(option); }