From 2e85aae1209b336df1a63329d9094f6b02fda18a Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Fri, 2 Aug 2002 13:18:33 +0000 Subject: move interactive::gtk::exit to my_gtk::exit so that my_gtk apps can call it (and fix busy mouse cursor problem that way) --- perl-install/interactive/gtk.pm | 7 +------ perl-install/my_gtk.pm | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index d96b769d7..b4d41edfb 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -19,12 +19,7 @@ sub new { sub enter_console { my ($o) = @_; $o->{suspended} = common::setVirtual(1) } sub leave_console { my ($o) = @_; common::setVirtual(delete $o->{suspended}) } -sub exit { - gtkset_mousecursor_normal(); #- for restoring a normal in any case on standalone - my_gtk::flush(); - $::isEmbedded and kill 10, $::CCPID; #10 is USR1 - c::_exit($_[1]) #- workaround -} +sub exit { my_gtk::exit @_ } sub ask_warn { local $my_gtk::pop_it = 1; diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index c6736fcf5..a672c2421 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -134,6 +134,12 @@ sub sync { flush(); } sub flush { gtkflush() } +sub exit { + gtkset_mousecursor_normal(); #- for restoring a normal in any case + flush(); + $::isEmbedded and kill USR1, $::CCPID; + c::_exit($_[1]) #- workaround +} #-############################################################################### #- createXXX functions -- cgit v1.2.1