clean up widget code

3 files changed, 7 insertions, 23 deletions

diff --git a/tksao/panner/panner.h b/tksao/panner/panner.h
index 4d50dcc..0877068 100644
--- a/tksao/panner/panner.h
+++ b/tksao/panner/panner.h
@@ -36,9 +36,6 @@ class Panner : public Widget {
   void update();             // use existing pixmap, just update
   void invalidPixmap();      // new pixmap, then update
 
- protected:
-  virtual void clearPixmap() =0;  // clear pixmap
-
  private:
   int updatePixmap(const BBox&); // renders image/graphics into pixmap
   void renderBBox();
diff --git a/tksao/panner/pannertrue.C b/tksao/panner/pannertrue.C
index 9a46d6d..43c1395 100644
--- a/tksao/panner/pannertrue.C
+++ b/tksao/panner/pannertrue.C
@@ -42,6 +42,13 @@ static Tk_ConfigSpec pannerTrueColorSpecs[] = {
   {TK_CONFIG_STRING, (char*)"-times", NULL, NULL, "times",
    Tk_Offset(WidgetOptions, times), 0, NULL},
 
+  {TK_CONFIG_SYNONYM, "-bg", "background", NULL, NULL, 0, 0, NULL},
+  {TK_CONFIG_COLOR, "-background", "background", "Background", "white",
+   Tk_Offset(WidgetOptions, bgColor), 0, NULL},
+  {TK_CONFIG_SYNONYM, "-fg", "foreground", NULL, NULL, 0, 0, NULL},
+  {TK_CONFIG_COLOR, "-foreground", "foreground", "Foreground", "black",
+   Tk_Offset(WidgetOptions, fgColor), 0, NULL},
+
   {TK_CONFIG_END, NULL, NULL, NULL, NULL, 0, 0, NULL},
 };
 
@@ -103,20 +110,3 @@ PannerTrueColor::PannerTrueColor(Tcl_Interp* i, Tk_Canvas c, Tk_Item* item)
 {
   configSpecs = pannerTrueColorSpecs;  // panner configure options
 }
-
-void PannerTrueColor::clearPixmap()
-{
-  XImage* xmap = XGetImage(display, pixmap, 0, 0,
-			   options->width, options->height, 
-			   AllPlanes, ZPixmap);
-  if (!xmap) {
-    internalError("Panner: Unable to Create XImage");
-    return;
-  }
-
-  memset(xmap->data, 255, xmap->bytes_per_line * xmap->height);
-
-  TkPutImage(NULL, 0, display, pixmap, widgetGC, xmap, 
-	     0, 0, 0, 0, options->width, options->height);
-  XDestroyImage(xmap);
-}
diff --git a/tksao/panner/pannertrue.h b/tksao/panner/pannertrue.h
index 63154a4..09383cb 100644
--- a/tksao/panner/pannertrue.h
+++ b/tksao/panner/pannertrue.h
@@ -8,9 +8,6 @@
 #include "panner.h"
 
 class PannerTrueColor : public Panner {
-private:
-  void clearPixmap();
-
 public:
   PannerTrueColor(Tcl_Interp*, Tk_Canvas, Tk_Item*);
 };