Attachment "tkchat-old8.3isms.diff" to
ticket [1196561fff]
added by
wildcard_25
2005-05-06 20:09:06.
Index: tkchat.tcl
===================================================================
RCS file: /cvsroot/tcllib/tclapps/apps/tkchat/tkchat.tcl,v
retrieving revision 1.285
diff -u -d -r1.285 tkchat.tcl
--- tkchat.tcl 4 May 2005 16:58:45 -0000 1.285
+++ tkchat.tcl 6 May 2005 04:21:01 -0000
@@ -169,21 +169,6 @@
variable MessageCounter 0
}
-# Tcl8.3 compatibility procs
-if {[package vcompare [package provide Tcl] 8.3] == 0} {
- proc ::tkchat::tk_windowingsystem {} {
- if {[string equal $::tcl_platform(platform) "windows"]} {
- return "win32"
- } elseif {[string equal $::tcl_platform(platform) "unix"]} {
- return "x11"
- } else {
- return "dontcare"
- }
- }
-} else {
- interp alias {} ::tkchat::tk_windowingsystem {} tk windowingsystem
-}
-
# -------------------------------------------------------------------------
msgcat::mcmset en_gb { Login "Connect" Logout "Disconnect" }
@@ -1707,7 +1692,7 @@
if {!$done
&& ([string match "g*" $Options(Style)]
|| [string equal $Options(Style) "any"])
- && [tk_windowingsystem] == "x11"} {
+ && [tk windowingsystem] == "x11"} {
gtklook_style_init
}
@@ -5519,8 +5504,8 @@
# At some point I want to support multiple icons for nochat/chat/alert.
#
proc ::tkchat::WinicoInit {} {
- log::log debug "tk windowingsystem [tk_windowingsystem]"
- if {[tk_windowingsystem] eq "win32" &&
+ log::log debug "tk windowingsystem [tk windowingsystem]"
+ if {[tk windowingsystem] eq "win32" &&
![catch {package require Winico}]} {
variable TaskbarIcon
variable WinicoWmState [wm state .]
@@ -5853,11 +5838,8 @@
wm withdraw $dlg
wm title $dlg "Tkchat Options"
- if {[package vcompare [package provide Tcl] 8.3] == 0} {
- set bf [frame $dlg.bf]
- } else {
- set bf [labelframe $dlg.bf -text "Preferred browser" -padx 1 -pady 1]
- }
+ set bf [labelframe $dlg.bf -text "Preferred browser" -padx 1 -pady 1]
+
message $bf.m -justify left -width 320 \
-text "Provide the command used to launch your web browser. For\
instance /opt/bin/mozilla or xterm -e links. The URL to\
@@ -5876,13 +5858,9 @@
grid rowconfigure $bf 0 -weight 1
grid columnconfigure $bf 0 -weight 1
- if {[package vcompare [package provide Tcl] 8.3] == 0} {
- set sf [frame $dlg.sf]
- set gf [frame $dlg.gf]
- } else {
- set sf [labelframe $dlg.sf -text "Tk style" -padx 1 -pady 1]
- set gf [labelframe $dlg.gf -text "Gimmiks" -padx 1 -pady 1]
- }
+ set sf [labelframe $dlg.sf -text "Tk style" -padx 1 -pady 1]
+ set gf [labelframe $dlg.gf -text "Gimmiks" -padx 1 -pady 1]
+
message $sf.m -justify left -width 320 \
-text "The Tk style selection available here will apply when you \
next restart tkchat."
