2003-01-21 Martin M. Hunt <hunt@redhat.com>

	* library/main.tcl: Don't require iwidgets 3.0.

	* library/console.itb (Console::_build_win): Rename
	tkTextClosestGap to tk::TextClosestGap. Rename tkCancelRepeat
	to tk::CancelRepeat. Rename tkPriv to tk::Priv. Needed for tk 8.4.1.

	* library/bpwin.itb (BpWin::build_win): Don't
	create sizebox.
	* library/locals.tcl (build_win): Ditto.
	* library/regwin.itb (RegWin::_build_win): Ditto.
	* library/srcwin.itb (SrcWin::constructor): Ditto.
	* library/stackwin.itb (StackWin::build_win): Ditto.
	* library/watch.tcl (build_win): Ditto.

diff --git a/gdb/gdbtk/library/bpwin.itb b/gdb/gdbtk/library/bpwin.itb
index b8ec482..3d54f0d 100644 (file)
--- a/gdb/gdbtk/library/bpwin.itb
+++ b/gdb/gdbtk/library/bpwin.itb
@@ -1,5 +1,5 @@
 # Breakpoint window for Insight.
-# Copyright 1997, 1998, 1999, 2001, 2002 Red Hat, Inc.
+# Copyright 1997, 1998, 1999, 2001, 2002, 2003 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License (GPL) as published by
@@ -47,16 +47,8 @@ itcl::body BpWin::build_win {} {
   global _bp_en _bp_disp tcl_platform
   set bg1 $::Colors(bg)
 
-  if {$tcl_platform(platform) == "windows"} {
-    # Add a sizebox and set scroll modes to static
-    ide_sizebox $itk_interior.sbox
-    place $itk_interior.sbox -relx 1.0 -rely 1.0 -anchor se
-    set hsmode static
-    set vsmode static
-  } else {
-    set hsmode dynamic
-    set vsmode dynamic
-  }
+  set hsmode dynamic
+  set vsmode dynamic
 
   # FIXME: The iwidgets scrolled frame is pretty useless.
   # When we get BLT, use its hiertable to do this.

diff --git a/gdb/gdbtk/library/console.itb b/gdb/gdbtk/library/console.itb
index 3a51a3f..6a1a58c 100644 (file)
--- a/gdb/gdbtk/library/console.itb
+++ b/gdb/gdbtk/library/console.itb
@@ -1,5 +1,5 @@
 # Console window for Insight
-# Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+# Copyright 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License (GPL) as published by
@@ -147,7 +147,7 @@ itcl::body Console::_build_win {} {
   # the saved insertion point.
   set pretag pre-$_twin
   bind $_twin <1> [format {
-    if {[%%W compare [tkTextClosestGap %%W %%x %%y] <= cmdmark]} {
+    if {[%%W compare [tk::TextClosestGap %%W %%x %%y] <= cmdmark]} {
       %s _insertion [%%W index insert]
     } else {
       %s _insertion {}
@@ -160,7 +160,7 @@ itcl::body Console::_build_win {} {
   } $this $this $this]
   # FIXME: has inside information.
   bind $_twin <ButtonRelease-1> [format {
-    tkCancelRepeat
+    tk::CancelRepeat
     if {[%s _insertion] != ""} {
       %%W mark set insert [%s _insertion]
     }
@@ -174,18 +174,18 @@ itcl::body Console::_build_win {} {
   # drags a little "fuzzy".
   bind $_twin <B2-Motion> {
     if {!$tk_strictMotif} {
-      if {($tkPriv(x) - 2 < %x < $tkPriv(x) + 2) \
-           || ($tkPriv(y) - 2 < %y < $tkPriv(y) + 2)} {
-       set tkPriv(mouseMoved) 1
+      if {($tk::Priv(x) - 2 < %x < $tk::Priv(x) + 2) \
+           || ($tk::Priv(y) - 2 < %y < $tk::Priv(y) + 2)} {
+       set tk::Priv(mouseMoved) 1
       }
-      if {$tkPriv(mouseMoved)} {
+      if {$tk::Priv(mouseMoved)} {
        %W scan dragto %x %y
       }
     }
     break
   }
   bind $_twin <ButtonRelease-2> [format {
-    if {!$tkPriv(mouseMoved) || $tk_strictMotif} {
+    if {!$tk::Priv(mouseMoved) || $tk_strictMotif} {
       %s
       break
     }