diff options
author | joye <joye> | 2015-06-02 19:03:13 (GMT) |
---|---|---|
committer | joye <joye> | 2015-06-02 19:03:13 (GMT) |
commit | 1f61ad158fe8e5910da6579ff604589923a1fc1e (patch) | |
tree | 06d2904cf470d04e2c1847310b284c0e6b7cd9e4 /src | |
parent | ff0790a09b7fc83dca7f83ed697b8a5b12d31fe1 (diff) | |
download | blt-1f61ad158fe8e5910da6579ff604589923a1fc1e.zip blt-1f61ad158fe8e5910da6579ff604589923a1fc1e.tar.gz blt-1f61ad158fe8e5910da6579ff604589923a1fc1e.tar.bz2 |
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r-- | src/bltGrAxis.C | 12 | ||||
-rw-r--r-- | src/bltGrElemBar.C | 24 | ||||
-rw-r--r-- | src/bltGrElemLine.C | 6 | ||||
-rw-r--r-- | src/bltGrLegd.C | 9 | ||||
-rw-r--r-- | src/bltGrMarkerText.C | 12 | ||||
-rw-r--r-- | src/bltGrPenBar.C | 18 | ||||
-rw-r--r-- | src/bltGraphBar.C | 24 | ||||
-rw-r--r-- | src/bltGraphLine.C | 24 |
8 files changed, 86 insertions, 43 deletions
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C index ccf74e8..db48dc7 100644 --- a/src/bltGrAxis.C +++ b/src/bltGrAxis.C @@ -68,11 +68,13 @@ static Tk_OptionSpec optionSpecs[] = { "0", -1, Tk_Offset(AxisOptions, windowSize), 0, NULL, RESET}, {TK_OPTION_BORDER, "-background", "background", "Background", NULL, -1, Tk_Offset(AxisOptions, normalBg), TK_OPTION_NULL_OK, NULL, CACHE}, - {TK_OPTION_SYNONYM, "-bg", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-background", 0}, + {TK_OPTION_SYNONYM, "-bg", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-background", 0}, {TK_OPTION_CUSTOM, "-bindtags", "bindTags", "BindTags", "all", -1, Tk_Offset(AxisOptions, tags), TK_OPTION_NULL_OK, &listObjOption, 0}, - {TK_OPTION_SYNONYM, "-bd", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-borderwidth", 0}, + {TK_OPTION_SYNONYM, "-bd", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-borderwidth", 0}, {TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth", STD_BORDERWIDTH, -1, Tk_Offset(AxisOptions, borderWidth), 0, NULL, LAYOUT}, {TK_OPTION_BOOLEAN, "-checklimits", "checkLimits", "CheckLimits", @@ -86,8 +88,10 @@ static Tk_OptionSpec optionSpecs[] = { "no", -1, Tk_Offset(AxisOptions, descending), 0, NULL, RESET}, {TK_OPTION_BOOLEAN, "-exterior", "exterior", "exterior", "yes", -1, Tk_Offset(AxisOptions, exterior), 0, NULL, LAYOUT}, - {TK_OPTION_SYNONYM, "-fg", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-color", 0}, - {TK_OPTION_SYNONYM, "-foreground", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-color", 0}, + {TK_OPTION_SYNONYM, "-fg", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-color", 0}, + {TK_OPTION_SYNONYM, "-foreground", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-color", 0}, {TK_OPTION_BOOLEAN, "-grid", "grid", "Grid", "yes", -1, Tk_Offset(AxisOptions, showGrid), 0, NULL, CACHE}, {TK_OPTION_COLOR, "-gridcolor", "gridColor", "GridColor", diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C index 4ce3fcd..78d97ff 100644 --- a/src/bltGrElemBar.C +++ b/src/bltGrElemBar.C @@ -65,11 +65,14 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_CUSTOM, "-activepen", "activePen", "ActivePen", "active", -1, Tk_Offset(BarElementOptions, activePenPtr), TK_OPTION_NULL_OK, &penObjOption, LAYOUT}, - {TK_OPTION_SYNONYM, "-background", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-color", 0}, + {TK_OPTION_SYNONYM, "-background", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-color", 0}, {TK_OPTION_DOUBLE, "-barwidth", "barWidth", "BarWidth", "0", -1, Tk_Offset(BarElementOptions, barWidth), 0, NULL, LAYOUT}, - {TK_OPTION_SYNONYM, "-bd", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-borderwidth", 0}, - {TK_OPTION_SYNONYM, "-bg", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-color", 0}, + {TK_OPTION_SYNONYM, "-bd", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-borderwidth", 0}, + {TK_OPTION_SYNONYM, "-bg", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-color", 0}, {TK_OPTION_CUSTOM, "-bindtags", "bindTags", "BindTags", "all", -1, Tk_Offset(BarElementOptions, tags), TK_OPTION_NULL_OK, &listObjOption, 0}, @@ -91,9 +94,12 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_PIXELS, "-errorbarcap", "errorBarCap", "ErrorBarCap", "0", -1, Tk_Offset(BarElementOptions, builtinPen.errorBarCapWidth), 0, NULL, LAYOUT}, - {TK_OPTION_SYNONYM, "-fg", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-outline", 0}, - {TK_OPTION_SYNONYM, "-fill", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-color", 0}, - {TK_OPTION_SYNONYM, "-foreground", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-outline", 0}, + {TK_OPTION_SYNONYM, "-fg", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-outline", 0}, + {TK_OPTION_SYNONYM, "-fill", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-color", 0}, + {TK_OPTION_SYNONYM, "-foreground", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-outline", 0}, {TK_OPTION_BOOLEAN, "-hide", "hide", "Hide", "no", -1, Tk_Offset(BarElementOptions, hide), 0, NULL, LAYOUT}, {TK_OPTION_STRING, "-label", "label", "Label", @@ -144,7 +150,8 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_CUSTOM, "-weights", "weights", "Weights", NULL, -1, Tk_Offset(BarElementOptions, w), TK_OPTION_NULL_OK, &valuesObjOption, RESET}, - {TK_OPTION_SYNONYM, "-x", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-xdata", 0}, + {TK_OPTION_SYNONYM, "-x", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-xdata", 0}, {TK_OPTION_CUSTOM, "-xdata", "xData", "XData", NULL, -1, Tk_Offset(BarElementOptions, coords.x), TK_OPTION_NULL_OK, &valuesObjOption, RESET}, @@ -157,7 +164,8 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_CUSTOM, "-xlow", "xLow", "XLow", NULL, -1, Tk_Offset(BarElementOptions, xLow), TK_OPTION_NULL_OK, &valuesObjOption, RESET}, - {TK_OPTION_SYNONYM, "-y", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-ydata", 0}, + {TK_OPTION_SYNONYM, "-y", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-ydata", 0}, {TK_OPTION_CUSTOM, "-ydata", "yData", "YData", NULL, -1, Tk_Offset(BarElementOptions, coords.y), TK_OPTION_NULL_OK, &valuesObjOption, RESET}, diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index dc7d7f4..46558d0 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -187,7 +187,8 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_CUSTOM, "-weights", "weights", "Weights", NULL, -1, Tk_Offset(LineElementOptions, w), TK_OPTION_NULL_OK, &valuesObjOption, RESET}, - {TK_OPTION_SYNONYM, "-x", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-xdata", 0}, + {TK_OPTION_SYNONYM, "-x", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-xdata", 0}, {TK_OPTION_CUSTOM, "-xdata", "xData", "XData", NULL, -1, Tk_Offset(LineElementOptions, coords.x), TK_OPTION_NULL_OK, &valuesObjOption, RESET}, @@ -200,7 +201,8 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_CUSTOM, "-xlow", "xLow", "XLow", NULL, -1, Tk_Offset(LineElementOptions, xLow), TK_OPTION_NULL_OK, &valuesObjOption, RESET}, - {TK_OPTION_SYNONYM, "-y", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-ydata", 0}, + {TK_OPTION_SYNONYM, "-y", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-ydata", 0}, {TK_OPTION_CUSTOM, "-ydata", "yData", "YData", NULL, -1, Tk_Offset(LineElementOptions, coords.y), TK_OPTION_NULL_OK, &valuesObjOption, RESET}, diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C index cc4974c..ad5ce08 100644 --- a/src/bltGrLegd.C +++ b/src/bltGrLegd.C @@ -72,14 +72,16 @@ static Tk_OptionSpec optionSpecs[] = { "flat", -1, Tk_Offset(LegendOptions, activeRelief), 0, NULL, LAYOUT}, {TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor", "n", -1, Tk_Offset(LegendOptions, anchor), 0, NULL, LAYOUT}, - {TK_OPTION_SYNONYM, "-bg", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-background", 0}, + {TK_OPTION_SYNONYM, "-bg", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-background", 0}, {TK_OPTION_BORDER, "-background", "background", "Background", NULL, -1, Tk_Offset(LegendOptions, normalBg), TK_OPTION_NULL_OK, NULL, CACHE}, {TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth", STD_BORDERWIDTH, -1, Tk_Offset(LegendOptions, borderWidth), 0, NULL, LAYOUT}, - {TK_OPTION_SYNONYM, "-bd", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-borderwidth", 0}, + {TK_OPTION_SYNONYM, "-bd", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-borderwidth", 0}, {TK_OPTION_INT, "-columns", "columns", "columns", "0", -1, Tk_Offset(LegendOptions, reqColumns), 0, NULL, LAYOUT}, {TK_OPTION_BOOLEAN, "-exportselection", "exportSelection", "ExportSelection", @@ -92,7 +94,8 @@ static Tk_OptionSpec optionSpecs[] = { 0, NULL, CACHE}, {TK_OPTION_FONT, "-font", "font", "Font", STD_FONT_SMALL, -1, Tk_Offset(LegendOptions, style.font), 0, NULL, LAYOUT}, - {TK_OPTION_SYNONYM, "-fg", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-foreground", 0}, + {TK_OPTION_SYNONYM, "-fg", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-foreground", 0}, {TK_OPTION_COLOR, "-foreground", "foreground", "Foreground", STD_NORMAL_FOREGROUND, -1, Tk_Offset(LegendOptions, fgColor), 0, NULL, CACHE}, diff --git a/src/bltGrMarkerText.C b/src/bltGrMarkerText.C index d5e678f..5c8db06 100644 --- a/src/bltGrMarkerText.C +++ b/src/bltGrMarkerText.C @@ -46,7 +46,8 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_COLOR, "-background", "background", "Background", NULL, -1, Tk_Offset(TextMarkerOptions, fillColor), TK_OPTION_NULL_OK, NULL, 0}, - {TK_OPTION_SYNONYM, "-bg", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-background", 0}, + {TK_OPTION_SYNONYM, "-bg", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-background", 0}, {TK_OPTION_CUSTOM, "-bindtags", "bindTags", "BindTags", "Text all", -1, Tk_Offset(TextMarkerOptions, tags), TK_OPTION_NULL_OK, &listObjOption, 0}, @@ -56,8 +57,10 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_STRING, "-element", "element", "Element", NULL, -1, Tk_Offset(TextMarkerOptions, elemName), TK_OPTION_NULL_OK, NULL, 0}, - {TK_OPTION_SYNONYM, "-fg", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-foreground", 0}, - {TK_OPTION_SYNONYM, "-fill", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-background", 0}, + {TK_OPTION_SYNONYM, "-fg", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-foreground", 0}, + {TK_OPTION_SYNONYM, "-fill", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-background", 0}, {TK_OPTION_FONT, "-font", "font", "Font", STD_FONT_NORMAL, -1, Tk_Offset(TextMarkerOptions, style.font), 0, NULL, 0}, {TK_OPTION_COLOR, "-foreground", "foreground", "Foreground", @@ -71,7 +74,8 @@ static Tk_OptionSpec optionSpecs[] = { "x", -1, Tk_Offset(TextMarkerOptions, xAxis), 0, &xAxisObjOption, 0}, {TK_OPTION_CUSTOM, "-mapy", "mapY", "MapY", "y", -1, Tk_Offset(TextMarkerOptions, yAxis), 0, &yAxisObjOption, 0}, - {TK_OPTION_SYNONYM, "-outline", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-foreground", 0}, + {TK_OPTION_SYNONYM, "-outline", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-foreground", 0}, {TK_OPTION_DOUBLE, "-rotate", "rotate", "Rotate", "0", -1, Tk_Offset(TextMarkerOptions, style.angle), 0, NULL, 0}, {TK_OPTION_STRING, "-text", "text", "Text", diff --git a/src/bltGrPenBar.C b/src/bltGrPenBar.C index 2b1ba7f..090bdf8 100644 --- a/src/bltGrPenBar.C +++ b/src/bltGrPenBar.C @@ -37,9 +37,12 @@ using namespace Blt; static Tk_OptionSpec barPenOptionSpecs[] = { - {TK_OPTION_SYNONYM, "-background", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-color", 0}, - {TK_OPTION_SYNONYM, "-bd", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-borderwidth", 0}, - {TK_OPTION_SYNONYM, "-bg", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-color", 0}, + {TK_OPTION_SYNONYM, "-background", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-color", 0}, + {TK_OPTION_SYNONYM, "-bd", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-borderwidth", 0}, + {TK_OPTION_SYNONYM, "-bg", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-color", 0}, {TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth", STD_BORDERWIDTH, -1, Tk_Offset(BarPenOptions, borderWidth), 0, NULL, CACHE}, {TK_OPTION_BORDER, "-color", "color", "Color", @@ -51,9 +54,12 @@ static Tk_OptionSpec barPenOptionSpecs[] = { "1", -1, Tk_Offset(BarPenOptions, errorBarLineWidth), 0, NULL, CACHE}, {TK_OPTION_PIXELS, "-errorbarcap", "errorBarCap", "ErrorBarCap", "0", -1, Tk_Offset(BarPenOptions, errorBarCapWidth), 0, NULL, LAYOUT}, - {TK_OPTION_SYNONYM, "-fg", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-outline", 0}, - {TK_OPTION_SYNONYM, "-fill", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-color", 0}, - {TK_OPTION_SYNONYM, "-foreground", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-outline", 0}, + {TK_OPTION_SYNONYM, "-fg", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-outline", 0}, + {TK_OPTION_SYNONYM, "-fill", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-color", 0}, + {TK_OPTION_SYNONYM, "-foreground", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-outline", 0}, {TK_OPTION_COLOR, "-outline", "outline", "Outline", NULL, -1, Tk_Offset(BarPenOptions, outlineColor), TK_OPTION_NULL_OK, NULL, CACHE}, diff --git a/src/bltGraphBar.C b/src/bltGraphBar.C index 27c48a5..8443cab 100644 --- a/src/bltGraphBar.C +++ b/src/bltGraphBar.C @@ -80,9 +80,12 @@ static Tk_OptionSpec optionSpecs[] = { ".9", -1, Tk_Offset(BarGraphOptions, barWidth), 0, NULL, RESET}, {TK_OPTION_DOUBLE, "-baseline", "baseline", "Baseline", "0", -1, Tk_Offset(BarGraphOptions, baseline), 0, NULL, RESET}, - {TK_OPTION_SYNONYM, "-bd", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-borderwidth", 0}, - {TK_OPTION_SYNONYM, "-bg", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-background", 0}, - {TK_OPTION_SYNONYM, "-bm", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-bottommargin", 0}, + {TK_OPTION_SYNONYM, "-bd", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-borderwidth", 0}, + {TK_OPTION_SYNONYM, "-bg", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-background", 0}, + {TK_OPTION_SYNONYM, "-bm", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-bottommargin", 0}, {TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth", STD_BORDERWIDTH, -1, Tk_Offset(BarGraphOptions, borderWidth), 0, NULL, RESET}, @@ -91,14 +94,16 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor", "crosshair", -1, Tk_Offset(BarGraphOptions, cursor), TK_OPTION_NULL_OK, NULL, 0}, - {TK_OPTION_SYNONYM, "-fg", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-foreground", 0}, + {TK_OPTION_SYNONYM, "-fg", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-foreground", 0}, {TK_OPTION_FONT, "-font", "font", "Font", STD_FONT_MEDIUM, -1, Tk_Offset(BarGraphOptions, titleTextStyle.font), 0, NULL, RESET}, {TK_OPTION_COLOR, "-foreground", "foreground", "Foreground", STD_NORMAL_FOREGROUND, -1, Tk_Offset(BarGraphOptions, titleTextStyle.color), 0, NULL, CACHE}, - {TK_OPTION_SYNONYM, "-halo", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-searchhalo", 0}, + {TK_OPTION_SYNONYM, "-halo", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-searchhalo", 0}, {TK_OPTION_PIXELS, "-height", "height", "Height", "4i", -1, Tk_Offset(BarGraphOptions, reqHeight), 0, NULL, RESET}, {TK_OPTION_COLOR, "-highlightbackground", "highlightBackground", @@ -118,7 +123,8 @@ static Tk_OptionSpec optionSpecs[] = { 0, NULL, RESET}, {TK_OPTION_PIXELS, "-leftmargin", "leftMargin", "Margin", "0", -1, Tk_Offset(BarGraphOptions, leftMargin.reqSize), 0, NULL, RESET}, - {TK_OPTION_SYNONYM, "-lm", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-leftmargin", 0}, + {TK_OPTION_SYNONYM, "-lm", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-leftmargin", 0}, {TK_OPTION_BORDER, "-plotbackground", "plotbackground", "PlotBackground", STD_NORMAL_BACKGROUND, -1, Tk_Offset(BarGraphOptions, plotBg), 0, NULL, CACHE}, @@ -134,7 +140,8 @@ static Tk_OptionSpec optionSpecs[] = { "flat", -1, Tk_Offset(BarGraphOptions, relief), 0, NULL, RESET}, {TK_OPTION_PIXELS, "-rightmargin", "rightMargin", "Margin", "0", -1, Tk_Offset(BarGraphOptions, rightMargin.reqSize), 0, NULL, RESET}, - {TK_OPTION_SYNONYM, "-rm", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-rightmargin", 0}, + {TK_OPTION_SYNONYM, "-rm", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-rightmargin", 0}, {TK_OPTION_PIXELS, "-searchhalo", "searchhalo", "SearchHalo", "2m", -1, Tk_Offset(BarGraphOptions, search.halo), 0, NULL, 0}, {TK_OPTION_STRING_TABLE, "-searchmode", "searchMode", "SearchMode", @@ -150,7 +157,8 @@ static Tk_OptionSpec optionSpecs[] = { TK_OPTION_NULL_OK, NULL, 0}, {TK_OPTION_STRING, "-title", "title", "Title", NULL, -1, Tk_Offset(BarGraphOptions, title), TK_OPTION_NULL_OK, NULL, RESET}, - {TK_OPTION_SYNONYM, "-tm", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-topmargin", 0}, + {TK_OPTION_SYNONYM, "-tm", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-topmargin", 0}, {TK_OPTION_PIXELS, "-topmargin", "topMargin", "TopMargin", "0", -1, Tk_Offset(BarGraphOptions, topMargin.reqSize), 0, NULL, RESET}, {TK_OPTION_PIXELS, "-width", "width", "Width", diff --git a/src/bltGraphLine.C b/src/bltGraphLine.C index ff4ea2b..4cbb02d 100644 --- a/src/bltGraphLine.C +++ b/src/bltGraphLine.C @@ -56,9 +56,12 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_BORDER, "-background", "background", "Background", STD_NORMAL_BACKGROUND, -1, Tk_Offset(LineGraphOptions, normalBg), 0, NULL, CACHE}, - {TK_OPTION_SYNONYM, "-bd", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-borderwidth", 0}, - {TK_OPTION_SYNONYM, "-bg", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-background", 0}, - {TK_OPTION_SYNONYM, "-bm", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-bottommargin", 0}, + {TK_OPTION_SYNONYM, "-bd", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-borderwidth", 0}, + {TK_OPTION_SYNONYM, "-bg", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-background", 0}, + {TK_OPTION_SYNONYM, "-bm", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-bottommargin", 0}, {TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth", STD_BORDERWIDTH, -1, Tk_Offset(LineGraphOptions, borderWidth), 0, NULL, RESET}, @@ -67,14 +70,16 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor", "crosshair", -1, Tk_Offset(LineGraphOptions, cursor), TK_OPTION_NULL_OK, NULL, 0}, - {TK_OPTION_SYNONYM, "-fg", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-foreground", 0}, + {TK_OPTION_SYNONYM, "-fg", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-foreground", 0}, {TK_OPTION_FONT, "-font", "font", "Font", STD_FONT_MEDIUM, -1, Tk_Offset(LineGraphOptions, titleTextStyle.font), 0, NULL, RESET}, {TK_OPTION_COLOR, "-foreground", "foreground", "Foreground", STD_NORMAL_FOREGROUND, -1, Tk_Offset(LineGraphOptions, titleTextStyle.color), 0, NULL, CACHE}, - {TK_OPTION_SYNONYM, "-halo", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-searchhalo", 0}, + {TK_OPTION_SYNONYM, "-halo", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-searchhalo", 0}, {TK_OPTION_PIXELS, "-height", "height", "Height", "4i", -1, Tk_Offset(LineGraphOptions, reqHeight), 0, NULL, RESET}, {TK_OPTION_COLOR, "-highlightbackground", "highlightBackground", @@ -94,7 +99,8 @@ static Tk_OptionSpec optionSpecs[] = { 0, NULL, RESET}, {TK_OPTION_PIXELS, "-leftmargin", "leftMargin", "Margin", "0", -1, Tk_Offset(LineGraphOptions, leftMargin.reqSize), 0, NULL, RESET}, - {TK_OPTION_SYNONYM, "-lm", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-leftmargin", 0}, + {TK_OPTION_SYNONYM, "-lm", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-leftmargin", 0}, {TK_OPTION_BORDER, "-plotbackground", "plotbackground", "PlotBackground", STD_NORMAL_BACKGROUND, -1, Tk_Offset(LineGraphOptions, plotBg), 0, NULL, CACHE}, @@ -110,7 +116,8 @@ static Tk_OptionSpec optionSpecs[] = { "flat", -1, Tk_Offset(LineGraphOptions, relief), 0, NULL, RESET}, {TK_OPTION_PIXELS, "-rightmargin", "rightMargin", "Margin", "0", -1, Tk_Offset(LineGraphOptions, rightMargin.reqSize), 0, NULL, RESET}, - {TK_OPTION_SYNONYM, "-rm", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-rightmargin", 0}, + {TK_OPTION_SYNONYM, "-rm", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-rightmargin", 0}, {TK_OPTION_PIXELS, "-searchhalo", "searchhalo", "SearchHalo", "2m", -1, Tk_Offset(LineGraphOptions, search.halo), 0, NULL, 0}, {TK_OPTION_STRING_TABLE, "-searchmode", "searchMode", "SearchMode", @@ -127,7 +134,8 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_STRING, "-title", "title", "Title", NULL, -1, Tk_Offset(LineGraphOptions, title), TK_OPTION_NULL_OK, NULL, RESET}, - {TK_OPTION_SYNONYM, "-tm", NULL, NULL, NULL, 0, -1, 0, (ClientData)"-topmargin", 0}, + {TK_OPTION_SYNONYM, "-tm", NULL, NULL, + NULL, 0, -1, 0, (ClientData)"-topmargin", 0}, {TK_OPTION_PIXELS, "-topmargin", "topMargin", "TopMargin", "0", -1, Tk_Offset(LineGraphOptions, topMargin.reqSize), 0, NULL, RESET}, {TK_OPTION_PIXELS, "-width", "width", "Width", |