From d6bbf7c30071165b3840d0fe54a181e4b08d8f95 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Mon, 25 Sep 2006 13:26:51 +0000
Subject: [PATCH] From Matevz: Remove obsoleted function DeleteEditors(); added
abstract virtual 'TCanvas* GetCanvas()' needed for management of editor
visibility.
git-svn-id: http://root.cern.ch/svn/root/trunk@16321 27541ba8-7e3a-0410-8455-c3a389f83636
---
base/inc/TVirtualPadEditor.h | 6 ++++--
base/src/TVirtualPadEditor.cxx | 9 +++++----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/base/inc/TVirtualPadEditor.h b/base/inc/TVirtualPadEditor.h
index bbee86d7396..a0d00d56508 100644
--- a/base/inc/TVirtualPadEditor.h
+++ b/base/inc/TVirtualPadEditor.h
@@ -24,6 +24,8 @@
#include "TString.h"
#endif
+class TCanvas;
+
class TVirtualPadEditor {
protected:
@@ -45,11 +47,11 @@ public:
virtual void TextAttributes(Int_t ,Float_t ,Int_t ,Int_t ,Float_t ) { }
virtual void Build() { }
+ virtual void Show() { }
virtual void Hide() { }
virtual Bool_t IsGlobal() const = 0;
- virtual void DeleteEditors() { }
virtual void SetGlobal(Bool_t) { }
- virtual void Show() { }
+ virtual TCanvas* GetCanvas() const = 0;
// methods related to the new editor interface
diff --git a/base/src/TVirtualPadEditor.cxx b/base/src/TVirtualPadEditor.cxx
index b8dc523f489..064ebea64cf 100644
--- a/base/src/TVirtualPadEditor.cxx
+++ b/base/src/TVirtualPadEditor.cxx
@@ -87,10 +87,12 @@ void TVirtualPadEditor::SetPadEditorName(const char *name)
//______________________________________________________________________________
void TVirtualPadEditor::ShowEditor()
{
- // Show the pad editor. Static method.
+ // Show the global pad editor. Static method.
- if (!fgPadEditor) GetPadEditor();
- fgPadEditor->SetGlobal(kTRUE);
+ if (!fgPadEditor) {
+ GetPadEditor();
+ fgPadEditor->SetGlobal(kTRUE);
+ }
fgPadEditor->Show();
}
@@ -110,7 +112,6 @@ void TVirtualPadEditor::Terminate()
if (!fgPadEditor) return;
- fgPadEditor->DeleteEditors();
delete fgPadEditor;
fgPadEditor = 0;
}
--
GitLab