*** empty log message ***

1 files changed, 20 insertions, 20 deletions

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}
 };