Re: gitk: set uicolor SystemButtonFace error on X11 if .gitk created using Win32 tk

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Feb 22, 2012 at 11:13 PM, Matt Seitz (matseitz)
<matseitz@xxxxxxxxx> wrote:
> Would you please change gitk to not hard-code Win32-specific color
> values when creating .gitk on a Win32 windowing system?
>
> Gitk stopped working for me on Cygwin when Cygwin changed from using a
> Win32 native version of tk to using the standard X11 version.  The error
> was because gitk had previously created a .gitk file using Win32
> specific color values:
>
> https://github.com/gitster/git/commit/1924d1bc0dc99cd3460d3551671908cc76
> c09d3b
>
> I was able to work around the problem by replacing the Win32 specific
> colors in my .gitk file with the default colors gitk uses on other
> windowing systems.
>

Are you saying that the tk shipped with recent Cygwin reports "win32"
for "[tk windowingsystem]", but does not recognize the
"SystemButtonFace" etc values?

If so, perhaps adding a check for one of the constant values might
make sense. But I'd expect "[tk windowingsystem]" to report "x11" if
it's simply a Cygwin build of the X11-version as you say...

Anyway, this does sound like a regression in Cygwin; we're probably
not the only ones to use "SystemButtonFace" etc after consulting "[tk
windowingsystem]"...

Hm, no wait, the documentation seems to suggest ditching the
System-prefix to these constants:
http://www.tcl.tk/man/tcl/TkCmd/colors.htm

Does this patch help?

---

diff --git a/gitk-git/gitk b/gitk-git/gitk
index f9e936d..7e9a01f 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -11559,10 +11559,10 @@ if {[tk windowingsystem] eq "aqua"} {

 set colors {green red blue magenta darkgrey brown orange}
 if {[tk windowingsystem] eq "win32"} {
-    set uicolor SystemButtonFace
-    set bgcolor SystemWindow
-    set fgcolor SystemButtonText
-    set selectbgcolor SystemHighlight
+    set uicolor ButtonFace
+    set bgcolor Window
+    set fgcolor ButtonText
+    set selectbgcolor Highlight
 } else {
     set uicolor grey85
     set bgcolor white
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]