Rename all XBM format files to be called *.xbm instead of *.bmp [Bug 733835]

27 files changed, 63 insertions, 52 deletions

diff --git a/ChangeLog b/ChangeLog
index d2cb414..cede6f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-10-19  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
+
+	* tests/canvPsImg.tcl, tests/canvPsBmap.tcl: 
+	* generic/tkBitmap.c, bitmaps/*.bmp:
+	* library/demos/icon.tcl, library/demos/items.tcl: 
+	* library/demos/label.tcl, library/demos/menu.tcl: 
+	* library/demos/ruler.tcl, library/demos/twind.tcl: 
+	* library/demos/images/*.bmp: Renamed all X bitmap files files to
+	have an .xbm extension so Windows users won't get confused when
+	wandering around the Tcl source tree. [Bug 733835]
+
 2004-10-11  Miguel Baņon <bagnonm@users.sourceforge.net>
 
 	* library/msgs/sv.msg: Swedish message catalog from Mats Bengtsson.
diff --git a/bitmaps/error.bmp b/bitmaps/error.xbm
index 5a1331f..5a1331f 100644
--- a/bitmaps/error.bmp
+++ b/bitmaps/error.xbm
diff --git a/bitmaps/gray12.bmp b/bitmaps/gray12.xbm
index a0eafa1..a0eafa1 100644
--- a/bitmaps/gray12.bmp
+++ b/bitmaps/gray12.xbm
diff --git a/bitmaps/gray25.bmp b/bitmaps/gray25.xbm
index fdaef49..fdaef49 100644
--- a/bitmaps/gray25.bmp
+++ b/bitmaps/gray25.xbm
diff --git a/bitmaps/gray50.bmp b/bitmaps/gray50.xbm
index 1f9fbc0..1f9fbc0 100644
--- a/bitmaps/gray50.bmp
+++ b/bitmaps/gray50.xbm
diff --git a/bitmaps/gray75.bmp b/bitmaps/gray75.xbm
index f700b2c..f700b2c 100644
--- a/bitmaps/gray75.bmp
+++ b/bitmaps/gray75.xbm
diff --git a/bitmaps/hourglass.bmp b/bitmaps/hourglass.xbm
index bb1d8ad..bb1d8ad 100644
--- a/bitmaps/hourglass.bmp
+++ b/bitmaps/hourglass.xbm
diff --git a/bitmaps/info.bmp b/bitmaps/info.xbm
index 801476e..801476e 100644
--- a/bitmaps/info.bmp
+++ b/bitmaps/info.xbm
diff --git a/bitmaps/questhead.bmp b/bitmaps/questhead.xbm
index 17b2929..17b2929 100644
--- a/bitmaps/questhead.bmp
+++ b/bitmaps/questhead.xbm
diff --git a/bitmaps/question.bmp b/bitmaps/question.xbm
index ceba2ab..ceba2ab 100644
--- a/bitmaps/question.bmp
+++ b/bitmaps/question.xbm
diff --git a/bitmaps/warning.bmp b/bitmaps/warning.xbm
index 7925440..7925440 100644
--- a/bitmaps/warning.bmp
+++ b/bitmaps/warning.xbm
diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c
index dd971f6..c35ddb1 100644
--- a/generic/tkBitmap.c
+++ b/generic/tkBitmap.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkBitmap.c,v 1.11 2004/01/13 02:06:00 davygrvy Exp $
+ * RCS: @(#) $Id: tkBitmap.c,v 1.12 2004/10/19 15:25:05 dkf Exp $
  */
 
 #include "tkPort.h"
@@ -30,16 +30,16 @@
 #pragma warning (disable : 4305)
 #endif
 
-#include "error.bmp"
-#include "gray12.bmp"
-#include "gray25.bmp"
-#include "gray50.bmp"
-#include "gray75.bmp"
-#include "hourglass.bmp"
-#include "info.bmp"
-#include "questhead.bmp"
-#include "question.bmp"
-#include "warning.bmp"
+#include "error.xbm"
+#include "gray12.xbm"
+#include "gray25.xbm"
+#include "gray50.xbm"
+#include "gray75.xbm"
+#include "hourglass.xbm"
+#include "info.xbm"
+#include "questhead.xbm"
+#include "question.xbm"
+#include "warning.xbm"
 
 #if defined(__WIN32__) || defined(_WIN32)
 #pragma warning (default : 4305)
@@ -1109,7 +1109,7 @@ TkReadBitmapFile(display, d, filename, width_return, height_return,
 
     ckfree(data);
     return BitmapSuccess;
-  }
+}
 
 /*
  *----------------------------------------------------------------------
@@ -1159,7 +1159,6 @@ TkDebugBitmap(tkwin, name)
     }
     return resultPtr;
 }
-
 
 /*
  *----------------------------------------------------------------------
@@ -1180,6 +1179,7 @@ TkDebugBitmap(tkwin, name)
  *
  *----------------------------------------------------------------------
  */
+
 Tcl_HashTable *
 TkGetBitmapPredefTable()
 {
diff --git a/library/demos/icon.tcl b/library/demos/icon.tcl
index 4355490..26c15a1 100644
--- a/library/demos/icon.tcl
+++ b/library/demos/icon.tcl
@@ -3,7 +3,7 @@
 # This demonstration script creates a toplevel window containing
 # buttons that display bitmaps instead of text.
 #
-# RCS: @(#) $Id: icon.tcl,v 1.4 2003/11/03 15:31:18 dkf Exp $
+# RCS: @(#) $Id: icon.tcl,v 1.5 2004/10/19 15:25:06 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
@@ -25,11 +25,11 @@ pack $btns -side bottom -fill x
 
 # Main widget program sets variable tk_demoDirectory
 image create bitmap flagup \
-	-file [file join $tk_demoDirectory images flagup.bmp] \
-	-maskfile [file join $tk_demoDirectory images flagup.bmp]
+	-file [file join $tk_demoDirectory images flagup.xbm] \
+	-maskfile [file join $tk_demoDirectory images flagup.xbm]
 image create bitmap flagdown \
-	-file [file join $tk_demoDirectory images flagdown.bmp] \
-	-maskfile [file join $tk_demoDirectory images flagdown.bmp]
+	-file [file join $tk_demoDirectory images flagdown.xbm] \
+	-maskfile [file join $tk_demoDirectory images flagdown.xbm]
 frame $w.frame -borderwidth 10
 pack $w.frame -side top
 
@@ -37,15 +37,15 @@ checkbutton $w.frame.b1 -image flagdown -selectimage flagup \
 	-indicatoron 0
 $w.frame.b1 configure -selectcolor [$w.frame.b1 cget -background]
 checkbutton $w.frame.b2 \
-	-bitmap @[file join $tk_demoDirectory images letters.bmp] \
+	-bitmap @[file join $tk_demoDirectory images letters.xbm] \
 	-indicatoron 0 -selectcolor SeaGreen1
 frame $w.frame.left
 pack $w.frame.left $w.frame.b1 $w.frame.b2 -side left -expand yes -padx 5m
 
 radiobutton $w.frame.left.b3 \
-	-bitmap @[file join $tk_demoDirectory images letters.bmp] \
+	-bitmap @[file join $tk_demoDirectory images letters.xbm] \
 	-variable letters -value full
 radiobutton $w.frame.left.b4 \
-	-bitmap @[file join $tk_demoDirectory images noletter.bmp] \
+	-bitmap @[file join $tk_demoDirectory images noletter.xbm] \
 	-variable letters -value empty
 pack $w.frame.left.b3 $w.frame.left.b4 -side top -expand yes
diff --git a/library/demos/images/face.bmp b/library/demos/images/face.xbm
index 03d829f..03d829f 100644
--- a/library/demos/images/face.bmp
+++ b/library/demos/images/face.xbm
diff --git a/library/demos/images/flagdown.bmp b/library/demos/images/flagdown.xbm
index 55abc51..55abc51 100644
--- a/library/demos/images/flagdown.bmp
+++ b/library/demos/images/flagdown.xbm
diff --git a/library/demos/images/flagup.bmp b/library/demos/images/flagup.xbm
index 6eb0d84..6eb0d84 100644
--- a/library/demos/images/flagup.bmp
+++ b/library/demos/images/flagup.xbm
diff --git a/library/demos/images/gray25.bmp b/library/demos/images/gray25.xbm
index b234b3c..b234b3c 100644
--- a/library/demos/images/gray25.bmp
+++ b/library/demos/images/gray25.xbm
diff --git a/library/demos/images/letters.bmp b/library/demos/images/letters.xbm
index 0f12568..0f12568 100644
--- a/library/demos/images/letters.bmp
+++ b/library/demos/images/letters.xbm
diff --git a/library/demos/images/noletter.bmp b/library/demos/images/noletter.xbm
index 5774124..5774124 100644
--- a/library/demos/images/noletter.bmp
+++ b/library/demos/images/noletter.xbm
diff --git a/library/demos/images/pattern.bmp b/library/demos/images/pattern.xbm
index df31baf..df31baf 100644
--- a/library/demos/images/pattern.bmp
+++ b/library/demos/images/pattern.xbm
diff --git a/library/demos/items.tcl b/library/demos/items.tcl
index 1d4ab7f..0ca7371 100644
--- a/library/demos/items.tcl
+++ b/library/demos/items.tcl
@@ -3,7 +3,7 @@
 # This demonstration script creates a canvas that displays the
 # canvas item types.
 #
-# RCS: @(#) $Id: items.tcl,v 1.5 2003/11/03 15:31:18 dkf Exp $
+# RCS: @(#) $Id: items.tcl,v 1.6 2004/10/19 15:25:06 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
@@ -77,7 +77,7 @@ $c create line 5c 6c 9c 6c 9c 1c 8c 1c 8c 4.8c 8.8c 4.8c 8.8c 1.2c \
 	-width 3 -fill $red -tags item
 # Main widget program sets variable tk_demoDirectory
 $c create line 1c 5c 7c 5c 7c 7c 9c 7c -width .5c \
-	-stipple @[file join $tk_demoDirectory images gray25.bmp] \
+	-stipple @[file join $tk_demoDirectory images gray25.xbm] \
 	-arrow both -arrowshape {15 15 7} -tags item
 $c create line 1c 7c 1.75c 5.8c 2.5c 7c 3.25c 5.8c 4c 7c -width .5c \
 	-cap round -join round -tags item
@@ -89,7 +89,7 @@ $c create line 15.5c 1c 19.5c 1.5c 15.5c 4.5c 19.5c 4c -smooth on \
 	-arrow both -width 3 -tags item
 $c create line 12c 6c 13.5c 4.5c 16.5c 7.5c 18c 6c \
 	16.5c 4.5c 13.5c 7.5c 12c 6c -smooth on -width 3m -cap round \
-	-stipple @[file join $tk_demoDirectory images gray25.bmp] \
+	-stipple @[file join $tk_demoDirectory images gray25.xbm] \
 	-fill $red -tags item
 
 $c create text 25c .2c -text Polygons -anchor n
@@ -100,21 +100,21 @@ $c create polygon 25c 4c 25c 4c 25c 1c 26c 1c 27c 4c 28c 1c \
 	29c 1c 29c 4c 29c 4c -fill $red -smooth on -tags item
 $c create polygon 22c 4.5c 25c 4.5c 25c 6.75c 28c 6.75c \
 	28c 5.25c 24c 5.25c 24c 6.0c 26c 6c 26c 7.5c 22c 7.5c \
-	-stipple @[file join $tk_demoDirectory images gray25.bmp] \
+	-stipple @[file join $tk_demoDirectory images gray25.xbm] \
 	-outline black -tags item
 
 $c create text 5c 8.2c -text Rectangles -anchor n
 $c create rectangle 1c 9.5c 4c 12.5c -outline $red -width 3m -tags item
 $c create rectangle 0.5c 13.5c 4.5c 15.5c -fill $green -tags item
 $c create rectangle 6c 10c 9c 15c -outline {} \
-	-stipple @[file join $tk_demoDirectory images gray25.bmp] \
+	-stipple @[file join $tk_demoDirectory images gray25.xbm] \
 	-fill $blue -tags item
 
 $c create text 15c 8.2c -text Ovals -anchor n
 $c create oval 11c 9.5c 14c 12.5c -outline $red -width 3m -tags item
 $c create oval 10.5c 13.5c 14.5c 15.5c -fill $green -tags item
 $c create oval 16c 10c 19c 15c -outline {} \
-	-stipple @[file join $tk_demoDirectory images gray25.bmp] \
+	-stipple @[file join $tk_demoDirectory images gray25.xbm] \
 	-fill $blue -tags item
 
 $c create text 25c 8.2c -text Text -anchor n
@@ -134,7 +134,7 @@ $c create arc 0.5c 17c 7c 20c -fill $green -outline black \
 	-start 45 -extent 270 -style pieslice -tags item
 $c create arc 6.5c 17c 9.5c 20c -width 4m -style arc \
 	-outline $blue -start -135 -extent 270 -tags item \
-	-outlinestipple @[file join $tk_demoDirectory images gray25.bmp]
+	-outlinestipple @[file join $tk_demoDirectory images gray25.xbm]
 $c create arc 0.5c 20c 9.5c 24c -width 4m -style pieslice \
 	-fill {} -outline $red -start 225 -extent -90 -tags item
 $c create arc 5.5c 20.5c 9.5c 23.5c -width 4m -style chord \
@@ -142,11 +142,11 @@ $c create arc 5.5c 20.5c 9.5c 23.5c -width 4m -style chord \
 
 $c create text 15c 16.2c -text Bitmaps -anchor n
 $c create bitmap 13c 20c -tags item \
-	-bitmap @[file join $tk_demoDirectory images face.bmp]
+	-bitmap @[file join $tk_demoDirectory images face.xbm]
 $c create bitmap 17c 18.5c -tags item \
-	-bitmap @[file join $tk_demoDirectory images noletter.bmp]
+	-bitmap @[file join $tk_demoDirectory images noletter.xbm]
 $c create bitmap 17c 21.5c -tags item \
-	-bitmap @[file join $tk_demoDirectory images letters.bmp]
+	-bitmap @[file join $tk_demoDirectory images letters.xbm]
 
 $c create text 25c 16.2c -text Windows -anchor n
 button $c.button -text "Press Me" -command "butPress $c $red"
diff --git a/library/demos/label.tcl b/library/demos/label.tcl
index d526334..4bcfc18 100644
--- a/library/demos/label.tcl
+++ b/library/demos/label.tcl
@@ -3,7 +3,7 @@
 # This demonstration script creates a toplevel window containing
 # several label widgets.
 #
-# RCS: @(#) $Id: label.tcl,v 1.4 2003/11/03 15:31:18 dkf Exp $
+# RCS: @(#) $Id: label.tcl,v 1.5 2004/10/19 15:25:06 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
@@ -34,6 +34,6 @@ pack $w.left.l1 $w.left.l2 $w.left.l3 -side top -expand yes -pady 2 -anchor w
 
 # Main widget program sets variable tk_demoDirectory
 label $w.right.bitmap -borderwidth 2 -relief sunken \
-	-bitmap @[file join $tk_demoDirectory images face.bmp]
+	-bitmap @[file join $tk_demoDirectory images face.xbm]
 label $w.right.caption -text "Tcl/Tk Proprietor"
 pack $w.right.bitmap $w.right.caption -side top
diff --git a/library/demos/menu.tcl b/library/demos/menu.tcl
index 716294f..91eb654 100644
--- a/library/demos/menu.tcl
+++ b/library/demos/menu.tcl
@@ -3,7 +3,7 @@
 # This demonstration script creates a window with a bunch of menus
 # and cascaded menus using menubars.
 #
-# RCS: @(#) $Id: menu.tcl,v 1.6 2003/11/03 15:31:18 dkf Exp $
+# RCS: @(#) $Id: menu.tcl,v 1.7 2004/10/19 15:25:07 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
@@ -116,7 +116,7 @@ $w.menu add cascade -label "Icons" -menu $m -underline 0
 menu $m -tearoff 0
 # Main widget program sets variable tk_demoDirectory
 $m add command \
-    -bitmap @[file join $tk_demoDirectory images pattern.bmp] \
+    -bitmap @[file join $tk_demoDirectory images pattern.xbm] \
     -hidemargin 1 \
     -command {
 	tk_dialog .pattern {Bitmap Menu Entry} {The menu entry you invoked displays a bitmap rather than a text string.  Other than this, it is just like any other menu entry.} {} 0 OK
diff --git a/library/demos/ruler.tcl b/library/demos/ruler.tcl
index 0f5359d..39fdb57 100644
--- a/library/demos/ruler.tcl
+++ b/library/demos/ruler.tcl
@@ -3,7 +3,7 @@
 # This demonstration script creates a canvas widget that displays a ruler
 # with tab stops that can be set, moved, and deleted.
 #
-# RCS: @(#) $Id: ruler.tcl,v 1.5 2003/11/03 15:31:18 dkf Exp $
+# RCS: @(#) $Id: ruler.tcl,v 1.6 2004/10/19 15:25:07 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
@@ -52,11 +52,11 @@ set demo_rulerInfo(normalStyle) "-fill black"
 if {[winfo depth $c] > 1} {
     set demo_rulerInfo(activeStyle) "-fill red -stipple {}"
     set demo_rulerInfo(deleteStyle) [list -fill red \
-	    -stipple @[file join $tk_demoDirectory images gray25.bmp]]
+	    -stipple @[file join $tk_demoDirectory images gray25.xbm]]
 } else {
     set demo_rulerInfo(activeStyle) "-fill black -stipple {}"
     set demo_rulerInfo(deleteStyle) [list -fill black \
-	    -stipple @[file join $tk_demoDirectory images gray25.bmp]]
+	    -stipple @[file join $tk_demoDirectory images gray25.xbm]]
 }
 
 $c create line 1c 0.5c 1c 1c 13c 1c 13c 0.5c -width 1
diff --git a/library/demos/twind.tcl b/library/demos/twind.tcl
index 91d7158..31fdc6f 100644
--- a/library/demos/twind.tcl
+++ b/library/demos/twind.tcl
@@ -3,7 +3,7 @@
 # This demonstration script creates a text widget with a bunch of
 # embedded windows.
 #
-# RCS: @(#) $Id: twind.tcl,v 1.6 2004/09/10 12:13:43 vincentdarley Exp $
+# RCS: @(#) $Id: twind.tcl,v 1.7 2004/10/19 15:25:07 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
@@ -158,7 +158,7 @@ $t window create end -window $t.smallP
 $t insert end "\n\nFinally, images fit comfortably in text widgets too:"
 
 $t image create end -image \
-  [image create bitmap -file [file join $tk_demoDirectory images face.bmp]]
+  [image create bitmap -file [file join $tk_demoDirectory images face.xbm]]
 
 
 proc textWindBigB w {
diff --git a/tests/canvPsBmap.tcl b/tests/canvPsBmap.tcl
index dbc9c83..e9e5748 100644
--- a/tests/canvPsBmap.tcl
+++ b/tests/canvPsBmap.tcl
@@ -2,7 +2,7 @@
 # for bitmaps in canvases.  It is part of the Tk visual test suite,
 # which is invoked via the "visual" script.
 #
-# RCS: @(#) $Id: canvPsBmap.tcl,v 1.3 1999/04/16 01:51:35 stanton Exp $
+# RCS: @(#) $Id: canvPsBmap.tcl,v 1.4 2004/10/19 15:25:08 dkf Exp $
 
 catch {destroy .t}
 toplevel .t
@@ -26,47 +26,47 @@ canvas $c -width 6i -height 6i -bd 2 -relief sunken
 pack $c -expand yes -fill both -padx 2m -pady 2m
 
 $c create bitmap 0.5i 0.5i \
-    -bitmap @[file join $tk_library demos/images/flagdown.bmp] \
+    -bitmap @[file join $tk_library demos/images/flagdown.xbm] \
     -background {} -foreground black -anchor nw
 $c create rect 0.47i 0.47i 0.53i 0.53i -fill {} -outline black
 
 $c create bitmap 3.0i 0.5i \
-    -bitmap @[file join $tk_library demos/images/flagdown.bmp] \
+    -bitmap @[file join $tk_library demos/images/flagdown.xbm] \
     -background {} -foreground black -anchor n
 $c create rect 2.97i 0.47i 3.03i 0.53i -fill {} -outline black
 
 $c create bitmap 5.5i 0.5i \
-    -bitmap @[file join $tk_library demos/images/flagdown.bmp] \
+    -bitmap @[file join $tk_library demos/images/flagdown.xbm] \
     -background black -foreground white -anchor ne
 $c create rect 5.47i 0.47i 5.53i 0.53i -fill {} -outline black
 
 $c create bitmap 0.5i 3.0i \
-    -bitmap @[file join $tk_library demos/images/face.bmp] \
+    -bitmap @[file join $tk_library demos/images/face.xbm] \
     -background {} -foreground black -anchor w
 $c create rect 0.47i 2.97i 0.53i 3.03i -fill {} -outline black
 
 $c create bitmap 3.0i 3.0i \
-    -bitmap @[file join $tk_library demos/images/face.bmp] \
+    -bitmap @[file join $tk_library demos/images/face.xbm] \
     -background {} -foreground black -anchor center
 $c create rect 2.97i 2.97i 3.03i 3.03i -fill {} -outline black
 
 $c create bitmap 5.5i 3.0i \
-    -bitmap @[file join $tk_library demos/images/face.bmp] \
+    -bitmap @[file join $tk_library demos/images/face.xbm] \
     -background blue -foreground black -anchor e
 $c create rect 5.47i 2.97i 5.53i 3.03i -fill {} -outline black
 
 $c create bitmap 0.5i 5.5i \
-    -bitmap @[file join $tk_library demos/images/flagup.bmp] \
+    -bitmap @[file join $tk_library demos/images/flagup.xbm] \
     -background black -foreground white -anchor sw
 $c create rect 0.47i 5.47i 0.53i 5.53i -fill {} -outline black
 
 $c create bitmap 3.0i 5.5i \
-    -bitmap @[file join $tk_library demos/images/flagup.bmp] \
+    -bitmap @[file join $tk_library demos/images/flagup.xbm] \
     -background green -foreground white -anchor s
 $c create rect 2.97i 5.47i 3.03i 5.53i -fill {} -outline black
 
 $c create bitmap 5.5i 5.5i \
-    -bitmap @[file join $tk_library demos/images/flagup.bmp] \
+    -bitmap @[file join $tk_library demos/images/flagup.xbm] \
     -background {} -foreground black -anchor se
 $c create rect 5.47i 5.47i 5.53i 5.53i -fill {} -outline black
 
diff --git a/tests/canvPsImg.tcl b/tests/canvPsImg.tcl
index 054be90..e36cecb 100644
--- a/tests/canvPsImg.tcl
+++ b/tests/canvPsImg.tcl
@@ -2,7 +2,7 @@
 # for images in canvases.  It is part of the Tk visual test suite,
 # which is invoked via the "visual" script.
 #
-# RCS: @(#) $Id: canvPsImg.tcl,v 1.2 2002/07/12 13:40:59 dgp Exp $
+# RCS: @(#) $Id: canvPsImg.tcl,v 1.3 2004/10/19 15:25:08 dkf Exp $
 
 # Build a test image in a canvas
 proc BuildTestImage {} {
@@ -69,7 +69,7 @@ foreach l { monochrome gray color } {
     pack .t.$l -in .t.top.r -anchor w
 }
 
-set BitmapImage [image create bitmap -file $tk_library/demos/images/face.bmp \
+set BitmapImage [image create bitmap -file $tk_library/demos/images/face.xbm \
 	-background white -foreground black]
 set PhotoImage [image create photo -file $tk_library/demos/images/teapot.ppm]