import Tk 804.025_beta9 from CPAN

git-cpan-module:   Tk
git-cpan-version:  804.025_beta9
git-cpan-authorid: NI-S
git-cpan-file:     authors/id/N/NI/NI-S/Tk-804.025_beta9.tar.gz

Canvas/Canvas.xs

@@ -28,7 +28,7 @@ void
 canvas(...)
 CODE:
  {
-  XSRETURN(XSTkCommand(cv,1,Tk_CanvasObjCmd,items,&ST(0)));
+  TKXSRETURN(XSTkCommand(cv,1,Tk_CanvasObjCmd,items,&ST(0)));
  }
 
 

Change.log

@@ -1,3 +1,53 @@
+Change 3032 on 2003/12/10 by nick@llama
+
+	Makefile generation tweaks:
+	  Perl's %Config can have leading/trailing spaces
+	  Try propagating perl's values to CFLAGs for JPEG/jpeg/configure
+
+Change 3031 on 2003/12/10 by nick@llama
+
+	Steve's patch for slaves with test etc.
+	(In respnse to report from Christoph Fuchs <[email protected]>)
+
+Change 3030 on 2003/12/10 by nick@llama
+
+	Re-engineer TkFontGet(Points|Pixels) to take a Screen *
+	rather an a tkwin. Tk_Font has one of those, and is all they
+	need. So now Tk_PostscriptFontName() can return points correctly
+	without help or change to public Tk_Xxx API.
+
+Change 3029 on 2003/12/10 by nick@llama
+
+	Slaven's test fixes for font issues.
+
+Change 3028 on 2003/12/10 by nick@llama
+
+	Slaven's FBox as directory chooser patch (thanks)
+
+Change 3027 on 2003/12/10 by nick@llama
+
+	Spelling of dependencies patch from RT.
+
+Change 3026 on 2003/12/09 by nick@llama
+
+	Fix XSRETURN(Function()) properly
+
+Change 3025 on 2003/12/09 by nick@llama
+
+	Specimen XSRETURN(Functtion()) that was segfulting on
+	Steve's G5. 'grep' shows More to come ...
+
+Change 3024 on 2003/12/08 by nick@llama
+
+	Slaven's patches:
+	 TkTest.pm and use in listbox.t for float epsilon
+	 Add ->geometry to all test files.
+	 ProgressBar fix
+
+Change 3023 on 2003/12/07 by nick@llama
+
+	Update Change.log
+
 Change 3019 on 2003/12/06 by nick@camel
 
 	MinGW libpng makefile was not checked in or in MANIFEST

Entry/Entry.xs

@@ -24,14 +24,14 @@ void
 entry(...)
 CODE:
  {
-  XSRETURN(XSTkCommand(cv,0,Tk_EntryObjCmd,items,&ST(0)));
+  TKXSRETURN(XSTkCommand(cv,0,Tk_EntryObjCmd,items,&ST(0)));
  }
 
 void
 spinbox(...)
 CODE:
  {
-  XSRETURN(XSTkCommand(cv,0,Tk_SpinboxObjCmd,items,&ST(0)));
+  TKXSRETURN(XSTkCommand(cv,0,Tk_SpinboxObjCmd,items,&ST(0)));
  }
 
 PROTOTYPES: DISABLE

HList/HList.xs

@@ -31,7 +31,7 @@ void
 hlist(...)
 CODE:
  {
-  XSRETURN(XSTkCommand(cv,1,Tix_HListCmd,items,&ST(0)));
+  TKXSRETURN(XSTkCommand(cv,1,Tix_HListCmd,items,&ST(0)));
  }
 
 BOOT:

INSTALL

@@ -30,7 +30,7 @@ separately:
 
 perl Makefile.PL X11INC=/usr/local/share/X11R5/include X11LIB=/usr/local/arch/X11R5/lib
 
-'make test' is a little tedious as it re-checks all the dependancies.
+'make test' is a little tedious as it re-checks all the dependencies.
 
 perl -Mblib demos/widget
 

InputO/InputO.xs

@@ -31,7 +31,7 @@ void
 inputo(...)
 CODE:
  {
-  XSRETURN(XSTkCommand(cv,1,Tix_InputOnlyCmd,items,&ST(0)));
+  TKXSRETURN(XSTkCommand(cv,1,Tix_InputOnlyCmd,items,&ST(0)));
  }
 
 BOOT:

JPEG/jpeg/Makefile.maybe

@@ -31,6 +31,7 @@ if ($^O eq 'MSWin32')
 else
  {
   $ENV{CC} = $Config{cc};
+  local $ENV{CFLAGS} = "$Config{ccflags} $Config{cccdlflags}";
   system("./configure");
  }
 1;

Listbox/Listbox.xs

@@ -27,7 +27,7 @@ void
 listbox(...)
 CODE:
  {
-  XSRETURN(XSTkCommand(cv,0,Tk_ListboxObjCmd,items,&ST(0)));
+  TKXSRETURN(XSTkCommand(cv,0,Tk_ListboxObjCmd,items,&ST(0)));
  }
 
 BOOT:

MANIFEST

@@ -1859,6 +1859,7 @@ t/regexp.t
 t/Require.t
 t/Trace.t
 t/trace1.t
+t/slaves.t
 t/widget.t
 t/wm-time.t
 t/X.t

Menubutton/Menubutton.xs

@@ -26,7 +26,7 @@ void
 menubutton(...)
 CODE:
  {
-  XSRETURN(XSTkCommand(cv,0,Tk_MenubuttonObjCmd,items,&ST(0)));
+  TKXSRETURN(XSTkCommand(cv,0,Tk_MenubuttonObjCmd,items,&ST(0)));
  }
 
 BOOT:

NBFrame/NBFrame.xs

@@ -31,7 +31,7 @@ void
 nbframe(...)
 CODE:
  {
-  XSRETURN(XSTkCommand(cv,1,Tix_NoteBookFrameCmd,items,&ST(0)));
+  TKXSRETURN(XSTkCommand(cv,1,Tix_NoteBookFrameCmd,items,&ST(0)));
  }
 
 

Scale/Scale.xs

@@ -26,7 +26,7 @@ void
 scale(...)
 CODE:
  {
-  XSRETURN(XSTkCommand(cv,0,Tk_ScaleObjCmd,items,&ST(0)));
+  TKXSRETURN(XSTkCommand(cv,0,Tk_ScaleObjCmd,items,&ST(0)));
  }
 
 BOOT:

Scrollbar/Scrollbar.xs

@@ -30,7 +30,7 @@ void
 scrollbar(...)
 CODE:
  {
-  XSRETURN(XSTkCommand(cv,1,Tk_ScrollbarCmd,items,&ST(0)));
+  TKXSRETURN(XSTkCommand(cv,1,Tk_ScrollbarCmd,items,&ST(0)));
  }
 
 BOOT:

TList/TList.xs

@@ -31,7 +31,7 @@ void
 tlist(...)
 CODE:
  {
-  XSRETURN(XSTkCommand(cv,1,Tix_TListCmd,items,&ST(0)));
+  TKXSRETURN(XSTkCommand(cv,1,Tix_TListCmd,items,&ST(0)));
  }
 
 BOOT:

Text/Text.xs

@@ -26,7 +26,7 @@ void
 text(...)
 CODE:
  {
-  XSRETURN(XSTkCommand(cv,1,Tk_TextCmd,items,&ST(0)));
+  TKXSRETURN(XSTkCommand(cv,1,Tk_TextCmd,items,&ST(0)));
  }
 
 BOOT:

TixGrid/TixGrid.xs

@@ -31,7 +31,7 @@ void
 tixGrid(...)
 CODE:
  {
-  XSRETURN(XSTkCommand(cv,1,Tix_GridCmd,items,&ST(0)));
+  TKXSRETURN(XSTkCommand(cv,1,Tix_GridCmd,items,&ST(0)));
  }
 
 

Tk.xs

@@ -461,7 +461,7 @@ SV *	name;
 CODE:
  {
   Lang_CmdInfo *info = WindowCommand(widget, NULL, 1);
-  XSRETURN(Call_Tk(info, items, &ST(0)));
+  TKXSRETURN(Call_Tk(info, items, &ST(0)));
  }
 
 void

Tk/FBox.pm

@@ -39,7 +39,7 @@ require Tk::Toplevel;
 use strict;
 use vars qw($VERSION $updirImage $folderImage $fileImage);
 
-$VERSION = sprintf '4.%03d', q$Revision: #16 $ =~ /\D(\d+)\s*$/;
+$VERSION = sprintf '4.%03d', q$Revision: #17 $ =~ /\D(\d+)\s*$/;
 
 use base qw(Tk::Toplevel);
 
@@ -106,7 +106,7 @@ EOF
     $dirMenu->pack(-expand => 'yes', -fill => 'both', -padx => 4);
 
     $w->{'icons'} = my $icons =
-      $w->IconList(-command => ['OkCmd', $w],
+      $w->IconList(-command => ['OkCmd', $w, 'iconlist'],
 		  );
     $icons->bind('<<ListboxSelect>>' => [$w, 'ListBrowse']);
 
@@ -441,8 +441,10 @@ sub Update {
 	} else {
 	    $flt = _rx_to_glob($flt);
 	}
+	my $type_dir = $w->cget(-type) eq 'dir';
 	foreach my $f (sort $sortcmd readdir(FDIR)) {
 	    next if $f eq '.' or $f eq '..';
+	    next if $type_dir && ! -d "$cwd/$f"; # XXX use File::Spec?
 	    if ($fltcb) {
 		next if !$fltcb->($w, $f, $cwd);
 	    } else {
@@ -786,22 +788,23 @@ sub TclFileSplit {
 #
 sub OkCmd {
     my $w = shift;
+    my $from = shift || "button";
 
     my $filenames = [];
     for my $item ($w->{'icons'}->Curselection) {
 	push @$filenames, $w->{'icons'}->Get($item);
     }
 
-    if ((@$filenames && !$w->cget('-multiple')) ||
+    if ($w->cget('-type') eq 'dir' && $from ne "iconlist") {
+	$w->Done($w->{'selectPath'});
+    } elsif ((@$filenames && !$w->cget('-multiple')) ||
 	($w->cget('-multiple') && @$filenames == 1)) {
 	my $filename = $filenames->[0];
 	my $file = JoinFile($w->{'selectPath'}, $filename);
 	if (-d $file) {
 	    $w->ListInvoke($filename);
 	    return;
 	}
-    } elsif ($w->cget('-type') eq 'dir') {
-	$w->Done($w->{'selectPath'});
     }
 
     $w->ActivateEnt;

Tk/MMutil.pm

@@ -9,7 +9,7 @@ use Carp;
 use File::Basename;
 
 use vars qw($VERSION);
-$VERSION = sprintf '4.%03d', q$Revision: #19 $ =~ /\D(\d+)\s*$/;
+$VERSION = sprintf '4.%03d', q$Revision: #20 $ =~ /\D(\d+)\s*$/;
 
 # warn __FILE__." $VERSION\n";
 
@@ -60,13 +60,13 @@ sub mTk_postamble
  my ($self) = @_;
  my $dep = "config :: \$(C_FILES) \$(H_FILES)\n\t$self->{NOECHO}\$(NOOP)\n";
  my $mTk = $self->{'MTK'};
- $dep .= "# Begin Munging dependancies\n";
+ $dep .= "# Begin Munging dependencies\n";
  foreach my $file (sort keys %$mTk)
   {
    $dep .= "$file : ".$mTk->{$file}." \$(TKDIR)/pTk/Tcl-pTk\n";
    $dep .= "\t\$(PERL) \$(TKDIR)/pTk/Tcl-pTk ".$mTk->{$file}." $file\n";
   }
- $dep .= "# End Munging dependancies\n\n";
+ $dep .= "# End Munging dependencies\n\n";
  return $dep;
 }
 

Tk/MakeDepend.pm

@@ -11,7 +11,7 @@ $SIG{__DIE__} = \&Carp::confess;
 
 
 use vars qw($VERSION);
-$VERSION = sprintf '4.%03d', q$Revision: #10 $ =~ /\D(\d+)\s*$/;
+$VERSION = sprintf '4.%03d', q$Revision: #12 $ =~ /\D(\d+)\s*$/;
 
 sub scan_file;
 
@@ -211,7 +211,9 @@ sub command_line
   {
    unshift(@files,pop(@_));
   }
- foreach (@_, split(/\s+/,$Config{ccflags}))
+ my $flags = $Config{ccflags};
+ $flags =~ s/^\s+|\s+$//g;
+ foreach (@_, split(/\s+/,$flags))
   {
    if (/^-I(.*)$/)
     {
@@ -254,7 +256,7 @@ sub command_line
    my $base = $1;
    my $file = $_;
    my %dep;
-   warn "Finding dependancies for $file\n";
+   warn "Finding dependencies for $file\n";
    scan_file($_,\%dep);
    my $str = "\n$base\$(OBJ_EXT) : $base.c";
    delete $dep{$file};

Tk/ProgressBar.pm

@@ -1,10 +1,11 @@
 package Tk::ProgressBar;
 
 use vars qw($VERSION);
-$VERSION = '4.008'; # $Id: //depot/Tkutf8/Tk/ProgressBar.pm#9 $
+$VERSION = sprintf '4.%03d', q$Revision: #10 $ =~ /\D(\d+)\s*$/;
 
 use Tk;
 use Tk::Canvas;
+use Tk::Trace;
 use Carp;
 use strict;
 
@@ -296,27 +297,27 @@ sub value {
 
 sub variable {
     my $c = shift;
-    my $val = \$c->{'-variable'};
-    my $old = $$val;
+    my $oldvarref = $c->{'-variable'};
+    my $oldval = $$oldvarref if $oldvarref;
     if(@_) {
-	my $value = shift;
-        if (ref $old)
+	my $varref = shift;
+        if ($oldvarref)
          {
-          $c->{'-value'} = $$old;
-          untie $$old if tied($$old);
+	  $c->traceVdelete($oldvarref);
          }
-        tie $$value,'Tk::Configure',$c,'-value';
-	$$val = $value;
+	$c->{'-variable'} = $varref;
+	$c->traceVariable($varref, 'w', sub { $c->value($_[1]) });
+	$$varref = $oldval;
 	_layoutRequest($c,2);
     }
-    $old;
+    $oldval;
 }
 
 sub Destroyed
 {
  my $c = shift;
  my $var = delete $c->{'-variable'};
- untie $$var if (defined($var) && ref($var))
+ $c->traceVdelete($var);
 }
 
 1;

demos/demos/widget_lib/trace2.pl

@@ -21,7 +21,7 @@ sub Populate {
 
     $self->OnDestroy( sub {
 	my $vref = $self->{_vref};
-	$self->traceVdelete ( $self->{_vref} ) if defined $vref;
+	$self->traceVdelete ( $vref ) if defined $vref;
     } );
 
 } # end Populate
@@ -168,7 +168,7 @@ =head1 ADVERTISED SUBWIDGETS
 
 =head1 EXAMPLE
 
- $thumb = $mw->TraceText( -textvariabel => \$scalar );
+ my $tt = $mw->TraceText( -textvariable => \$scalar );
 
 =head1 AUTHOR
 

pTk/Makefile.PL

@@ -20,7 +20,7 @@ Tk::MMutil::TkExtMakefile(
 sub MY::top_targets {
  my ($self) = @_;
  local $_ = $self->MM::top_targets;
- s/^(\$\(O_FILES\)\s*:.*)$/# Explicit dependancies provided\n# $1/m;
+ s/^(\$\(O_FILES\)\s*:.*)$/# Explicit dependencies provided\n# $1/m;
  return $_;
 }