From 7e85a38b078ac5fe0ddc4fe5aad41449a42ce06b Mon Sep 17 00:00:00 2001
From: Timur Pocheptsov <Timur.Pocheptsov@cern.ch>
Date: Mon, 28 Apr 2014 14:20:24 +0200
Subject: [PATCH] Overriders for several new pure-virtual functions in
TVirtualPad.
---
graf2d/ios/inc/IOSPadStub.h | 9 +++++++++
graf2d/ios/src/IOSPadStub.cxx | 22 ++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/graf2d/ios/inc/IOSPadStub.h b/graf2d/ios/inc/IOSPadStub.h
index c8ac17d2f73..60747b8fd1f 100644
--- a/graf2d/ios/inc/IOSPadStub.h
+++ b/graf2d/ios/inc/IOSPadStub.h
@@ -66,6 +66,12 @@ public:
void SetAttMarkerPS(Color_t, Style_t, Size_t);
void SetAttTextPS(Int_t, Float_t, Color_t, Style_t, Float_t);
void PaintBorderPS(Double_t, Double_t, Double_t, Double_t, Int_t, Int_t, Int_t, Int_t);
+ //PaintText with a parameter of a type wchar_t is a special version
+ //used by mathtext. It relies strongly on ttf and actually requires
+ //ttf. NOOP at the moment (whence it's here, in a 'stub' class).
+ virtual void PaintText(Double_t, Double_t, const wchar_t *);
+ virtual void PaintTextNDC(Double_t, Double_t, const wchar_t *);
+ //
Int_t GetGLDevice();
void SetCopyGLDevice(Bool_t);
void Pop();
@@ -93,10 +99,13 @@ public:
void SetName(const char *);
void SetTitle(const char *);
void SetSelected(TObject *);
+ void ShowGuidelines(TObject *, Int_t, char, bool);
void Update();
TObject *WaitPrimitive(const char *, const char *);
void ReleaseViewer3D(Option_t *);
Bool_t HasViewer3D() const;
+
+ TVirtualPadPainter *GetPainter();
};
}//namespace iOS
diff --git a/graf2d/ios/src/IOSPadStub.cxx b/graf2d/ios/src/IOSPadStub.cxx
index a3ea40b2dff..5a2725a84fb 100644
--- a/graf2d/ios/src/IOSPadStub.cxx
+++ b/graf2d/ios/src/IOSPadStub.cxx
@@ -191,6 +191,16 @@ void PadStub::SetAttTextPS(Int_t, Float_t, Color_t, Style_t, Float_t)
{
}
+//______________________________________________________________________________
+void PadStub::PaintText(Double_t, Double_t, const wchar_t *)
+{
+}
+
+//______________________________________________________________________________
+void PadStub::PaintTextNDC(Double_t, Double_t, const wchar_t *)
+{
+}
+
//______________________________________________________________________________
void PadStub::PaintBorderPS(Double_t, Double_t, Double_t, Double_t, Int_t, Int_t, Int_t, Int_t)
{
@@ -337,6 +347,12 @@ void PadStub::SetSelected(TObject *)
{
}
+//______________________________________________________________________________
+void PadStub::ShowGuidelines(TObject *, Int_t, char, bool)
+{
+
+}
+
//______________________________________________________________________________
void PadStub::Update()
{
@@ -359,5 +375,11 @@ Bool_t PadStub::HasViewer3D() const
return kFALSE;
}
+//______________________________________________________________________________
+TVirtualPadPainter *PadStub::GetPainter()
+{
+ return 0;
+}
+
}
}
--
GitLab