Revision: 49112
http://brlcad.svn.sourceforge.net/brlcad/?rev=49112&view=rev
Author: bob1961
Date: 2012-01-26 19:55:40 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
Temporarily disable tkhtml when on 64-bit windows platforms.
Modified Paths:
--------------
brlcad/trunk/src/tclscripts/archer/Archer.tcl
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2012-01-26 19:45:19 UTC
(rev 49111)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2012-01-26 19:55:40 UTC
(rev 49112)
@@ -2881,11 +2881,15 @@
global tcl_platform
buildAboutDialog
- buildarcherHelp
- # Build manual browser
- ManBrowser $itk_interior.archerMan -parentName Archer
+ # Disable on 64-bit windows. Tkhtml is broken on this platform.
+ if {$tcl_platform(platform) != "windows" || $tcl_platform(pointerSize) ==
4} {
+ buildarcherHelp
+ # Build manual browser
+ ManBrowser $itk_interior.archerMan -parentName Archer
+ }
+
buildMouseOverridesDialog
# buildInfoDialog mouseOverridesDialog \
"Mouse Overrides" $mMouseOverrideInfo \
@@ -3671,6 +3675,11 @@
::itcl::body Archer::doarcherHelp {} {
global tcl_platform
+ # Disable on 64-bit windows. Tkhtml is broken on this platform.
+ if {$tcl_platform(platform) == "windows" && $tcl_platform(pointerSize) !=
4} {
+ return
+ }
+
$itk_component(archerHelp) center [namespace tail $this]
::update
$itk_component(archerHelp) activate
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2012-01-26 19:45:19 UTC
(rev 49111)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2012-01-26 19:55:40 UTC
(rev 49112)
@@ -5337,6 +5337,13 @@
}
::itcl::body ArcherCore::man {args} {
+ global tcl_platform
+
+ # Disable on 64-bit windows. Tkhtml is broken on this platform.
+ if {$tcl_platform(platform) == "windows" && $tcl_platform(pointerSize) !=
4} {
+ return
+ }
+
set archerMan $itk_interior.archerMan
set len [llength $args]
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
