Attachment "tkchat_misc.diff" to
ticket [1061218fff]
added by
dkf
2004-11-06 05:24:06.
Index: tkchat.tcl
===================================================================
RCS file: /cvsroot/tcllib/tclapps/apps/tkchat/tkchat.tcl,v
retrieving revision 1.197
diff -u -c -r1.197 tkchat.tcl
cvs diff: conflicting specifications of output style
*** tkchat.tcl 3 Nov 2004 09:03:04 -0000 1.197
--- tkchat.tcl 5 Nov 2004 22:11:57 -0000
***************
*** 44,54 ****
# We sometimes need to _really_ use the Tk widgets at the moment...
#
catch {
rename ::label ::tk::label
rename ::radiobutton ::tk::radiobutton
! if {![catch {package require tile 0.4}]} {
namespace import -force tile::*
} else {
interp alias {} label {} ::tk::label
interp alias {} radiobutton {} ::tk::radiobutton
}
--- 44,56 ----
# We sometimes need to _really_ use the Tk widgets at the moment...
#
catch {
+ rename ::entry ::tk::entry
rename ::label ::tk::label
rename ::radiobutton ::tk::radiobutton
! if {![catch {package require tile 0.5}]} {
namespace import -force tile::*
} else {
+ interp alias {} entry {} ::tk::entry
interp alias {} label {} ::tk::label
interp alias {} radiobutton {} ::tk::radiobutton
}
***************
*** 5038,5044 ****
frame $w.sample
grid $w.sample -row 8 -column 1 -columnspan 7 -sticky nsew
grid propagate $w.sample 0
! entry $w.sample.text
catch {
$w.sample.text configure -background [$w.sample cget -background]
}
--- 5040,5046 ----
frame $w.sample
grid $w.sample -row 8 -column 1 -columnspan 7 -sticky nsew
grid propagate $w.sample 0
! ::tk::entry $w.sample.text
catch {
$w.sample.text configure -background [$w.sample cget -background]
}
***************
*** 5555,5562 ****
# At some point I want to support multiple icons for nochat/chat/alert.
#
proc ::tkchat::WinicoInit {} {
! catch {
package require Winico
variable TaskbarIcon
set icofile [file join [file dirname [info script]] tkchat.ico]
if {[file exists $icofile]} {
--- 5557,5565 ----
# At some point I want to support multiple icons for nochat/chat/alert.
#
proc ::tkchat::WinicoInit {} {
! if {![catch {
package require Winico
+ }]} then {
variable TaskbarIcon
set icofile [file join [file dirname [info script]] tkchat.ico]
if {[file exists $icofile]} {
***************
*** 6630,6633 ****
if {![info exists ::URLID]} {
eval [linsert $argv 0 ::tkchat::Init]
}
-
--- 6633,6635 ----
