summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/drakfont
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/standalone/drakfont')
-rwxr-xr-xperl-install/standalone/drakfont32
1 files changed, 14 insertions, 18 deletions
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index f9b5e2ad6..998f8c706 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -78,11 +78,9 @@
# directory to install fonts /usr/X11R6/lib/X11/fonts/
# -->> /usr/X11R6/lib/X11/fonts/drakfont
-use Gtk;
use lib qw(/usr/lib/libDrakX );
-use standalone
- ; #- warning, standalone must be loaded very first, for 'explanations'
+use standalone; #- warning, standalone must be loaded very first, for 'explanations'
use interactive;
use my_gtk qw(:helpers :wrappers);
@@ -618,18 +616,18 @@ sub display_error {
sub interactive_mode {
my $font_sel;
$interactive = 1;
- init Gtk;
- my $window1 =
- $::isEmbedded ? new Gtk::Plug($::XID) : new Gtk::Window -toplevel;
- $window1->signal_connect( delete_event => sub { Gtk->exit(0) } );
- $window1->set_position(1);
- $window1->set_title( N("Fonts Importation") );
- $window1->set_border_width(5);
+ my $window1 = my_gtk->new('drakfont');
+ $window1->{rwindow}->signal_connect( delete_event => sub { my_gtk->exit(0) } );
+ unless ($::isEmbedded) {
+ $window1->{rwindow}->set_position(1);
+ $window1->{rwindow}->set_title( N("Fonts Importation") );
+ }
+ $window1->{rwindow}->set_border_width(5);
my ( $pix_user_map, $pix_user_mask ) = gtkcreate_png("ic-drakfont-48");
my ( $pix_u_map, $pix_u_mask ) = gtkcreate_png("drakfont.620x57");
gtkadd(
- $window1,
+ $window1->{window},
gtkpack_(
new Gtk::VBox( 0, 2 ),
if_(
@@ -726,19 +724,17 @@ sub interactive_mode {
),
);
$central_widget = \$font_sel;
- $window1->show_all;
+ $window1->{rwindow}->show_all;
$font_sel->set_page(1);
$font_sel->cur_page->child->hide();
$font_sel->set_page(2);
$font_sel->cur_page->child->hide();
$font_sel->set_page(0);
- $window1->realize;
+ $window1->{rwindow}->realize;
- # $window1->show_all();
- Gtk->main_iteration while Gtk->events_pending;
- $::isEmbedded and kill 'USR2', $::CCPID;
- Gtk->main;
- Gtk->exit(0);
+ # $window1->{rwindow}->show_all();
+ $window1->main;
+ my_gtk->exit(0);
}
sub about {