Fixes for the conditional compilation of the atc code.

1 files changed, 12 insertions, 0 deletions

diff --git a/generic/tkZinc.c b/generic/tkZinc.c
index f184fb6..a5af97d 100644
--- a/generic/tkZinc.c
+++ b/generic/tkZinc.c
@@ -338,6 +338,7 @@ static Tk_ConfigSpec config_specs[] = {
    "600", Tk_Offset(ZnWInfo, insert_on_time), 0, NULL},
   {TK_CONFIG_PIXELS, "-insertwidth", "insertWidth", "InsertWidth",
    "2", Tk_Offset(ZnWInfo, text_info.insert_width), 0, NULL},
+#ifdef ATC
   {TK_CONFIG_CUSTOM, "-mapdistancesymbol", "mapDistanceSymbol", "MapDistanceSymbol",
    "AtcSymbol19", Tk_Offset(ZnWInfo, map_distance_symbol),
    TK_CONFIG_NULL_OK, &bitmapOption},
@@ -346,6 +347,7 @@ static Tk_ConfigSpec config_specs[] = {
    Tk_Offset(ZnWInfo, map_text_font), 0, NULL},
   {TK_CONFIG_INT, "-overlapmanager", "overlapManager", "OverlapManager", "1",
    Tk_Offset(ZnWInfo, om_group_id), 0, NULL},
+#endif
   {TK_CONFIG_INT, "-pickaperture", "pickAperture", "PickAperture",
    "1", Tk_Offset(ZnWInfo, pick_aperture), 0, NULL},
   {TK_CONFIG_CUSTOM, "-relief", "relief", "Relief",
@@ -358,18 +360,22 @@ static Tk_ConfigSpec config_specs[] = {
    "", Tk_Offset(ZnWInfo, region), TK_CONFIG_NULL_OK, NULL},
   {TK_CONFIG_CUSTOM, "-selectbackground", "selectBackground", "Foreground",
    "#a0a0a0", Tk_Offset(ZnWInfo, text_info.sel_color), 0, &gradientOption},
+#ifdef ATC
   {TK_CONFIG_DOUBLE, "-speedvectorlength", "speedVectorLength",
    "SpeedVectorLength", "3", Tk_Offset(ZnWInfo, speed_vector_length), 0, NULL},
+#endif
   {TK_CONFIG_STRING, "-takefocus", "takeFocus", "TakeFocus",
    NULL, Tk_Offset(ZnWInfo, take_focus), TK_CONFIG_NULL_OK, NULL},
   {TK_CONFIG_CUSTOM, "-tile", "tile", "Tile",
    "", Tk_Offset(ZnWInfo, tile), 0, &imageOption},
+#ifdef ATC
   {TK_CONFIG_INT, "-trackvisiblehistorysize", "trackVisibleHistorySize", "TrackVisibleHistorySize",
    "6", Tk_Offset(ZnWInfo, track_visible_history_size), 0, NULL},
   {TK_CONFIG_INT, "-trackmanagedhistorysize", "trackManagedHistorySize",
    "TrackManagedHistorySize", "6", Tk_Offset(ZnWInfo, track_managed_history_size), 0, NULL},
   {TK_CONFIG_CUSTOM, "-tracksymbol", "trackSymbol", "TrackSymbol",
    "AtcSymbol15", Tk_Offset(ZnWInfo, track_symbol), TK_CONFIG_NULL_OK, &bitmapOption},
+#endif
   {TK_CONFIG_PIXELS, "-width", "width", "Width",
    "10c", Tk_Offset(ZnWInfo, opt_width), 0, NULL},
   {TK_CONFIG_CALLBACK, "-xscrollcommand", "xScrollCommand", "ScrollCommand",
@@ -6538,6 +6544,7 @@ Configure(Tcl_Interp		*interp,/* Used for error reporting. */
     }
     wi->font_tfi = ZnGetTexFont(wi, wi->font);
   }
+#ifdef ATC
   if (CONFIG_PROBE(MAP_TEXT_FONT_SPEC) || !wi->map_font_tfi) {
     if (wi->map_font_tfi) {
       ZnFreeTexFont(wi->map_font_tfi);
@@ -6545,6 +6552,7 @@ Configure(Tcl_Interp		*interp,/* Used for error reporting. */
     wi->map_font_tfi = ZnGetTexFont(wi, wi->map_text_font);
   }
 #endif
+#endif
 
   /*
    * Maintain the pick aperture within meaningful bounds.
@@ -6831,6 +6839,7 @@ Configure(Tcl_Interp		*interp,/* Used for error reporting. */
       }
       wi->font_tfi = ZnGetTexFont(wi, wi->font);
     }
+#ifdef ATC
     if ((mask & CONFIG_MAP_FONT) || !wi->map_font_tfi) {
       if (wi->map_font_tfi) {
 	ZnFreeTexFont(wi->map_font_tfi);
@@ -6838,6 +6847,7 @@ Configure(Tcl_Interp		*interp,/* Used for error reporting. */
       wi->map_font_tfi = ZnGetTexFont(wi, wi->map_text_font);
     }
 #endif
+#endif
 
     if ((mask & CONFIG_TILE) || init) {
       char *tile_name;
@@ -8124,10 +8134,12 @@ Destroy(char *mem_ptr)		/* Info about the widget. */
     ZnFreeTexFont(wi->font_tfi);
     wi->font_tfi = NULL;
   }
+#ifdef ATC
   if (wi->map_font_tfi) {
     ZnFreeTexFont(wi->map_font_tfi);
     wi->map_font_tfi = NULL;
   }
+#endif
   /*
    * Remove the widget from the context list and
    * free the context if no more widgets are active.