Update bogus font names and scrollbar protocol (items.pl)

15 files changed, 20 insertions, 21 deletions

diff --git a/Perl/demos/Tk/demos/zinc_lib/atomic-groups.pl b/Perl/demos/Tk/demos/zinc_lib/atomic-groups.pl
index bab6b5f..67c019c 100644
--- a/Perl/demos/Tk/demos/zinc_lib/atomic-groups.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/atomic-groups.pl
@@ -13,7 +13,7 @@ use Tk::Checkbutton;
 use Tk::Label;
 use strict;
 
-my $defaultfont = '-adobe-helvetica-bold-r-normal-*-120-*-*-*-*-*-*';
+my $defaultfont = '-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*';
 my $mw = MainWindow->new();
 my $zinc = $mw->Zinc(-width => 500, -height => 350,
 		     -font => "10x20", # usually fonts are sets in resources
diff --git a/Perl/demos/Tk/demos/zinc_lib/clipping.pl b/Perl/demos/Tk/demos/zinc_lib/clipping.pl
index 8b74894..4a320e0 100644
--- a/Perl/demos/Tk/demos/zinc_lib/clipping.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/clipping.pl
@@ -12,7 +12,7 @@ package clipping;
 use vars qw( $VERSION );
 ($VERSION) = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
 
-my $defaultfont = '-adobe-helvetica-bold-r-normal-*-120-*-*-*-*-*-*';
+my $defaultfont = '-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*';
 my $mw = MainWindow->new();
 my $zinc = $mw->Zinc(-width => 700, -height => 600,
 		     -font => "10x20", # usually fonts are sets in resources
diff --git a/Perl/demos/Tk/demos/zinc_lib/color-circular.pl b/Perl/demos/Tk/demos/zinc_lib/color-circular.pl
index a370c39..1ee1638 100644
--- a/Perl/demos/Tk/demos/zinc_lib/color-circular.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/color-circular.pl
@@ -9,7 +9,7 @@ use Tk;
 use Tk::Zinc;
 use strict;
 
-my $defaultfont = '-adobe-helvetica-bold-r-normal-*-120-*-*-*-*-*-*';
+my $defaultfont = '-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*';
 my $mw = MainWindow->new();
 my $zinc = $mw->Zinc(-width => 700, -height => 600,
 		     -borderwidth => 3, -relief => 'sunken',
diff --git a/Perl/demos/Tk/demos/zinc_lib/color-path-and-conic.pl b/Perl/demos/Tk/demos/zinc_lib/color-path-and-conic.pl
index 18c5356..264811f 100644
--- a/Perl/demos/Tk/demos/zinc_lib/color-path-and-conic.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/color-path-and-conic.pl
@@ -9,7 +9,7 @@ use Tk;
 use Tk::Zinc;
 use strict;
 
-my $defaultfont = '-adobe-helvetica-bold-r-normal-*-120-*-*-*-*-*-*';
+my $defaultfont = '-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*';
 my $mw = MainWindow->new();
 my $zinc = $mw->Zinc(-width => 700, -height => 600,
 		     -borderwidth => 3, -relief => 'sunken',
diff --git a/Perl/demos/Tk/demos/zinc_lib/color-x.pl b/Perl/demos/Tk/demos/zinc_lib/color-x.pl
index c914c4b..ca6dcb5 100644
--- a/Perl/demos/Tk/demos/zinc_lib/color-x.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/color-x.pl
@@ -9,7 +9,7 @@ use Tk;
 use Tk::Zinc;
 use strict;
 
-my $defaultfont = '-adobe-helvetica-bold-r-normal-*-120-*-*-*-*-*-*';
+my $defaultfont = '-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*';
 my $mw = MainWindow->new();
 my $zinc = $mw->Zinc(-width => 700, -height => 600,
 		     -borderwidth => 3, -relief => 'sunken',
diff --git a/Perl/demos/Tk/demos/zinc_lib/color-y.pl b/Perl/demos/Tk/demos/zinc_lib/color-y.pl
index bc45ebd..b33f269 100644
--- a/Perl/demos/Tk/demos/zinc_lib/color-y.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/color-y.pl
@@ -9,7 +9,7 @@ use Tk;
 use Tk::Zinc;
 use strict;
 
-my $defaultfont = '-adobe-helvetica-bold-r-normal-*-120-*-*-*-*-*-*';
+my $defaultfont = '-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*';
 my $mw = MainWindow->new();
 my $zinc = $mw->Zinc(-width => 700, -height => 600,
 		     -borderwidth => 3, -relief => 'sunken',
diff --git a/Perl/demos/Tk/demos/zinc_lib/icon_zoom_resize.pl b/Perl/demos/Tk/demos/zinc_lib/icon_zoom_resize.pl
index b34d121..1274ffc 100644
--- a/Perl/demos/Tk/demos/zinc_lib/icon_zoom_resize.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/icon_zoom_resize.pl
@@ -12,7 +12,7 @@ use Tk::Zinc;
 use strict;
 
 
-my $defaultfont = '-adobe-helvetica-bold-r-normal-*-140-*-*-*-*-*-*';
+my $defaultfont = '-adobe-helvetica-bold-r-normal--*-140-*-*-*-*-*-*';
 my $mw = MainWindow->new();
 my $text = $mw->Scrolled(qw/Text -relief sunken -borderwidth 2 -setgrid true
 	      -height 7 -scrollbars ''/);
diff --git a/Perl/demos/Tk/demos/zinc_lib/items.pl b/Perl/demos/Tk/demos/zinc_lib/items.pl
index 067368b..d092924 100644
--- a/Perl/demos/Tk/demos/zinc_lib/items.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/items.pl
@@ -9,14 +9,13 @@ use Tk;
 use Tk::Zinc;
 use strict;
 
-my $defaultfont = '-adobe-helvetica-bold-r-normal-*-120-*-*-*-*-*-*';
+my $defaultfont = '-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*';
 my $mw = MainWindow->new();
-my $zinc = $mw->Zinc(-width => 700, -height => 600,
-		     -font => "10x20", # usually fonts are sets in resources
-		                       # but for this example it is set in the code!
-		     -borderwidth => 3, -relief => 'sunken',
-#		     -render => 1,
-		     )->pack;
+my $zinc = $mw->Scrolled('Zinc', -width => 700, -height => 600,
+			 -font => '10x20', -borderwidth => 3,
+			 -relief => 'sunken', -scrollbars => 'se',
+			 -scrollregion => [-100, 0, 1000, 1000]);
+$zinc->pack(-expand => 'yes', -fill => 'both');
 
 $zinc->add('rectangle', 1, [10,10, 100, 50], -fillcolor => "green", -filled => 1,
 	    -linewidth => 10, -relief => "roundridge", -linecolor => "darkgreen");
diff --git a/Perl/demos/Tk/demos/zinc_lib/lines.pl b/Perl/demos/Tk/demos/zinc_lib/lines.pl
index f415329..5469404 100644
--- a/Perl/demos/Tk/demos/zinc_lib/lines.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/lines.pl
@@ -9,7 +9,7 @@ use Tk;
 use Tk::Zinc;
 use strict;
 
-my $defaultfont = '-adobe-helvetica-bold-r-normal-*-120-*-*-*-*-*-*';
+my $defaultfont = '-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*';
 my $mw = MainWindow->new();
 my $zinc = $mw->Zinc(-width => 700, -height => 600,
 		     -font => "10x20", # usually fonts are sets in resources
diff --git a/Perl/demos/Tk/demos/zinc_lib/mapinfo.pl b/Perl/demos/Tk/demos/zinc_lib/mapinfo.pl
index 6518c4d..f6dc46e 100644
--- a/Perl/demos/Tk/demos/zinc_lib/mapinfo.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/mapinfo.pl
@@ -10,7 +10,7 @@ use Tk::Zinc;
 use strict;
 
 
-my $defaultfont = '-adobe-helvetica-bold-r-normal-*-120-*-*-*-*-*-*';
+my $defaultfont = '-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*';
 my $mw = MainWindow->new();
 
 ###########################################
diff --git a/Perl/demos/Tk/demos/zinc_lib/rotation.pl b/Perl/demos/Tk/demos/zinc_lib/rotation.pl
index f155e49..c5549bf 100644
--- a/Perl/demos/Tk/demos/zinc_lib/rotation.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/rotation.pl
@@ -13,7 +13,7 @@ use constant;
 
 my constant $PI=3.1416;
 
-my $defaultfont = '-adobe-helvetica-bold-r-normal-*-120-*-*-*-*-*-*';
+my $defaultfont = '-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*';
 my $mw = MainWindow->new();
 
 
diff --git a/Perl/demos/Tk/demos/zinc_lib/tkZincLogo.pl b/Perl/demos/Tk/demos/zinc_lib/tkZincLogo.pl
index 86f419f..8e3ca9d 100644
--- a/Perl/demos/Tk/demos/zinc_lib/tkZincLogo.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/tkZincLogo.pl
@@ -13,7 +13,7 @@ use Tk::Zinc;
 use strict;
 use Tk::Zinc::Logo; # this module implements a class which instances are Zinc logo!
 
-my $defaultfont = '-adobe-helvetica-bold-r-normal-*-140-*-*-*-*-*-*';
+my $defaultfont = '-adobe-helvetica-bold-r-normal--*-140-*-*-*-*-*-*';
 my $mw = MainWindow->new();
 my $text = $mw->Scrolled(qw/Text -relief sunken -borderwidth 2 -setgrid true
 	      -height 7 -scrollbars ''/);
diff --git a/Perl/demos/Tk/demos/zinc_lib/translation.pl b/Perl/demos/Tk/demos/zinc_lib/translation.pl
index 157ded8..f6abb15 100644
--- a/Perl/demos/Tk/demos/zinc_lib/translation.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/translation.pl
@@ -11,7 +11,7 @@ use Tk::Zinc;
 use strict;
 
 
-my $defaultfont = '-adobe-helvetica-bold-r-normal-*-120-*-*-*-*-*-*';
+my $defaultfont = '-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*';
 my $mw = MainWindow->new();
 
 ###########################################
diff --git a/Perl/demos/Tk/demos/zinc_lib/triangles.pl b/Perl/demos/Tk/demos/zinc_lib/triangles.pl
index ed1d4cd..2dfba41 100644
--- a/Perl/demos/Tk/demos/zinc_lib/triangles.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/triangles.pl
@@ -10,7 +10,7 @@ use Tk::Zinc;
 use strict;
 
 
-my $defaultfont = '-adobe-helvetica-bold-r-normal-*-120-*-*-*-*-*-*';
+my $defaultfont = '-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*';
 my $mw = MainWindow->new();
 my $zinc = $mw->Zinc(-width => 700, -height => 300,
 		     -font => "10x20", # usually fonts are sets in resources
diff --git a/Perl/demos/Tk/demos/zinc_lib/zoom.pl b/Perl/demos/Tk/demos/zinc_lib/zoom.pl
index ba63d96..a1ad925 100644
--- a/Perl/demos/Tk/demos/zinc_lib/zoom.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/zoom.pl
@@ -11,7 +11,7 @@ use Tk::Zinc;
 use strict;
 
 
-my $defaultfont = '-adobe-helvetica-bold-r-normal-*-120-*-*-*-*-*-*';
+my $defaultfont = '-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*';
 my $mw = MainWindow->new();
 
 ###########################################