From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20624 invoked by alias); 19 Mar 2012 12:20:58 -0000 Received: (qmail 20611 invoked by uid 22791); 19 Mar 2012 12:20:56 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,TW_BT,TW_DB X-Spam-Check-By: sourceware.org Received: from outdoor.onevision.de (HELO outdoor.onevision.de) (212.77.172.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 19 Mar 2012 12:20:32 +0000 Received: from sanders.onevision.de (moonrace [212.77.172.62]) by outdoor.onevision.de (8.14.3/8.13.7/ROSCH/DDB) with ESMTP id q2JCKQpu020624 for ; Mon, 19 Mar 2012 13:20:31 +0100 Received: from [192.168.5.32] ([192.168.5.32]) by sanders.onevision.de (Lotus Domino Release 8.5.1FP3) with ESMTP id 2012031913202110-119333 ; Mon, 19 Mar 2012 13:20:21 +0100 Message-ID: <4F672484.6080501@onevision.com> Date: Mon, 19 Mar 2012 12:20:00 -0000 From: Roland Schwingel User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 MIME-Version: 1.0 To: insight@sourceware.org Subject: [PATCH] Fix global preferences Content-Type: multipart/mixed; boundary="------------070201080306020203000709" Mailing-List: contact insight-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: insight-owner@sourceware.org X-SW-Source: 2012-q1/txt/msg00028.txt.bz2 This is a multi-part message in MIME format. --------------070201080306020203000709 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-length: 586 Hi.. When using tk 8.6 global preferences do not open any more. It complains a packing problem. The attached patch fixes it. It is backward compatible to at least tk 8.4. Changelog: 2012-03-19 Roland Schwingel * library/globalpref.itb (_build_win): Remove unneeded debug call. Fix packing of OK/Apply/Cancel buttons for newer tk versions. Small reformatting. Any comments? Is this ok? This is the last patch for today and finishes my patch series for gdbtk for now. Next I will (most likely) cover libgui. Roland --------------070201080306020203000709 Content-Transfer-Encoding: 7bit Content-Type: text/plain; name="pack_globalpref.itb.patch" Content-Disposition: attachment; filename="pack_globalpref.itb.patch" Content-length: 2042 --- gdbtk_orig/library/globalpref.itb 2008-08-03 00:08:32.000000000 +0200 +++ gdbtk/library/globalpref.itb 2012-03-09 16:22:34.047717300 +0100 @@ -77,14 +77,13 @@ # ------------------------------------------------------------------ itcl::body GlobalPref::_build_win {} { global gdbtk_platform GDBTK_LIBRARY - debug frame $itk_interior.f frame $itk_interior.x set frame $itk_interior.f # Icons frame $frame.icons - label $frame.icons.lab -text "Icons " + label $frame.icons.lab -text "Icons: " combobox::combobox $frame.icons.cb -editable 0 -maxheight 10\ -command [code $this _change_icons] -bg $::Colors(textbg) @@ -132,6 +131,7 @@ # can be saved in the init file. A way should be provided # to rescan the font list, without deleting the entry from the # init file. + set font_cache [pref get gdb/font_cache] # get list of fonts, removing some that typically @@ -187,7 +187,6 @@ _make_font_item $f default "Default Font:" $fam _make_font_item $f status "Status Bar Font:" $fam - iwidgets::Labeledframe $frame.misc -labelpos nw -labeltext "Misc" set f [$frame.misc childsite] @@ -249,11 +248,11 @@ } # make buttons - button $itk_interior.x.ok -text OK -underline 0 -width 7 -command [code $this _ok] + button $itk_interior.x.ok -text OK -width 7 -underline 0 -command [code $this _ok] button $itk_interior.x.apply -text Apply -width 7 -underline 0 -command [code $this _apply] button $itk_interior.x.cancel -text Cancel -width 7 -underline 0 -command [code $this _cancel] - pack $itk_interior.x.ok $itk_interior.x.apply $itk_interior.x.cancel -side left standard_button_box $itk_interior.x + pack $itk_interior.x -side left pack $itk_interior.x -fill x -padx 5 -pady 5 -side bottom pack $itk_interior.f -fill both -expand yes -padx 5 -pady 5 @@ -268,7 +267,6 @@ _resize_font_item_height pack propagate $itk_interior.f 0 - } # ------------------------------------------------------------------ # PRIVATE METHOD: _make_font_item --------------070201080306020203000709--