summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoye <joye>2014-05-16 20:06:48 (GMT)
committerjoye <joye>2014-05-16 20:06:48 (GMT)
commit99fe152b0396816acc9e219eb6ec22e23ab1ede1 (patch)
treea753a56bb3e4e24867365c2c761efbae42e527ae
parent9449b7db4de04383a791c6114aabed48e7ac2eff (diff)
downloadblt-99fe152b0396816acc9e219eb6ec22e23ab1ede1.zip
blt-99fe152b0396816acc9e219eb6ec22e23ab1ede1.tar.gz
blt-99fe152b0396816acc9e219eb6ec22e23ab1ede1.tar.bz2
*** empty log message ***
-rw-r--r--src/bltGrLegdOp.C2
-rw-r--r--src/bltGrMisc.h9
-rw-r--r--src/bltGraph.C5
3 files changed, 4 insertions, 12 deletions
diff --git a/src/bltGrLegdOp.C b/src/bltGrLegdOp.C
index b4772bf..c86cdc1 100644
--- a/src/bltGrLegdOp.C
+++ b/src/bltGrLegdOp.C
@@ -161,7 +161,7 @@ static int ActivateOp(ClientData clientData, Tcl_Interp* interp,
}
if (redraw && !ops->hide)
- graphPtr->flags |= CACHE_DIRTY | REDRAW_WORLD;
+ graphPtr->flags |= CACHE_DIRTY;
// List active elements in stacking order
Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
diff --git a/src/bltGrMisc.h b/src/bltGrMisc.h
index 5e1f269..2edc6b7 100644
--- a/src/bltGrMisc.h
+++ b/src/bltGrMisc.h
@@ -70,11 +70,6 @@ using namespace std;
* REDRAW_PENDING Non-zero means a DoWhenIdle handler has
* already been queued to redraw this window.
*
- * DRAW_LEGEND Non-zero means redraw the legend. If this is
- * the only DRAW_* flag, the legend display
- * routine is called instead of the graph
- * display routine.
- *
* DRAW_MARGINS Indicates that the margins bordering
* the plotting area need to be redrawn.
* The possible reasons are:
@@ -98,15 +93,13 @@ using namespace std;
#define RESET_AXES (1<<10)/* 0x0400 */
#define GET_AXIS_GEOMETRY (1<<11)/* 0x0800 */
-#define DRAW_LEGEND (1<<12)/* 0x1000 */
#define DRAW_MARGINS (1<<13)/* 0x2000 */
#define CACHE_DIRTY (1<<14)/* 0x4000 */
#define GRAPH_DELETED (1<<15)/* 0x4000 */
#define MAP_WORLD (MAP_ALL|RESET_AXES|GET_AXIS_GEOMETRY)
-#define REDRAW_WORLD (DRAW_LEGEND)
-#define RESET_WORLD (REDRAW_WORLD | MAP_WORLD)
+#define RESET_WORLD (MAP_WORLD)
#define MARGIN_NONE -1
#define MARGIN_BOTTOM 0 /* x */
diff --git a/src/bltGraph.C b/src/bltGraph.C
index abff3a0..cfe9d85 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -82,7 +82,7 @@ Graph::Graph(ClientData clientData, Tcl_Interp* interp,
GraphInstCmdProc, this,
GraphInstCmdDeleteProc);
- flags = MAP_WORLD | REDRAW_WORLD;
+ flags = MAP_WORLD;
nextMarkerId_ = 1;
legend_ = new Legend(this);
@@ -354,7 +354,6 @@ void Graph::draw()
Tk_FreePixmap(display_, drawable);
flags &= ~MAP_WORLD;
- flags &= ~REDRAW_WORLD;
}
int Graph::print(const char *ident, Blt_Ps ps)
@@ -1224,7 +1223,7 @@ void Graph::resetAxes()
// When any axis changes, we need to layout the entire graph.
flags &= ~RESET_AXES;
flags |= CACHE_DIRTY;
- flags |= (GET_AXIS_GEOMETRY | LAYOUT_NEEDED | MAP_ALL | REDRAW_WORLD);
+ flags |= (GET_AXIS_GEOMETRY | LAYOUT_NEEDED | MAP_ALL);
}
Axis* Graph::nearestAxis(int x, int y)