summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoye <joye>2014-05-16 20:06:48 (GMT)
committerjoye <joye>2014-05-16 20:06:48 (GMT)
commit7e1f750f32dc1097d7469106a088fcba9bd1ce84 (patch)
treef49cc9bd0ac810a87a456b8d97056cd83e209ff9
parent99fe152b0396816acc9e219eb6ec22e23ab1ede1 (diff)
downloadblt-7e1f750f32dc1097d7469106a088fcba9bd1ce84.zip
blt-7e1f750f32dc1097d7469106a088fcba9bd1ce84.tar.gz
blt-7e1f750f32dc1097d7469106a088fcba9bd1ce84.tar.bz2
*** empty log message ***
-rw-r--r--src/bltGrAxisOp.C2
-rw-r--r--src/bltGrElemOp.C10
-rw-r--r--src/bltGrLegd.C1
-rw-r--r--src/bltGrLegdOp.C2
-rw-r--r--src/bltGrMisc.h1
-rw-r--r--src/bltGrXAxisOp.C2
-rw-r--r--src/bltGraph.C2
-rw-r--r--src/bltGraphBar.C40
-rw-r--r--src/bltGraphLine.C36
-rw-r--r--src/bltGraphOp.C4
10 files changed, 48 insertions, 52 deletions
diff --git a/src/bltGrAxisOp.C b/src/bltGrAxisOp.C
index 1c82b64..5b830b4 100644
--- a/src/bltGrAxisOp.C
+++ b/src/bltGrAxisOp.C
@@ -76,7 +76,7 @@ int AxisObjConfigure(Axis* axisPtr, Tcl_Interp* interp,
}
axisPtr->flags |= mask;
- graphPtr->flags |= REDRAW_WORLD | MAP_WORLD | RESET_AXES | CACHE_DIRTY;
+ graphPtr->flags |= MAP_WORLD | RESET_AXES | CACHE_DIRTY;
if (axisPtr->configure() != TCL_OK)
return TCL_ERROR;
graphPtr->eventuallyRedraw();
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index 8a961b5..5cdf685 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -69,7 +69,7 @@ int ElementObjConfigure( Element* elemPtr, Tcl_Interp* interp,
elemPtr->flags |= mask;
elemPtr->flags |= MAP_ITEM;
- graphPtr->flags |= RESET_WORLD | CACHE_DIRTY;
+ graphPtr->flags |= MAP_WORLD | CACHE_DIRTY;
if (elemPtr->configure() != TCL_OK)
return TCL_ERROR;
graphPtr->eventuallyRedraw();
@@ -327,7 +327,7 @@ static int DeleteOp(ClientData clientData, Tcl_Interp* interp,
graphPtr->destroyElement(elemPtr);
}
- graphPtr->flags |= RESET_WORLD;
+ graphPtr->flags |= MAP_WORLD;
graphPtr->eventuallyRedraw();
return TCL_OK;
@@ -389,7 +389,7 @@ static int LowerOp(ClientData clientData, Tcl_Interp* interp,
}
Blt_Chain_Destroy(chain);
- graphPtr->flags |= RESET_WORLD;
+ graphPtr->flags |= MAP_WORLD;
graphPtr->eventuallyRedraw();
Tcl_SetObjResult(interp, DisplayListObj(graphPtr));
@@ -454,7 +454,7 @@ static int RaiseOp(ClientData clientData, Tcl_Interp* interp,
}
Blt_Chain_Destroy(chain);
- graphPtr->flags |= RESET_WORLD;
+ graphPtr->flags |= MAP_WORLD;
graphPtr->eventuallyRedraw();
Tcl_SetObjResult(interp, DisplayListObj(graphPtr));
@@ -501,7 +501,7 @@ static int ShowOp(ClientData clientData, Tcl_Interp* interp,
elemPtr->link = link;
}
- graphPtr->flags |= RESET_WORLD;
+ graphPtr->flags |= MAP_WORLD;
graphPtr->eventuallyRedraw();
Tcl_SetObjResult(interp, DisplayListObj(graphPtr));
diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C
index ac5c14d..5587d91 100644
--- a/src/bltGrLegd.C
+++ b/src/bltGrLegd.C
@@ -543,7 +543,6 @@ void Legend::draw(Drawable drawable)
}
Tk_FreePixmap(graphPtr_->display_, pixmap);
- graphPtr_->flags &= ~DRAW_LEGEND;
}
void Legend::print(Blt_Ps ps)
diff --git a/src/bltGrLegdOp.C b/src/bltGrLegdOp.C
index c86cdc1..b04325a 100644
--- a/src/bltGrLegdOp.C
+++ b/src/bltGrLegdOp.C
@@ -69,7 +69,7 @@ static int LegendObjConfigure(Graph* graphPtr, Tcl_Interp* interp,
}
graphPtr->flags |= mask;
- graphPtr->flags |= (RESET_WORLD | CACHE_DIRTY);
+ graphPtr->flags |= (MAP_WORLD | CACHE_DIRTY);
legendPtr->configure();
graphPtr->eventuallyRedraw();
diff --git a/src/bltGrMisc.h b/src/bltGrMisc.h
index 2edc6b7..15fdbb4 100644
--- a/src/bltGrMisc.h
+++ b/src/bltGrMisc.h
@@ -99,7 +99,6 @@ using namespace std;
#define GRAPH_DELETED (1<<15)/* 0x4000 */
#define MAP_WORLD (MAP_ALL|RESET_AXES|GET_AXIS_GEOMETRY)
-#define RESET_WORLD (MAP_WORLD)
#define MARGIN_NONE -1
#define MARGIN_BOTTOM 0 /* x */
diff --git a/src/bltGrXAxisOp.C b/src/bltGrXAxisOp.C
index 91d52b3..29f656d 100644
--- a/src/bltGrXAxisOp.C
+++ b/src/bltGrXAxisOp.C
@@ -195,7 +195,7 @@ static int UseOp(ClientData clientData, Tcl_Interp* interp,
// When any axis changes, we need to layout the entire graph.
graphPtr->flags |= (GET_AXIS_GEOMETRY | LAYOUT_NEEDED | RESET_AXES);
- graphPtr->flags |= (MAP_WORLD | REDRAW_WORLD);
+ graphPtr->flags |= (MAP_WORLD);
graphPtr->eventuallyRedraw();
return TCL_OK;
diff --git a/src/bltGraph.C b/src/bltGraph.C
index cfe9d85..7dd16d5 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -377,7 +377,7 @@ int Graph::print(const char *ident, Blt_Ps ps)
height_ = Tk_ReqHeight(tkwin_);
Blt_Ps_ComputeBoundingBox(setupPtr, width_, height_);
- flags |= LAYOUT_NEEDED | RESET_WORLD;
+ flags |= LAYOUT_NEEDED | MAP_WORLD;
/* Turn on PostScript measurements when computing the graph's layout. */
Blt_Ps_SetPrinting(ps, 1);
diff --git a/src/bltGraphBar.C b/src/bltGraphBar.C
index a97ae0c..34d96bb 100644
--- a/src/bltGraphBar.C
+++ b/src/bltGraphBar.C
@@ -70,16 +70,16 @@ static const char* searchAlongObjOption[] = {"x", "y", "both", NULL};
static Tk_OptionSpec optionSpecs[] = {
{TK_OPTION_DOUBLE, "-aspect", "aspect", "Aspect",
"0", -1, Tk_Offset(BarGraphOptions, aspect),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_BORDER, "-background", "background", "Background",
STD_NORMAL_BACKGROUND, -1, Tk_Offset(BarGraphOptions, normalBg),
0, NULL, CACHE_DIRTY},
{TK_OPTION_STRING_TABLE, "-barmode", "barMode", "BarMode",
"normal", -1, Tk_Offset(BarGraphOptions, barMode),
- 0, &barmodeObjOption, RESET_WORLD | CACHE_DIRTY},
+ 0, &barmodeObjOption, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_DOUBLE, "-barwidth", "barWidth", "BarWidth",
".9", -1, Tk_Offset(BarGraphOptions, barWidth),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_DOUBLE, "-baseline", "baseline", "Baseline",
"0", -1, Tk_Offset(BarGraphOptions, baseline), 0, NULL, 0},
{TK_OPTION_SYNONYM, "-bd", NULL, NULL, NULL, -1, 0, 0, "-borderwidth", 0},
@@ -87,10 +87,10 @@ static Tk_OptionSpec optionSpecs[] = {
{TK_OPTION_SYNONYM, "-bm", NULL, NULL, NULL, -1, 0, 0, "-bottommargin", 0},
{TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth",
STD_BORDERWIDTH, -1, Tk_Offset(BarGraphOptions, borderWidth), 0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_PIXELS, "-bottommargin", "bottomMargin", "BottomMargin",
"0", -1, Tk_Offset(BarGraphOptions, bottomMargin.reqSize), 0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor",
"crosshair", -1, Tk_Offset(BarGraphOptions, cursor),
TK_OPTION_NULL_OK, NULL, 0},
@@ -98,7 +98,7 @@ static Tk_OptionSpec optionSpecs[] = {
{TK_OPTION_FONT, "-font", "font", "Font",
STD_FONT_MEDIUM, -1, Tk_Offset(BarGraphOptions, titleTextStyle.font),
0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_COLOR, "-foreground", "foreground", "Foreground",
STD_NORMAL_FOREGROUND, -1, Tk_Offset(BarGraphOptions, titleTextStyle.color),
0, NULL,
@@ -106,7 +106,7 @@ static Tk_OptionSpec optionSpecs[] = {
{TK_OPTION_SYNONYM, "-halo", NULL, NULL, NULL, -1, 0, 0, "-searchhalo", 0},
{TK_OPTION_PIXELS, "-height", "height", "Height",
"4i", -1, Tk_Offset(BarGraphOptions, reqHeight),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_COLOR, "-highlightbackground", "highlightBackground",
"HighlightBackground",
STD_NORMAL_BACKGROUND, -1, Tk_Offset(BarGraphOptions, highlightBgColor),
@@ -120,34 +120,34 @@ static Tk_OptionSpec optionSpecs[] = {
"2", -1, Tk_Offset(BarGraphOptions, highlightWidth), 0, NULL, 0},
{TK_OPTION_BOOLEAN, "-invertxy", "invertXY", "InvertXY",
"no", -1, Tk_Offset(BarGraphOptions, inverted), 0, NULL,
- RESET_WORLD | CACHE_DIRTY | RESET_AXES},
+ MAP_WORLD | CACHE_DIRTY | RESET_AXES},
{TK_OPTION_JUSTIFY, "-justify", "justify", "Justify",
"center", -1, Tk_Offset(BarGraphOptions, titleTextStyle.justify),
0, NULL, 0},
{TK_OPTION_PIXELS, "-leftmargin", "leftMargin", "Margin",
"0", -1, Tk_Offset(BarGraphOptions, leftMargin.reqSize), 0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_SYNONYM, "-lm", NULL, NULL, NULL, -1, 0, 0, "-leftmargin", 0},
{TK_OPTION_BORDER, "-plotbackground", "plotbackground", "PlotBackground",
STD_NORMAL_BACKGROUND, -1, Tk_Offset(BarGraphOptions, plotBg), 0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_PIXELS, "-plotborderwidth", "plotBorderWidth", "PlotBorderWidth",
STD_BORDERWIDTH, -1, Tk_Offset(BarGraphOptions, plotBW), 0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_PIXELS, "-plotpadx", "plotPadX", "PlotPad",
"0", -1, Tk_Offset(BarGraphOptions, xPad),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_PIXELS, "-plotpady", "plotPadY", "PlotPad",
"0", -1, Tk_Offset(BarGraphOptions, yPad),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_RELIEF, "-plotrelief", "plotRelief", "Relief",
"flat", -1, Tk_Offset(BarGraphOptions, plotRelief), 0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_RELIEF, "-relief", "relief", "Relief",
"flat", -1, Tk_Offset(BarGraphOptions, relief), 0, NULL, 0},
{TK_OPTION_PIXELS, "-rightmargin", "rightMargin", "Margin",
"0", -1, Tk_Offset(BarGraphOptions, rightMargin.reqSize), 0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_SYNONYM, "-rm", NULL, NULL, NULL, -1, 0, 0, "-rightmargin", 0},
{TK_OPTION_PIXELS, "-searchhalo", "searchhalo", "SearchHalo",
"2m", -1, Tk_Offset(BarGraphOptions, search.halo), 0, NULL, 0},
@@ -163,20 +163,20 @@ static Tk_OptionSpec optionSpecs[] = {
NULL, -1, Tk_Offset(BarGraphOptions, takeFocus), TK_OPTION_NULL_OK, NULL, 0},
{TK_OPTION_STRING, "-title", "title", "Title",
NULL, -1, Tk_Offset(BarGraphOptions, title),
- TK_OPTION_NULL_OK, NULL, RESET_WORLD | CACHE_DIRTY},
+ TK_OPTION_NULL_OK, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_SYNONYM, "-tm", NULL, NULL, NULL, -1, 0, 0, "-topmargin", 0},
{TK_OPTION_PIXELS, "-topmargin", "topMargin", "TopMargin",
"0", -1, Tk_Offset(BarGraphOptions, topMargin.reqSize),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_PIXELS, "-width", "width", "Width",
"5i", -1, Tk_Offset(BarGraphOptions, reqWidth),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_PIXELS, "-plotwidth", "plotWidth", "PlotWidth",
"0", -1, Tk_Offset(BarGraphOptions, reqPlotWidth),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_PIXELS, "-plotheight", "plotHeight", "PlotHeight",
"0", -1, Tk_Offset(BarGraphOptions, reqPlotHeight),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_END, NULL, NULL, NULL, NULL, -1, 0, 0, NULL, 0}
};
diff --git a/src/bltGraphLine.C b/src/bltGraphLine.C
index d999e3d..9b94807 100644
--- a/src/bltGraphLine.C
+++ b/src/bltGraphLine.C
@@ -53,7 +53,7 @@ static const char* searchAlongObjOption[] = {"x", "y", "both", NULL};
static Tk_OptionSpec optionSpecs[] = {
{TK_OPTION_DOUBLE, "-aspect", "aspect", "Aspect",
"0", -1, Tk_Offset(LineGraphOptions, aspect),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_BORDER, "-background", "background", "Background",
STD_NORMAL_BACKGROUND, -1, Tk_Offset(LineGraphOptions, normalBg),
0, NULL, CACHE_DIRTY},
@@ -62,10 +62,10 @@ static Tk_OptionSpec optionSpecs[] = {
{TK_OPTION_SYNONYM, "-bm", NULL, NULL, NULL, -1, 0, 0, "-bottommargin", 0},
{TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth",
STD_BORDERWIDTH, -1, Tk_Offset(LineGraphOptions, borderWidth), 0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_PIXELS, "-bottommargin", "bottomMargin", "BottomMargin",
"0", -1, Tk_Offset(LineGraphOptions, bottomMargin.reqSize), 0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor",
"crosshair", -1, Tk_Offset(LineGraphOptions, cursor),
TK_OPTION_NULL_OK, NULL, 0},
@@ -73,7 +73,7 @@ static Tk_OptionSpec optionSpecs[] = {
{TK_OPTION_FONT, "-font", "font", "Font",
STD_FONT_MEDIUM, -1, Tk_Offset(LineGraphOptions, titleTextStyle.font),
0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_COLOR, "-foreground", "foreground", "Foreground",
STD_NORMAL_FOREGROUND, -1,
Tk_Offset(LineGraphOptions, titleTextStyle.color),
@@ -81,7 +81,7 @@ static Tk_OptionSpec optionSpecs[] = {
{TK_OPTION_SYNONYM, "-halo", NULL, NULL, NULL, -1, 0, 0, "-searchhalo", 0},
{TK_OPTION_PIXELS, "-height", "height", "Height",
"4i", -1, Tk_Offset(LineGraphOptions, reqHeight),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_COLOR, "-highlightbackground", "highlightBackground",
"HighlightBackground",
STD_NORMAL_BACKGROUND, -1, Tk_Offset(LineGraphOptions, highlightBgColor),
@@ -95,34 +95,34 @@ static Tk_OptionSpec optionSpecs[] = {
"2", -1, Tk_Offset(LineGraphOptions, highlightWidth), 0, NULL, 0},
{TK_OPTION_BOOLEAN, "-invertxy", "invertXY", "InvertXY",
"no", -1, Tk_Offset(LineGraphOptions, inverted), 0, NULL,
- RESET_WORLD | CACHE_DIRTY | RESET_AXES},
+ MAP_WORLD | CACHE_DIRTY | RESET_AXES},
{TK_OPTION_JUSTIFY, "-justify", "justify", "Justify",
"center", -1, Tk_Offset(LineGraphOptions, titleTextStyle.justify),
0, NULL, 0},
{TK_OPTION_PIXELS, "-leftmargin", "leftMargin", "Margin",
"0", -1, Tk_Offset(LineGraphOptions, leftMargin.reqSize), 0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_SYNONYM, "-lm", NULL, NULL, NULL, -1, 0, 0, "-leftmargin", 0},
{TK_OPTION_BORDER, "-plotbackground", "plotbackground", "PlotBackground",
STD_NORMAL_BACKGROUND, -1, Tk_Offset(LineGraphOptions, plotBg), 0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_PIXELS, "-plotborderwidth", "plotBorderWidth", "PlotBorderWidth",
STD_BORDERWIDTH, -1, Tk_Offset(LineGraphOptions, plotBW), 0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_PIXELS, "-plotpadx", "plotPadX", "PlotPad",
"0", -1, Tk_Offset(LineGraphOptions, xPad),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_PIXELS, "-plotpady", "plotPadY", "PlotPad",
"0", -1, Tk_Offset(LineGraphOptions, yPad),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_RELIEF, "-plotrelief", "plotRelief", "Relief",
"flat", -1, Tk_Offset(LineGraphOptions, plotRelief), 0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_RELIEF, "-relief", "relief", "Relief",
"flat", -1, Tk_Offset(LineGraphOptions, relief), 0, NULL, 0},
{TK_OPTION_PIXELS, "-rightmargin", "rightMargin", "Margin",
"0", -1, Tk_Offset(LineGraphOptions, rightMargin.reqSize), 0, NULL,
- RESET_WORLD | CACHE_DIRTY},
+ MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_SYNONYM, "-rm", NULL, NULL, NULL, -1, 0, 0, "-rightmargin", 0},
{TK_OPTION_PIXELS, "-searchhalo", "searchhalo", "SearchHalo",
"2m", -1, Tk_Offset(LineGraphOptions, search.halo), 0, NULL, 0},
@@ -139,20 +139,20 @@ static Tk_OptionSpec optionSpecs[] = {
TK_OPTION_NULL_OK, NULL, 0},
{TK_OPTION_STRING, "-title", "title", "Title",
NULL, -1, Tk_Offset(LineGraphOptions, title),
- TK_OPTION_NULL_OK, NULL, RESET_WORLD | CACHE_DIRTY},
+ TK_OPTION_NULL_OK, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_SYNONYM, "-tm", NULL, NULL, NULL, -1, 0, 0, "-topmargin", 0},
{TK_OPTION_PIXELS, "-topmargin", "topMargin", "TopMargin",
"0", -1, Tk_Offset(LineGraphOptions, topMargin.reqSize),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_PIXELS, "-width", "width", "Width",
"5i", -1, Tk_Offset(LineGraphOptions, reqWidth),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_PIXELS, "-plotwidth", "plotWidth", "PlotWidth",
"0", -1, Tk_Offset(LineGraphOptions, reqPlotWidth),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_PIXELS, "-plotheight", "plotHeight", "PlotHeight",
"0", -1, Tk_Offset(LineGraphOptions, reqPlotHeight),
- 0, NULL, RESET_WORLD | CACHE_DIRTY},
+ 0, NULL, MAP_WORLD | CACHE_DIRTY},
{TK_OPTION_END, NULL, NULL, NULL, NULL, -1, 0, 0, NULL, 0}
};
diff --git a/src/bltGraphOp.C b/src/bltGraphOp.C
index 0edbc81..29f5362 100644
--- a/src/bltGraphOp.C
+++ b/src/bltGraphOp.C
@@ -422,7 +422,6 @@ void GraphEventProc(ClientData clientData, XEvent* eventPtr)
if (eventPtr->type == Expose) {
if (eventPtr->xexpose.count == 0) {
- graphPtr->flags |= REDRAW_WORLD;
graphPtr->eventuallyRedraw();
}
@@ -433,7 +432,6 @@ void GraphEventProc(ClientData clientData, XEvent* eventPtr)
graphPtr->flags |= FOCUS;
else
graphPtr->flags &= ~FOCUS;
- graphPtr->flags |= REDRAW_WORLD;
graphPtr->eventuallyRedraw();
}
@@ -448,7 +446,7 @@ void GraphEventProc(ClientData clientData, XEvent* eventPtr)
}
}
else if (eventPtr->type == ConfigureNotify) {
- graphPtr->flags |= (MAP_WORLD | REDRAW_WORLD);
+ graphPtr->flags |= (MAP_WORLD);
graphPtr->eventuallyRedraw();
}
}