diff options
Diffstat (limited to 'perl-install')
-rw-r--r-- | perl-install/interactive/gtk.pm | 4 | ||||
-rw-r--r-- | perl-install/mygtk3.pm | 6 | ||||
-rwxr-xr-x | perl-install/standalone/drakclock | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index b54813bb0..357843f21 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -939,7 +939,7 @@ sub wait_messageW { } sub wait_message_nextW { my ($_o, $message, $Window) = @_; - return if $message eq $Window->{wait_messageW}->get_text; #- needed otherwise no expose_event :( + return if $message eq $Window->{wait_messageW}->get_text; #- needed otherwise no draw :( $Window->{displayed} = 0; $Window->{wait_messageW}->set($message); mygtk3::sync($Window) while !$Window->{displayed}; @@ -962,7 +962,7 @@ sub wait_message_with_progress_bar { my $progress = gtknew('ProgressBar'); my $w = $in->wait_message($o_title, $progress); my $displayed; - $progress->signal_connect(expose_event => sub { $displayed = 1; 0 }); + $progress->signal_connect(draw => sub { $displayed = 1; 0 }); $w, sub { my ($msg, $current, $total) = @_; if ($msg) { diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 318555786..b9a8eaefd 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -116,7 +116,7 @@ sub _gtk { $w->grab_focus if delete $opts->{grab_focus}; $w->set_padding(@{delete $opts->{padding}}) if exists $opts->{padding}; $w->set_sensitive(delete $opts->{sensitive}) if exists $opts->{sensitive}; - $w->signal_connect(expose_event => delete $opts->{expose_event}) if exists $opts->{expose_event}; + $w->signal_connect(draw => delete $opts->{draw}) if exists $opts->{draw}; $w->signal_connect(realize => delete $opts->{realize}) if exists $opts->{realize}; (delete $opts->{size_group})->add_widget($w) if $opts->{size_group}; if (my $tip = delete $opts->{tip}) { @@ -342,7 +342,7 @@ sub _gtk__Image { my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); $w->set_size_request($width, $height); $w->{pixbuf} = $pixbuf; - $w->signal_connect(expose_event => sub { + $w->signal_connect(draw => sub { my (undef, $event) = @_; if (!$w->{x}) { my $alloc = $w->get_allocation; @@ -1481,7 +1481,7 @@ sub flush() { sub enable_sync_flush { my ($w) = @_; - $w->signal_connect(expose_event => sub { $w->{displayed} = 1; 0 }); + $w->signal_connect(draw => sub { $w->{displayed} = 1; 0 }); } sub sync_flush { diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index 369cdd5d9..6965d6b91 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -191,7 +191,7 @@ if (-e $ntpfile && is_ntp_daemon_running()) { my $pressed; $drawing_area->set_events([ 'button_press_mask', 'button_release_mask', "pointer_motion_mask" ]); -$drawing_area->signal_connect(expose_event => \&expose_event); +$drawing_area->signal_connect(draw => \&draw); $drawing_area->signal_connect(realize => sub { my $window = $drawing_area->get_window; $pixmap = Gtk3::Gdk::Pixmap->new($window, @image_size, $window->get_depth); @@ -313,7 +313,7 @@ sub determine_radian { $r; } -sub expose_event { +sub draw { my ($widget, $event) = @_; my ($x, $y, $width, $height) = $event->area->values; $widget->get_window->draw_drawable($widget->style->fg_gc('normal'), $pixmap, $x, $y, $x, $y, $width, $height); |