switch from deprecated OptionMenu into new ComboBox widget

1 files changed, 13 insertions, 13 deletions

diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index 08532c12f..a035c5ba4 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -1596,7 +1596,7 @@ sub advanced_where_net_types {
 	 			0, my $check_where_use_net = new Gtk2::CheckButton(N("Use network connection to backup")),
 				1, new Gtk2::HBox(0,10),
 	 			0, new Gtk2::Label(N("Net Method:")),
-	 			0, gtkset_sensitive(my $entry_net_type = new Gtk2::OptionMenu(), $conf{USE_NET}),
+	 			0, gtkset_sensitive(my $entry_net_type = Gtk2::ComboBox->new_text, $conf{USE_NET}),
 	 		),	 
 	 		0, gtkpack_(new Gtk2::HBox(0,5),
 	   			0, gtkset_sensitive(my $check_use_expect = new Gtk2::CheckButton(N("Use Expect for SSH")), ($conf{USE_NET} && $conf{NET_PROTO} eq 'ssh')),
@@ -1726,14 +1726,14 @@ sub advanced_where_cd {
 		$dev_codes{$cd_devices{$key}{rec_dev}} = $key; 
 	}
 	
-	my $combo_where_cd_device = new Gtk2::OptionMenu();
+	my $combo_where_cd_device = Gtk2::ComboBox->new_text;
 	if (keys %cd_devices) {
     	$combo_where_cd_device->set_popdown_strings('', sort keys %dev_codes);
 	} else {
 		$combo_where_cd_device->set_popdown_strings(@no_devices);
 	}  
 	
-    my $combo_where_cd_time = new Gtk2::OptionMenu();
+    my $combo_where_cd_time = Gtk2::ComboBox->new_text;
     $combo_where_cd_time->set_popdown_strings("650 MB", "700 MB", "750 MB", "800 MB", "4.7 GB");    
  
     gtkpack($advanced_box,
@@ -1837,7 +1837,7 @@ sub advanced_where_tape {
 	#- look for tape devices;
 	get_tape_info();
 
-	my $combo_where_tape_device = new Gtk2::OptionMenu();
+	my $combo_where_tape_device = Gtk2::ComboBox->new_text;
     if (@tape_devices) {  
 		$combo_where_tape_device->set_popdown_strings('', @tape_devices) 
 	} else {
@@ -2031,7 +2031,7 @@ sub advanced_where() {
 sub advanced_when() {
     my $box_when;
 	my $allow_custom = $backup_daemon && $custom_cron; 
-    my $combo_when_space = new Gtk2::OptionMenu();
+    my $combo_when_space = Gtk2::ComboBox->new_text;
     my %trans = (N("hourly") => 'hourly',
 		 N("daily") => 'daily',
 		 N("weekly") => 'weekly',
@@ -2046,20 +2046,20 @@ sub advanced_when() {
 	set_help_tip($combo_when_space, 'when_space');
 
 	#- custom setup - let user specify month, day of month, day of week, hour, minute
-	my $combo_month_when = new Gtk2::OptionMenu();
+	my $combo_month_when = Gtk2::ComboBox->new_text;
 	my @months = ("*", N("January"), N("February"), N("March"),
 		N("April"), N("May"), N("June"), N("July"), N("August"), N("September"),
 		N("October"), N("November"), N("December"));
 	$combo_month_when->set_popdown_strings(@months);
-	my $combo_day_when = new Gtk2::OptionMenu();
+	my $combo_day_when = Gtk2::ComboBox->new_text;
 	$combo_day_when->set_popdown_strings("*", (1..31));
-	my $combo_weekday_when = new Gtk2::OptionMenu();
+	my $combo_weekday_when = Gtk2::ComboBox->new_text;
 	my @weekdays = ("*", N("Sunday"), N("Monday"), N("Tuesday"), 
 		N("Wednesday"), N("Thursday"), N("Friday"), N("Saturday")); 
 	$combo_weekday_when->set_popdown_strings(@weekdays);
-	my $combo_hour_when = new Gtk2::OptionMenu();
+	my $combo_hour_when = Gtk2::ComboBox->new_text;
 	$combo_hour_when->set_popdown_strings("*", (0..23));
-	my $combo_minute_when = new Gtk2::OptionMenu();
+	my $combo_minute_when = Gtk2::ComboBox->new_text;
 	$combo_minute_when->set_popdown_strings("*", (0..59));
 	
 	my $entry_crontab = new Gtk2::Entry();
@@ -2081,7 +2081,7 @@ sub advanced_when() {
 	}
 	
 	#- drop down list of possible media - default to config value
-    my $entry_media_type = new Gtk2::OptionMenu();
+    my $entry_media_type = Gtk2::ComboBox->new_text;
     $entry_media_type->set_popdown_strings(sort(@net_methods, @media_types));
 	$entry_media_type->entry->set_text($conf{DAEMON_MEDIA});
 	
@@ -2180,7 +2180,7 @@ sub combo_to_cron_string {
 
 sub advanced_options() {
     my $box_options;
-	my $entry_comp_mode = new Gtk2::OptionMenu();
+	my $entry_comp_mode = Gtk2::ComboBox->new_text;
     $entry_comp_mode->set_popdown_strings("tar", "tar.gz", "tar.bz2");
 	$entry_comp_mode->entry->set_text($conf{OPTION_COMP});
 	gtkpack($advanced_box,
@@ -2991,7 +2991,7 @@ sub restore_step_user() {
 
 sub restore_step_sys() {
     my $restore_step_sys;
-    my $combo_restore_step_sys = new Gtk2::OptionMenu();
+    my $combo_restore_step_sys = Gtk2::ComboBox->new_text;
     $combo_restore_step_sys->set_popdown_strings(@sys_backuped);
     $combo_restore_step_sys->entry->set_text($restore_step_sys_date);
     gtkpack($advanced_box,