* tools/feather.bmp:

	* tools/man2help.tcl:
	* tools/man2help2.tcl:
	* win/makefile.vc: More winhelp target fixups.  Added a feather
	bitmap to the non-scrollable area and changed the color to be
	yellow from a plain white.  The colors can be whatever we want
	them to be, but thought I would start with something bold.
	[Bug 527941]

3 files changed, 16 insertions, 8 deletions

diff --git a/tools/feather.bmp b/tools/feather.bmp
new file mode 100644
index 0000000..23aa02e
--- /dev/null
+++ b/tools/feather.bmp
diff --git a/tools/man2help.tcl b/tools/man2help.tcl
index 0d9bb02..9f3d7fe 100644
--- a/tools/man2help.tcl
+++ b/tools/man2help.tcl
@@ -6,7 +6,7 @@
 #
 # Copyright (c) 1996 by Sun Microsystems, Inc.
 #
-# RCS: @(#) $Id: man2help.tcl,v 1.9 2002/03/28 02:42:40 davygrvy Exp $
+# RCS: @(#) $Id: man2help.tcl,v 1.10 2002/03/28 21:45:24 davygrvy Exp $
 # 
 
 #
@@ -108,14 +108,19 @@ proc doDir dir {
 # process command line arguments
 
 if {$argc < 3} {
-    puts stderr "usage: $argv0 projectName version manFiles..."
+    puts stderr "usage: $argv0 \[options\] projectName version manFiles..."
     exit 1
 }
 
-set baseName [lindex $argv 0]
-set version [lindex $argv 1]
+set arg 0
+
+if {![string compare [lindex $argv $arg] "-bitmap"]} {
+    set bitmap [lindex $argv [incr arg]]
+}
+puts [set baseName [lindex $argv [incr arg]]]
+puts [set version [lindex $argv [incr arg]]]
 set files {}
-foreach i [lrange $argv 2 end] {
+foreach i [lrange $argv [incr arg] end] {
     set i [file join $i]
     if {[file isdir $i]} {
 	foreach f [lsort [glob -directory $i "*.\[13n\]"]] {
@@ -125,7 +130,6 @@ foreach i [lrange $argv 2 end] {
 	lappend files $i
     }
 }
-
 source [file join [file dirname [info script]] index.tcl]
 generateContents $baseName $version $files
 source [file join [file dirname [info script]] man2help2.tcl]
diff --git a/tools/man2help2.tcl b/tools/man2help2.tcl
index 82aa664..aef5f61 100644
--- a/tools/man2help2.tcl
+++ b/tools/man2help2.tcl
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: man2help2.tcl,v 1.7 2001/11/10 02:34:57 hobbs Exp $
+# RCS: @(#) $Id: man2help2.tcl,v 1.8 2002/03/28 21:45:24 davygrvy Exp $
 # 
 
 # Global variables used by these scripts:
@@ -826,7 +826,7 @@ proc TPmacro {argList} {
 # argList -		List of arguments to the .TH macro.
 
 proc THmacro {argList} {
-    global file curPkg curSect curID id_keywords state curVer
+    global file curPkg curSect curID id_keywords state curVer bitmap
 
     if {[llength $argList] != 5} {
 	set args [join $argList " "]
@@ -864,6 +864,10 @@ proc THmacro {argList} {
     tab
     text $curSect
     font R
+    if {[info exist bitmap]} {
+	# a right justified bitmap
+	puts $file "\\\{bmrt $bitmap\\\}"
+    }
     puts $file "\\fs20"
     set state(breakPending) -1
 }