--- gdb/gdbtk/library/tfind_args.tcl	Sun Feb  6 19:19:42 2000
+++ gdb/gdbtk/library/tfind_args.tcl	Wed May 17 00:11:49 2006
@@ -29,9 +29,10 @@
 # ----------------------------------------------------------------------
  
-itcl_class TfindArgs {
+itcl::class TfindArgs {
   # ------------------------------------------------------------------
   #  CONSTRUCTOR - create new tfind arguments dialog
   # ------------------------------------------------------------------
-  constructor {config} {
+  constructor args {
+    eval configure $args
     #
     #  Create a window with the same name as this object
--- gdb/gdbtk/library/ehandler.itb	Tue Oct 15 17:19:51 2002
+++ gdb/gdbtk/library/ehandler.itb	Wed May 17 00:12:55 2006
@@ -23,5 +23,5 @@
 
   # invoke event handlers
-  foreach w [itcl_info objects -isa GDBEventHandler] {
+  foreach w [itcl::find objects -isa GDBEventHandler] {
     dbug I "posting event \"$handler\" to \"$w\""
     if {[catch {$w $handler $event}]} {
--- gdb/gdbtk/library/managedwin.itb	Fri Aug 27 19:13:14 2004
+++ gdb/gdbtk/library/managedwin.itb	Wed May 17 00:13:32 2006
@@ -76,5 +76,5 @@
 itcl::body ManagedWin::window_instance {ins} {
   set win_instance $ins
-  foreach obj [itcl_info objects -isa ManagedWin] {
+  foreach obj [itcl::find objects -isa ManagedWin] {
     debug "$obj ManagedWin::_wname"
     $obj window_name ""
@@ -134,5 +134,5 @@
   
   # call the reconfig method for each object
-  foreach obj [itcl_info objects -isa ManagedWin] {
+  foreach obj [itcl::find objects -isa ManagedWin] {
     if {[catch {$obj reconfig} msg]} {
       dbug W "reconfig failed for $obj - $msg"
@@ -148,5 +148,5 @@
 itcl::body ManagedWin::shutdown {} {
   set activeWins {}
-  foreach win [itcl_info objects -isa ManagedWin] {
+  foreach win [itcl::find objects -isa ManagedWin] {
     if {![$win isa ModalDialog] && ![$win _ignore_on_save]} {
       set g [wm geometry [winfo toplevel [namespace tail $win]]]
@@ -221,5 +221,5 @@
   if {!$force} {
     # check all windows for one of this type
-    foreach obj [itcl_info objects -isa ManagedWin] {
+    foreach obj [itcl::find objects -isa ManagedWin] {
       if {[$obj isa $class]} {
 	$obj reveal
@@ -364,5 +364,5 @@
   debug "$win"
   set res ""
-  foreach obj [itcl_info objects -isa ManagedWin] {
+  foreach obj [itcl::find objects -isa ManagedWin] {
     if {[$obj isa $win]} {
       lappend res $obj
--- libgui/library/balloon.tcl	Mon Feb 10 04:21:40 2003
+++ libgui/library/balloon.tcl	Thu Jun 28 15:39:09 2007
@@ -8,34 +8,34 @@
 # * Likewise, balloon positioning on Windows is a hack.
 
-itcl_class Balloon {
+itcl::class Balloon {
   # Name of associated global variable which should be set whenever
   # the help is shown.
-  public variable {}
+  public variable variable {}
 
   # Name of associated toplevel.  Private variable.
-  protected _top {}
+  protected variable _top {}
 
   # This is non-empty if there is an after script pending.  Private
   # method.
-  protected _after_id {}
+  protected variable _after_id {}
 
   # This is an array mapping window name to help text.
-  protected _help_text
+  protected variable _help_text
 
   # This is an array mapping window name to notification proc.
-  protected _notifiers
+  protected variable _notifiers
 
   # This is set to the name of the parent widget whenever the mouse is
   # in a widget with balloon help.
-  protected _active {}
+  protected variable _active {}
 
   # This is true when we're already calling a notification proc.
   # Private variable.
-  protected _in_notifier 0
+  protected variable _in_notifier 0
 
   # This holds the parent of the most recently entered widget.  It is
   # used to determine when the user is moving through a toolbar.
   # Private variable.
-  protected _recent_parent {}
+  protected variable _recent_parent {}
 
   constructor {top} {
--- libgui/library/cframe.tcl	Sat Sep  8 18:34:46 2001
+++ libgui/library/cframe.tcl	Thu Jun 28 15:39:50 2007
@@ -3,5 +3,5 @@
 # Written by Tom Tromey <tromey@cygnus.com>.
 
-itcl_class Checkframe {
+itcl::class Checkframe {
   inherit Widgetframe
 
@@ -14,5 +14,5 @@
   # trace when the variable changes (or is deleted).  Private
   # variable.
-  protected _saved_variable {}
+  protected variable _saved_variable {}
 
   # The checkbutton variable.
@@ -45,5 +45,5 @@
   # This holds a list of all widgets which should be immune to
   # enabling/disabling.  Private variable.
-  protected _avoid {}
+  protected variable _avoid {}
 
   constructor {config} {
--- libgui/library/lframe.tcl	Sat Sep  8 18:34:46 2001
+++ libgui/library/lframe.tcl	Thu Jun 28 15:32:04 2007
@@ -3,5 +3,5 @@
 # Written by Tom Tromey <tromey@cygnus.com>.
 
-itcl_class Labelledframe {
+itcl::class Labelledframe {
   inherit Widgetframe
 
--- libgui/library/multibox.tcl	Sat Sep  8 18:34:46 2001
+++ libgui/library/multibox.tcl	Thu Jun 28 15:39:58 2007
@@ -7,5 +7,5 @@
 # * Should support itemcget, itemconfigure.
 
-itcl_class Multibox {
+itcl::class Multibox {
   # The selection mode.
   public selectmode browse {
@@ -20,5 +20,5 @@
   # This is a list of all the listbox widgets we've created.  Private
   # variable.
-  protected _listboxen {}
+  protected variable _listboxen {}
 
   # Tricky: take the class bindings for the Listbox widget and turn
--- libgui/library/sendpr.tcl	Tue Feb  5 18:16:14 2002
+++ libgui/library/sendpr.tcl	Thu Jun 28 15:32:04 2007
@@ -14,5 +14,5 @@
 defarray SENDPR_state
 
-itcl_class Sendpr {
+itcl::class Sendpr {
   inherit Ide_window
 
--- libgui/library/ventry.tcl	Sat Sep  8 18:34:46 2001
+++ libgui/library/ventry.tcl	Thu Jun 28 15:32:04 2007
@@ -3,5 +3,5 @@
 # Written by Tom Tromey <tromey@cygnus.com>.
 
-itcl_class Validated_entry {
+itcl::class Validated_entry {
   # The validation command.  It is passed the contents of the entry.
   # It should throw an error if there is a problem; the error text
--- libgui/library/wframe.tcl	Sat Sep  8 18:34:46 2001
+++ libgui/library/wframe.tcl	Thu Jun 28 15:40:07 2007
@@ -3,5 +3,5 @@
 # Written by Tom Tromey <tromey@cygnus.com>.
 
-itcl_class Widgetframe {
+itcl::class Widgetframe {
   # Where to put the widget.  For now, we don't support many anchors.
   # Augment as you like.
@@ -15,5 +15,5 @@
   # The name of the widget to put on the frame.  This is set by some
   # subclass calling the _add method.  Private variable.
-  protected _widget {}
+  protected variable _widget {}
 
   constructor {config} {
