summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/mygtk2.pm28
-rw-r--r--perl-install/ugtk2.pm27
2 files changed, 32 insertions, 23 deletions
diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm
index ee90cf5c1..68f95e714 100644
--- a/perl-install/mygtk2.pm
+++ b/perl-install/mygtk2.pm
@@ -652,5 +652,33 @@ sub flush() {
Gtk2->main_iteration while Gtk2->events_pending;
}
+sub may_destroy {
+ my ($w) = @_;
+ $w->destroy if $w;
+}
+
+sub root_window() {
+ my $root if 0;
+ $root ||= Gtk2::Gdk->get_default_root_window;
+}
+
+sub rgb2color {
+ my ($r, $g, $b) = @_;
+ my $color = Gtk2::Gdk::Color->new($r, $g, $b);
+ root_window()->get_colormap->rgb_find_color($color);
+ $color;
+}
+
+sub set_root_window_background {
+ my ($r, $g, $b) = @_;
+ my $root = root_window();
+ my $gc = Gtk2::Gdk::GC->new($root);
+ my $color = rgb2color($r, $g, $b);
+ $gc->set_rgb_fg_color($color);
+ $root->set_background($color);
+ my ($w, $h) = $root->get_size;
+ $root->draw_rectangle($gc, 1, 0, 0, $w, $h);
+}
+
1;
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index a15dbda08..014d7f967 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -51,7 +51,7 @@ $border = 5;
# variables, and second, to "see" directly in the code the user interface
# you're building.
-sub gtkdestroy { $_[0] and $_[0]->destroy }
+sub gtkdestroy { mygtk2::may_destroy($_[0]) }
sub gtkflush() { mygtk2::flush() }
sub gtkhide { $_[0]->hide; $_[0] }
sub gtkmove { $_[0]->window->move($_[1], $_[2]); $_[0] }
@@ -146,10 +146,9 @@ sub gtkradio {
map { gtkset_active($radio = Gtk2::RadioButton->new_with_label($radio ? $radio->get_group : undef, $_), $_ eq $def) } @_;
}
-sub gtkroot() {
- my $root if 0;
- $root ||= Gtk2::Gdk->get_default_root_window;
-}
+sub gtkroot() { mygtk2::root_window() }
+sub gtkcolor { &mygtk2::rgb2color }
+sub gtkset_background { &mygtk2::set_root_window_background }
sub gtkset_text {
my ($w, $s) = @_;
@@ -814,24 +813,6 @@ sub wrap_paragraph {
return @lines;
}
-sub gtkcolor {
- my ($r, $g, $b) = @_;
- my $color = Gtk2::Gdk::Color->new($r, $g, $b);
- gtkroot()->get_colormap->rgb_find_color($color);
- $color;
-}
-
-sub gtkset_background {
- my ($r, $g, $b) = @_;
- my $root = gtkroot();
- my $gc = Gtk2::Gdk::GC->new($root);
- my $color = gtkcolor($r, $g, $b);
- $gc->set_rgb_fg_color($color);
- $root->set_background($color);
- my ($w, $h) = $root->get_size;
- $root->draw_rectangle($gc, 1, 0, 0, $w, $h);
-}
-
# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---
# toplevel window creation helper