[Tkabber-dev] r824 - in trunk/tkabber: . plugins/richtext plugins/unix

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Mon Dec 11 01:38:51 MSK 2006


Author: sergei
Date: 2006-12-11 01:38:47 +0300 (Mon, 11 Dec 2006)
New Revision: 824

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/plugins/richtext/emoticons.tcl
   trunk/tkabber/plugins/unix/menu8.4.tcl
Log:
	* plugins/unix/menu8.4.tcl: Use this plugin with menu workaround
	  in Tcl/Tk 8.5 also.

	* plugins/richtext/emoticons.tcl: Fixed tooltip behaviour over
	  emoticons menu.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2006-12-06 19:55:35 UTC (rev 823)
+++ trunk/tkabber/ChangeLog	2006-12-10 22:38:47 UTC (rev 824)
@@ -1,3 +1,11 @@
+2006-12-10  Sergei Golovan  <sgolovan at nes.ru>
+
+	* plugins/unix/menu8.4.tcl: Use this plugin with menu workaround
+	  in Tcl/Tk 8.5 also.
+
+	* plugins/richtext/emoticons.tcl: Fixed tooltip behaviour over
+	  emoticons menu.
+
 2006-12-06  Sergei Golovan  <sgolovan at nes.ru>
 
 	* ifacetk/iface.tcl: Close tab with middle button click on the tab

Modified: trunk/tkabber/plugins/richtext/emoticons.tcl
===================================================================
--- trunk/tkabber/plugins/richtext/emoticons.tcl	2006-12-06 19:55:35 UTC (rev 823)
+++ trunk/tkabber/plugins/richtext/emoticons.tcl	2006-12-10 22:38:47 UTC (rev 824)
@@ -287,12 +287,16 @@
 proc emoticons::show_menu {iw} {
     variable txtdefaults
 
+    set imgs [array names txtdefaults]
+
+    if {[llength $imgs] == 0} return
+
     set m .emoticonsmenu
     if {[winfo exists $m]} {
 	destroy $m
     }
     menu $m -tearoff 0
-    set imgs [array names txtdefaults]
+
     set rows [expr {floor(sqrt([llength $imgs]))}]
     set row 0
 
@@ -331,7 +335,7 @@
 
     if {[cequal [set index [$w index @$x,$y]] none]} {
 	if {![cequal $lasttext ""]} {
-	    balloon::default_balloon $w leave $lastX $lastY
+	    balloon::default_balloon $w:$lasttext leave $lastX $lastY
 	}
 
 	return
@@ -342,10 +346,10 @@
         motion {
             if {![cequal $text $lasttext]} {
 		if {![cequal $lasttext ""]} {
-                    balloon::default_balloon $w leave $lastX $lastY
+                    balloon::default_balloon $w:$lasttext leave $lastX $lastY
 		}
 
-                balloon::default_balloon $w enter [set lastX $X] \
+                balloon::default_balloon $w:$text enter [set lastX $X] \
 						  [set lastY $Y] \
 						  -text [set lasttext $text]
             }
@@ -356,7 +360,7 @@
         }
     }
 
-    balloon::default_balloon $w $action $X $Y -text $text
+    balloon::default_balloon $w:$text $action $X $Y -text $text
 }
 
 proc emoticons::insert {iw text} {

Modified: trunk/tkabber/plugins/unix/menu8.4.tcl
===================================================================
--- trunk/tkabber/plugins/unix/menu8.4.tcl	2006-12-06 19:55:35 UTC (rev 823)
+++ trunk/tkabber/plugins/unix/menu8.4.tcl	2006-12-10 22:38:47 UTC (rev 824)
@@ -1,6 +1,6 @@
 # $Id$
 
-if {$::tcl_version != "8.4"} return
+if {$::tcl_version != "8.4" && $::tcl_version != "8.5"} return
 
 namespace eval :: {
 



More information about the Tkabber-dev mailing list