From 0d0f8635218a2893fcd00385019089253474f634 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Mon, 10 May 2021 08:05:45 -0400 Subject: add upstream 11.10 --- wx+/graph.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'wx+/graph.h') diff --git a/wx+/graph.h b/wx+/graph.h index 288ef9e7..55734a06 100644 --- a/wx+/graph.h +++ b/wx+/graph.h @@ -25,7 +25,7 @@ namespace zen setLabelX(Graph2D::LABEL_X_BOTTOM, 20, std::make_shared()). setLabelY(Graph2D::LABEL_Y_RIGHT, 60, std::make_shared())); //set graph data - std::shared_ptr curveDataBytes_ = ... + SharedRef curveDataBytes_ = ... m_panelGraph->setCurve(curveDataBytes_, Graph2D::CurveAttributes().setLineWidth(2).setColor(wxColor(0, 192, 0))); */ struct CurvePoint @@ -215,7 +215,7 @@ public: int lineWidth = fastFromDIP(2); }; - void addCurve(const std::shared_ptr& data, const CurveAttributes& ca = CurveAttributes()); + void addCurve(const SharedRef& data, const CurveAttributes& ca = CurveAttributes()); void clearCurves() { curves_.clear(); } static wxColor getBorderColor() { return {130, 135, 144}; } //medium grey, the same Win7 uses for other frame borders => not accessible! but no big deal... @@ -326,7 +326,7 @@ private: std::optional doubleBuffer_; - using CurveList = std::vector, CurveAttributes>>; + using CurveList = std::vector, CurveAttributes>>; CurveList curves_; //perf!!! generating the font is *very* expensive! => buffer for Graph2D::render()! -- cgit