*** empty log message ***

1 files changed, 22 insertions, 43 deletions

diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C
index d6c3659..94d8ebd 100644
--- a/src/bltGrLegd.C
+++ b/src/bltGrLegd.C
@@ -350,8 +350,7 @@ static Tk_OptionSpec optionSpecs[] = {
   {TK_OPTION_PIXELS, "-activeborderwidth", "activeBorderWidth", 
    "ActiveBorderWidth", 
    DEF_LEGEND_BORDERWIDTH, 
-   -1, Tk_Offset(Legend, entryBW), 0, NULL, 
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, entryBW), 0, NULL, 0}, 
   {TK_OPTION_COLOR, "-activeforeground", "activeForeground", "ActiveForeground",
    DEF_LEGEND_ACTIVEFOREGROUND,
    -1, Tk_Offset(Legend, activeFgColor), 0, NULL, 0},
@@ -360,24 +359,20 @@ static Tk_OptionSpec optionSpecs[] = {
    -1, Tk_Offset(Legend, activeRelief), 0, NULL, 0},
   {TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor", 
    DEF_LEGEND_ANCHOR, 
-   -1, Tk_Offset(Legend, anchor), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, anchor), 0, NULL, 0},
   {TK_OPTION_SYNONYM, "-bg", NULL, NULL, NULL,
    -1, 0, 0, "-background", 0},
   {TK_OPTION_BORDER, "-background", "background", "Background",
    DEF_LEGEND_BACKGROUND, 
-   -1, Tk_Offset(Legend, normalBg), TK_OPTION_NULL_OK, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, normalBg), TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth",
    DEF_LEGEND_BORDERWIDTH, 
-   -1, Tk_Offset(Legend, borderWidth), 0, NULL, 
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, borderWidth), 0, NULL, 0}, 
   {TK_OPTION_SYNONYM, "-bd", NULL, NULL, NULL,
    -1, 0, 0, "-borderwidth", 0},
   {TK_OPTION_INT, "-columns", "columns", "columns",
    DEF_LEGEND_COLUMNS, 
-   -1, Tk_Offset(Legend, reqColumns), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, reqColumns), 0, NULL, 0},
   {TK_OPTION_BOOLEAN, "-exportselection", "exportSelection",
    "ExportSelection", 
    DEF_LEGEND_EXPORTSELECTION, 
@@ -390,26 +385,21 @@ static Tk_OptionSpec optionSpecs[] = {
    -1, Tk_Offset(Legend, focusColor), 0, NULL, 0},
   {TK_OPTION_FONT, "-font", "font", "Font", 
    DEF_LEGEND_FONT, 
-   -1, Tk_Offset(Legend, style.font), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, style.font), 0, NULL, 0},
   {TK_OPTION_SYNONYM, "-fg", NULL, NULL, NULL,
    -1, 0, 0, "-foreground", 0},
   {TK_OPTION_COLOR, "-foreground", "foreground", "Foreground",
    DEF_LEGEND_FOREGROUND, 
-   -1, Tk_Offset(Legend, fgColor), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, fgColor), 0, NULL, 0},
   {TK_OPTION_BOOLEAN, "-hide", "hide", "Hide", 
    DEF_LEGEND_HIDE, 
-   -1, Tk_Offset(Legend, hide), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, hide), 0, NULL, 0},
   {TK_OPTION_PIXELS, "-ipadx", "iPadX", "Pad", 
    DEF_LEGEND_IPADX, 
-   -1, Tk_Offset(Legend, ixPad), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, ixPad), 0, NULL, 0},
   {TK_OPTION_PIXELS, "-ipady", "iPadY", "Pad", 
    DEF_LEGEND_IPADY, 
-   -1, Tk_Offset(Legend, iyPad), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, iyPad), 0, NULL, 0},
   {TK_OPTION_BORDER, "-nofocusselectbackground", "noFocusSelectBackground", 
    "NoFocusSelectBackground", 
    DEF_LEGEND_SELECTBACKGROUND, 
@@ -420,28 +410,22 @@ static Tk_OptionSpec optionSpecs[] = {
    -1, Tk_Offset(Legend, selOutFocusFgColor), 0, NULL, 0},
   {TK_OPTION_PIXELS, "-padx", "padX", "Pad", 
    DEF_LEGEND_PADX, 
-   -1, Tk_Offset(Legend, xPad), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, xPad), 0, NULL, 0},
   {TK_OPTION_PIXELS, "-pady", "padY", "Pad", 
    DEF_LEGEND_PADY, 
-   -1, Tk_Offset(Legend, yPad), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, yPad), 0, NULL, 0},
   {TK_OPTION_CUSTOM, "-position", "position", "Position", 
    DEF_LEGEND_POSITION, 
-   -1, 0, 0, &positionObjOption,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, 0, 0, &positionObjOption, 0},
   {TK_OPTION_BOOLEAN, "-raised", "raised", "Raised", 
    DEF_LEGEND_RAISED, 
-   -1, Tk_Offset(Legend, raised), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, raised), 0, NULL, 0},
   {TK_OPTION_RELIEF, "-relief", "relief", "Relief", 
    DEF_LEGEND_RELIEF, 
-   -1, Tk_Offset(Legend, relief), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, relief), 0, NULL, 0},
   {TK_OPTION_INT, "-rows", "rows", "rows", 
    DEF_LEGEND_ROWS, 
-   -1, Tk_Offset(Legend, reqRows), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, reqRows), 0, NULL, 0},
   {TK_OPTION_BORDER, "-selectbackground", "selectBackground", 
    "SelectBackground", 
    DEF_LEGEND_SELECTBACKGROUND, 
@@ -449,8 +433,7 @@ static Tk_OptionSpec optionSpecs[] = {
   {TK_OPTION_PIXELS, "-selectborderwidth", "selectBorderWidth", 
    "SelectBorderWidth", 
    DEF_LEGEND_SELECTBORDERWIDTH, 
-   -1, Tk_Offset(Legend, selBW), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, selBW), 0, NULL, 0},
   {TK_OPTION_STRING, "-selectcommand", "selectCommand", "SelectCommand",
    DEF_LEGEND_SELECTCOMMAND,
    -1, Tk_Offset(Legend, selectCmd), TK_OPTION_NULL_OK, NULL, 0},
@@ -468,20 +451,16 @@ static Tk_OptionSpec optionSpecs[] = {
    -1, Tk_Offset(Legend, takeFocus), TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_STRING, "-title", "title", "Title", 
    DEF_LEGEND_TITLE, 
-   -1, Tk_Offset(Legend, title), TK_OPTION_NULL_OK, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, title), TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_ANCHOR, "-titleanchor", "titleAnchor", "TitleAnchor", 
    DEF_LEGEND_TITLEANCHOR, 
-   -1, Tk_Offset(Legend, titleStyle.anchor), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, titleStyle.anchor), 0, NULL, 0},
   {TK_OPTION_COLOR, "-titlecolor", "titleColor", "TitleColor",
    DEF_LEGEND_TITLECOLOR, 
-   -1, Tk_Offset(Legend, titleStyle.color), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, titleStyle.color), 0, NULL, 0},
   {TK_OPTION_FONT, "-titlefont", "titleFont", "TitleFont",
    DEF_LEGEND_TITLEFONT, 
-   -1, Tk_Offset(Legend, titleStyle.font), 0, NULL,
-   RESET_WORLD | CACHE_DIRTY},
+   -1, Tk_Offset(Legend, titleStyle.font), 0, NULL, 0},
   {TK_OPTION_END, NULL, NULL, NULL, NULL, -1, 0, 0, NULL, 0}
 };
 
@@ -617,7 +596,7 @@ static int LegendObjConfigure(Tcl_Interp *interp, Graph* graphPtr,
       Tk_RestoreSavedOptions(&savedOptions);
     }
 
-    graphPtr->flags |= mask;
+    graphPtr->flags |= (RESET_WORLD | CACHE_DIRTY);
     ConfigureLegend(graphPtr);
     Blt_EventuallyRedrawGraph(graphPtr);
     break;