From 7c01602864bf2cf809534161c400780b6a1e460e Mon Sep 17 00:00:00 2001 From: Martin Hunt Date: Tue, 4 Feb 2003 07:43:32 +0000 Subject: 2003-02-03 Martin M. Hunt * library/globalpref.itb, library/mempref.itb, library/srcpref.itb, library/srcwin.itb, library/targetselection.itb, library/tracedlg.tcl: Set background color of comboboxes to Colors(textbg). * library/main.tcl: Load combobox version 2.2. * library/prefs.tcl: Minor optimization. Change order of main_names to have the most common, "main", first. --- gdb/gdbtk/ChangeLog | 11 +++++++++++ gdb/gdbtk/library/globalpref.itb | 6 +++--- gdb/gdbtk/library/main.tcl | 4 ++-- gdb/gdbtk/library/mempref.itb | 5 +++-- gdb/gdbtk/library/prefs.tcl | 2 +- gdb/gdbtk/library/srcpref.itb | 5 +++-- gdb/gdbtk/library/srcwin.itb | 6 +++--- gdb/gdbtk/library/targetselection.itb | 8 ++++---- gdb/gdbtk/library/tracedlg.tcl | 5 +++-- 9 files changed, 33 insertions(+), 19 deletions(-) (limited to 'gdb/gdbtk') diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog index 560352a9649..6055196d4a5 100644 --- a/gdb/gdbtk/ChangeLog +++ b/gdb/gdbtk/ChangeLog @@ -1,5 +1,16 @@ 2003-02-03 Martin M. Hunt + * library/globalpref.itb, library/mempref.itb, library/srcpref.itb, + library/srcwin.itb, library/targetselection.itb, library/tracedlg.tcl: + Set background color of comboboxes to Colors(textbg). + + * library/main.tcl: Load combobox version 2.2. + + * library/prefs.tcl: Minor optimization. Change order of main_names + to have the most common, "main", first. + +2003-02-03 Martin M. Hunt + * library/targetselection.itb (TargetSelection::port_list): Keep checking ports on Windows until we can open no more. Replaces fixed limit of 9. diff --git a/gdb/gdbtk/library/globalpref.itb b/gdb/gdbtk/library/globalpref.itb index 8c79bde99ce..e3502b807ac 100644 --- a/gdb/gdbtk/library/globalpref.itb +++ b/gdb/gdbtk/library/globalpref.itb @@ -1,5 +1,5 @@ # Global preference class implementation for Insight. -# Copyright 1997, 1998, 1999, 2002 Red Hat +# Copyright 1997, 1998, 1999, 2002, 2003 Red Hat # # 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 @@ -86,7 +86,7 @@ itcl::body GlobalPref::_build_win {} { frame $frame.icons label $frame.icons.lab -text "Icons " combobox::combobox $frame.icons.cb -editable 0 -maxheight 10\ - -command [code $this _change_icons] + -command [code $this _change_icons] -bg $::Colors(textbg) # get list of icon directories set curdir [pwd] @@ -279,7 +279,7 @@ itcl::body GlobalPref::_make_font_item {f name label font_list} { label $f.${name}x -text $label combobox::combobox $f.${name}n -editable 0 -value $_original($name,family) \ - -command [code $this _change_font $name] + -command [code $this _change_font $name] -bg $::Colors(textbg) foreach a $font_list { $f.${name}n list insert end $a diff --git a/gdb/gdbtk/library/main.tcl b/gdb/gdbtk/library/main.tcl index 04aa2a3933d..75c66ad18db 100644 --- a/gdb/gdbtk/library/main.tcl +++ b/gdb/gdbtk/library/main.tcl @@ -1,5 +1,5 @@ # GDBtk (Insight) entry point -# Copyright 1997, 1998, 1999, 2002 Red Hat, Inc. +# Copyright 1997, 1998, 1999, 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 @@ -57,7 +57,7 @@ if {[info exists auto_path]} { # Require the packages we need. Most are loaded already, but this will catch # any odd errors... : -foreach p {{Tcl 8.0} {Tk 8.0} {Itcl 3.0} {Itk 3.0} {Gdbtk 1.0} {combobox 1.0} {debug 1.0}} { +foreach p {{Tcl 8.0} {Tk 8.0} {Itcl 3.0} {Itk 3.0} {Gdbtk 1.0} {combobox 2.2} {debug 1.0}} { if {[catch {package require [lindex $p 0] [lindex $p 1]} msg]} { if {![info exists ::env(GDBTK_TEST_RUNNING)] || $::env(GDBTK_TEST_RUNNING) == 0} { if {$::tcl_platform(platform) != "windows"} { diff --git a/gdb/gdbtk/library/mempref.itb b/gdb/gdbtk/library/mempref.itb index 7ddece86bbd..c2617cf20f7 100644 --- a/gdb/gdbtk/library/mempref.itb +++ b/gdb/gdbtk/library/mempref.itb @@ -1,5 +1,5 @@ # Memory display preferences window for Insight. -# Copyright 1998, 1999, 2002 Red Hat +# Copyright 1998, 1999, 2002, 2003 Red Hat # # 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 @@ -153,7 +153,8 @@ itcl::body MemPref::build_win {} { label $fr.2.l -text "Bytes Per Row " set Widgets(b-bytes_per_row) [::combobox::combobox $fr.2.c \ -command [code $this set_bytes_per_row] \ - -width 4 -editable 0 -font global/fixed] + -width 4 -editable 0 -font global/fixed \ + -bg $::Colors(textbg)] $fr.2.c list insert end 4 $fr.2.c list insert end 8 $fr.2.c list insert end 16 diff --git a/gdb/gdbtk/library/prefs.tcl b/gdb/gdbtk/library/prefs.tcl index 7d6371c99b2..b25d0b63da8 100644 --- a/gdb/gdbtk/library/prefs.tcl +++ b/gdb/gdbtk/library/prefs.tcl @@ -391,7 +391,7 @@ proc pref_set_defaults {} { pref define gdb/kod/show_icon 0 # Various possible "main" functions. What's for Java? - pref define gdb/main_names [list MAIN___ MAIN__ main cyg_user_start cyg_start ] + pref define gdb/main_names [list main MAIN___ MAIN__ cyg_user_start cyg_start ] # These are the classes of warning dialogs, and whether the user plans # to ignore them. diff --git a/gdb/gdbtk/library/srcpref.itb b/gdb/gdbtk/library/srcpref.itb index be37ff23a67..86d42436d96 100644 --- a/gdb/gdbtk/library/srcpref.itb +++ b/gdb/gdbtk/library/srcpref.itb @@ -1,5 +1,5 @@ # Source preferences dialog for Insight. -# Copyright 1998, 1999, 2002 Red Hat +# Copyright 1998, 1999, 2002, 2003 Red Hat # # 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 @@ -159,7 +159,8 @@ itcl::body SrcPref::_build_win {} { frame $f.dis label $f.dis.l -text "Disassembly Flavor: " combobox::combobox $f.dis.combo -maxheight 15 -width 15 \ - -font global/fixed -editable 0 -command [code $this _set_flavor] + -font global/fixed -editable 0 -command [code $this _set_flavor] \ + -bg $::Colors(textbg) foreach elem $vals { $f.dis.combo list insert end $elem diff --git a/gdb/gdbtk/library/srcwin.itb b/gdb/gdbtk/library/srcwin.itb index 141dec118a2..5901456a0d6 100644 --- a/gdb/gdbtk/library/srcwin.itb +++ b/gdb/gdbtk/library/srcwin.itb @@ -97,14 +97,14 @@ itcl::body SrcWin::_build_win {} { pack $_statbar -expand 1 -fill both combobox::combobox $_statbar.name -maxheight 15 -font global/fixed\ - -command [code $this _name] + -command [code $this _name] -bg $::Colors(textbg) set need_files 1 combobox::combobox $_statbar.func -maxheight 15 -font global/fixed\ - -command [code $this goto_func] + -command [code $this goto_func] -bg $::Colors(textbg) combobox::combobox $_statbar.mode -width 9 -editable false \ - -font global/fixed -command [code $this mode] + -font global/fixed -command [code $this mode] -bg $::Colors(textbg) $_statbar.mode list insert end SOURCE $_statbar.mode list insert end ASSEMBLY diff --git a/gdb/gdbtk/library/targetselection.itb b/gdb/gdbtk/library/targetselection.itb index 693fdd62bfd..a24f3741788 100644 --- a/gdb/gdbtk/library/targetselection.itb +++ b/gdb/gdbtk/library/targetselection.itb @@ -1,5 +1,5 @@ # Target selection dialog for Insight. -# Copyright 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc. +# Copyright 1997, 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 @@ -400,13 +400,13 @@ itcl::body TargetSelection::build_win {} { # target name label $fr.tarl -text [gettext "Target:"] combobox::combobox $fr.tar -editable 0 -command [code $this change_target] \ - -width $Width -maxheight 10 + -width $Width -maxheight 10 -bg $::Colors(textbg) # baud rate combobox label $fr.cbl -text [gettext "Baud Rate:"] combobox::combobox $fr.cb -editable 0 -command [code $this change_baud] \ -textvariable [pref varname gdb/load/$target-baud] -width $Width \ - -maxheight 10 + -maxheight 10 -bg $::Colors(textbg) if {[catch {gdb_cmd "show remotebaud"} res]} { set baud [pref get gdb/load/$target-baud] @@ -436,7 +436,7 @@ itcl::body TargetSelection::build_win {} { label $fr.portl -text [gettext "Port:"] combobox::combobox $fr.port -editable $editable \ -textvariable [pref varname gdb/load/$target-port] \ - -width $Width -maxheight 10 + -width $Width -maxheight 10 -bg $::Colors(textbg) # load baud rates into combobox fill_rates diff --git a/gdb/gdbtk/library/tracedlg.tcl b/gdb/gdbtk/library/tracedlg.tcl index f34b8a975a0..25f47e043b2 100644 --- a/gdb/gdbtk/library/tracedlg.tcl +++ b/gdb/gdbtk/library/tracedlg.tcl @@ -1,5 +1,5 @@ # Trace configuration dialog 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 @@ -314,7 +314,8 @@ itcl::class TraceDlg { # New actions combobox::combobox $new_frame.combo -maxheight 15 -editable 0 \ - -font global/fixed -command [code $this set_action_type] + -font global/fixed -command [code $this set_action_type] \ + -bg $::Colors(textbg) $new_frame.combo list insert end collect while-stepping $new_frame.combo entryset collect -- cgit v1.2.1