convert from mygtk2 to ugtk2

(needed for next commits)

5 files changed, 11 insertions, 11 deletions

diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 1e715d0a8..04db5ffd1 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -278,17 +278,17 @@ sub reallyChooseDesktop {
 
                 my $wp = ugtk2->new($title{$val->[0]}, transient => $w->{real_window}, modal => 1);
                 gtkadd($wp->{rwindow},
-                       gtkpack_(Gtk2::VBox->new,
+                       gtknew('VBox', children => [
                                 0, gtknew('Title2', label => N("Here's a preview of the '%s' desktop.", $val->[1]),
                                           # workaround infamous 6 years old gnome bug #101968:
                                           width => mygtk2::get_label_width(), 
                                       ),
                                 1, gtknew('Image', file => "desktop-$val->[0]-big"),
-                                0, Gtk2::HSeparator->new,
-                                0, gtkpack(create_hbox('end'),
+                                0, gtknew('HSeparator'),
+                                0, gtknew('HButtonBox', layout => 'end', children_loose => [
                                            gtknew('Button', text => N("Close"), clicked => sub { Gtk2->main_quit })
-                                       ),
-                            ),
+                                       ]),
+                            ]),
                    );
                 $wp->{real_window}->set_size_request(-1, -1);
                 $wp->{real_window}->grab_focus;
@@ -350,7 +350,7 @@ sub reallyChooseGroups {
                         0, gtknew('CheckButton', text => N("Individual package selection"), active_ref => $individual),
                     ),
 		    0, $w_size,
-		    0, Gtk2::HSeparator->new,
+		    0, gtknew('HSeparator'),
 		    0, gtknew('HButtonBox', layout => 'edge', children_tight => [
                         gtknew('Install_Button', text => N("Help"), clicked => sub {
                                    interactive::gtk::display_help($o, { interactive_help_id => 'choosePackageGroups' }) }),
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 47e4de3aa..fec394ce3 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -78,7 +78,7 @@ sub run_boot_window {
 
     my $w = ugtk2->new($title);
     my $window = $w->{window};
-    mygtk2::register_main_window($w->{real_window});
+    mygtk3::register_main_window($w->{real_window});
 
     $window->signal_connect(delete_event => sub { ugtk2->exit(0) });
     unless ($::isEmbedded) {
diff --git a/perl-install/standalone/drakdvb b/perl-install/standalone/drakdvb
index 2c5f3484a..ce735cafa 100755
--- a/perl-install/standalone/drakdvb
+++ b/perl-install/standalone/drakdvb
@@ -31,7 +31,7 @@ my $title = N("DVB");
 $ugtk2::wm_icon = "/usr/share/mcc/themes/default/tv-mdk.png";
 my $w = ugtk2->new($title);
 $w->{window}->signal_connect('destroy' => \&exitapp);
-mygtk2::register_main_window($w->{real_window});
+mygtk3::register_main_window($w->{real_window});
 my $in = 'interactive'->vnew;
 
 my $config_file = "$ENV{HOME}/.mplayer/channels.conf";
diff --git a/perl-install/standalone/drakups b/perl-install/standalone/drakups
index b5baee934..8524daf2a 100755
--- a/perl-install/standalone/drakups
+++ b/perl-install/standalone/drakups
@@ -328,7 +328,7 @@ if (member('--wizard', @ARGV)) {
 
 $w = ugtk2->new(N("UPS Management"));
 if (!$::isEmbedded) {
-    mygtk2::register_main_window($w->{real_window});
+    mygtk3::register_main_window($w->{real_window});
     $w->{window}->set_size_request(500, 550);
     $w->{rwindow}->set_title(N("DrakUPS"));
 }
diff --git a/perl-install/unused/migrate-ugtk2-to-mygtk2.pl b/perl-install/unused/migrate-ugtk2-to-mygtk2.pl
index ccd0faaee..620ff4578 100755
--- a/perl-install/unused/migrate-ugtk2-to-mygtk2.pl
+++ b/perl-install/unused/migrate-ugtk2-to-mygtk2.pl
@@ -200,8 +200,8 @@ sub dorepl_new {
 }
 
 sub dorepl {
-    s/gtkdestroy\(/mygtk2::may_destroy(/ ||
-    s/gtkset_background\(/mygtk2::set_root_window_background(/ ||
+    s/gtkdestroy\(/mygtk3::may_destroy(/ ||
+    s/gtkset_background\(/mygtk3::set_root_window_background(/ ||
     s/gtkset_tip\($re,\s*($re),\s*($re)\)/gtkset($1, tip => $2)/ ||
     s/gtkset_size_request\(($re),\s*($re), ($re)\)/"gtkset($1" . ($2 && $2 ne '-1' ? ", width => $2" : '') . ($3 && $3 ne '-1'  ? ", height => $3" : '') . ')'/e ||
     s/gtkset_(modal)\(($re),\s*($re)\)/gtkset($2, $1 => $3)/ ||