perlish ->window => ->get_window

10 files changed, 25 insertions, 25 deletions

diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 5d3a5af4e..02f7c1251 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -315,7 +315,7 @@ sub create_automatic_notebooks {
 sub create_buttons4partitions {
     my ($kind, $totalsectors, @parts) = @_;
 
-    $width = first($w->{window}->window->get_size) - first(get_action_box_size()) - 25 if $w->{window}->window;
+    $width = first($w->{window}->get_window->get_size) - first(get_action_box_size()) - 25 if $w->{window}->get_window;
 
     my $ratio = $totalsectors ? ($width - @parts * $minwidth) / $totalsectors : 1;
     while (1) {
diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm
index ff50e0a18..61bcab168 100644
--- a/perl-install/diskdrake/smbnfs_gtk.pm
+++ b/perl-install/diskdrake/smbnfs_gtk.pm
@@ -226,10 +226,10 @@ sub import_tree {
 	    $current_entry = find_fstab_entry($kind, $wexports{$tree_model->get_path_str($curr)} || die(''), 'add');
 	} else {
 	    if (!$tree_model->iter_has_child($curr)) {
-		gtkset_mousecursor_wait($tree->window);
+		gtkset_mousecursor_wait($tree->get_window);
 		ugtk3::flush();
 		$add_exports->($curr);		
-		gtkset_mousecursor_normal($tree->window);
+		gtkset_mousecursor_normal($tree->get_window);
 	    }
 	    $current_entry = undef;
 	}
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index f57c9cecc..928c29336 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -616,7 +616,7 @@ sub installPackages {
     $details->hide if !@install::any::advertising_images;
     $w->sync;
     foreach ($cancel, $details) {
-	gtkset_mousecursor_normal($_->window);
+	gtkset_mousecursor_normal($_->get_window);
     }
 
     $advertize->(0);
diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm
index 455a83de1..e3cb85268 100644
--- a/perl-install/mygtk3.pm
+++ b/perl-install/mygtk3.pm
@@ -354,13 +354,13 @@ sub _gtk__Image {
                                    }
                                    # workaround Gtk+ bug: in installer, first event is not complete and rectables are bogus:
                                    if ($::isInstall) {
-                                       $pixbuf->render_to_drawable($w->window, $w->style->fg_gc('normal'),
+                                       $pixbuf->render_to_drawable($w->get_window, $w->style->fg_gc('normal'),
                                                                    0, 0, $w->{x}, $w->{y}, $width, $height, 'max', 0, 0);
                                        return;
                                    }
                                    foreach my $rect ($event->region->get_rectangles) {
                                        my @values = $rect->values;
-                                       $pixbuf->render_to_drawable($w->window, $w->style->fg_gc('normal'),
+                                       $pixbuf->render_to_drawable($w->get_window, $w->style->fg_gc('normal'),
                                                                @values[0..1], $w->{x}+$values[0], $w->{y}+$values[1], @values[2..3], 'max', 0, 0);
 				   }
                                });
@@ -1535,7 +1535,7 @@ sub _pixbuf_render_alpha {
 
 sub pixmap_from_pixbuf {
     my ($widget, $pixbuf) = @_;
-    my $window = $widget->window or internal_error("you can't use this function if the widget is not realised");
+    my $window = $widget->get_window or internal_error("you can't use this function if the widget is not realised");
     my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height);
     my $pixmap = Gtk3::Gdk::Pixmap->new($window, $width, $height, $window->get_depth);
     $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0);
diff --git a/perl-install/services.pm b/perl-install/services.pm
index 54dd5efec..377e87b98 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -284,7 +284,7 @@ sub ask_standalone_gtk {
             ))
 	  );
     $b->signal_connect(motion_notify_event => sub { my ($w, $e) = @_;
-						    my ($ox, $oy) = $w->window->get_origin;
+						    my ($ox, $oy) = $w->get_window->get_origin;
 						    $x = $e->x+$ox; $y = $e->y+$oy });
     $b->signal_connect(button_press_event => sub { $nopop->() });
     $::isEmbedded and gtkflush();
diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock
index 962474341..de1b9d0c9 100755
--- a/perl-install/standalone/drakclock
+++ b/perl-install/standalone/drakclock
@@ -193,7 +193,7 @@ 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(realize => sub {
-                                  my $window = $drawing_area->window;
+                                  my $window = $drawing_area->get_window;
                                   $pixmap = Gtk3::Gdk::Pixmap->new($window, @image_size, $window->get_depth);
                               });
 
@@ -316,7 +316,7 @@ sub determine_radian {
 sub expose_event {
     my ($widget, $event) = @_;
     my ($x, $y, $width, $height) = $event->area->values;
-    $widget->window->draw_drawable($widget->style->fg_gc('normal'), $pixmap, $x, $y, $x, $y, $width, $height);
+    $widget->get_window->draw_drawable($widget->style->fg_gc('normal'), $pixmap, $x, $y, $x, $y, $width, $height);
     0;
 }
 
diff --git a/perl-install/standalone/drakdvb b/perl-install/standalone/drakdvb
index bcbf4a9c9..2ced12974 100755
--- a/perl-install/standalone/drakdvb
+++ b/perl-install/standalone/drakdvb
@@ -56,7 +56,7 @@ sub detect_channels() {
     if (-s $config_file) {
         $in->ask_okcancel(N("Warning"), N("%s already exists and its contents will be lost", $config_file)) or return;
     }
-    gtkset_mousecursor_wait($w->{window}->window);
+    gtkset_mousecursor_wait($w->{window}->get_window);
     $channel_list->set_sensitive(0);
     $_->set_sensitive(0) foreach values %buttons;
 
@@ -73,7 +73,7 @@ sub detect_channels() {
         } else {
             $in->ask_warn(N("Error"), N("Could not get the list of available channels"));
         }
-        gtkset_mousecursor_normal($w->{window}->window);
+        gtkset_mousecursor_normal($w->{window}->get_window);
         $buttons{detect}->set_sensitive(1);
         $channel_list->set_sensitive(1);
     };
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index c65e69a76..cda3a8705 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -69,7 +69,7 @@ sub wait_msg {
     my $mainw = ugtk3->new(N("Please wait"), (modal => 1, transient => $w->{real_window}));
     $mainw->{window}->add(gtknew('WrappedLabel', text => $_[0]));
     $mainw->{rwindow}->show_all;
-    gtkset_mousecursor_wait($mainw->{rwindow}->window);
+    gtkset_mousecursor_wait($mainw->{rwindow}->get_window);
     # ugly workaround for gtk+ not displaying subdialog contents:
     Glib::Timeout->add(300, sub { Gtk3->main_quit; 0 });
     Gtk3->main;
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index f2e9d0120..2c98de368 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -192,8 +192,8 @@ sub quit() { ugtk3->exit(0) }
 # search functions
 #-------------------------------------------------------------
 sub search() {
-    return if !$log_text->window;
-    $log_text->window->freeze_updates;
+    return if !$log_text->get_window;
+    $log_text->get_window->freeze_updates;
     $log_buf->set_text('');
     if ($isFile) {
 	parse_file($File, $File);
@@ -202,7 +202,7 @@ sub search() {
 	    parse_file($files{$_}{file}, $files{$_}{desc}) if $toggle{$_}->get_active;
 	}
     }
-    $log_text->window->thaw_updates;
+    $log_text->get_window->thaw_updates;
     $log_text->show;
     gtkflush();
 }
@@ -272,7 +272,7 @@ sub parse_file {
       $i++;
       if ($pbar && $i % 10) { 
 	  $pbar->set_fraction($i/$taille);
-       $win_pb->window->process_updates(1); # no gtkflush() because we do not want to refresh the TextView
+       $win_pb->get_window->process_updates(1); # no gtkflush() because we do not want to refresh the TextView
       }
       
       logcolorize($_) if $test->($_);
diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index b092b5da3..56c954b38 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -56,7 +56,7 @@ sub wm_icon() { $wm_icon || $::Wizard_pix_up || "wiz_default_up.png" }
 sub gtkdestroy                { mygtk3::may_destroy($_[0]) }
 sub gtkflush()                { mygtk3::flush() }
 sub gtkhide                   { $_[0]->hide; $_[0] }
-sub gtkmove                   { $_[0]->window->move($_[1], $_[2]); $_[0] }
+sub gtkmove                   { $_[0]->get_window->move($_[1], $_[2]); $_[0] }
 sub gtkpack                   { gtkpowerpack(1, 1, @_) }
 sub gtkpack_                  { gtkpowerpack('arg', 1, @_) }
 sub gtkpack__                 { gtkpowerpack(0, 1, @_) }
@@ -64,7 +64,7 @@ sub gtkpack2                  { gtkpowerpack(1, 0, @_) }
 sub gtkpack2_                 { gtkpowerpack('arg', 0, @_) }
 sub gtkpack2__                { gtkpowerpack(0, 0, @_) }
 sub gtkput                    { $_[0]->put(gtkshow($_[1]), $_[2], $_[3]); $_[0] }
-sub gtkresize                 { $_[0]->window->resize($_[1], $_[2]); $_[0] }
+sub gtkresize                 { $_[0]->get_window->resize($_[1], $_[2]); $_[0] }
 sub gtkset_active             { $_[0]->set_active($_[1]); $_[0] }
 sub gtkset_border_width       { $_[0]->set_border_width($_[1]); $_[0] }
 sub gtkset_editable           { $_[0]->set_editable($_[1]); $_[0] }
@@ -672,7 +672,7 @@ sub gtkset_property {
 
 sub set_back_pixbuf {
     my ($widget, $pixbuf) = @_;
-    my $window = $widget->window;
+    my $window = $widget->get_window;
     my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height);
     my $pixmap = Gtk3::Gdk::Pixmap->new($window, $width, $height, $window->get_depth);
     $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0);
@@ -682,7 +682,7 @@ sub set_back_pixbuf {
 sub set_back_pixmap {
     my ($w) = @_;
     return if !$w->get_realized;
-    my $window = $w->window;
+    my $window = $w->get_window;
     my $pixmap = $w->{back_pixmap} ||= Gtk3::Gdk::Pixmap->new($window, 1, 2, $window->get_depth);
 
     my $style = $w->get_style;
@@ -1462,7 +1462,7 @@ sub new {
                                my $height = $darea->{icon}->get_height;
                                my $width = $darea->{icon}->get_width;
                                # fix icon position when not using the default height:
-                               (undef, undef, undef, $d_height) = $darea->window->get_geometry;
+                               (undef, undef, undef, $d_height) = $darea->get_window->get_geometry;
                                my $padding = int(($d_height - $height)/2);
                                my $d_width = $darea->allocation->width;
                                my $x_blue = $is_rtl ? $d_width - $blue_width : 0;
@@ -1470,11 +1470,11 @@ sub new {
                                # here: 48 is the amount of white background in the blue background we wish to ignore:
                                my $x_text = $is_rtl ? $d_width - $blue_width + 48 - $darea->{txt_width} : $blue_width - 48;
                                $darea->{layout_height} ||= second($darea->{layout}->get_pixel_size);
-                               $blue_part->render_to_drawable($darea->window, $style->bg_gc('normal'),
+                               $blue_part->render_to_drawable($darea->get_window, $style->bg_gc('normal'),
                                                                   0, 0, $x_blue, 0, -1, -1, 'none', 0, 0);
-                               $darea->{icon}->render_to_drawable($darea->window, $style->bg_gc('normal'),
+                               $darea->{icon}->render_to_drawable($darea->get_window, $style->bg_gc('normal'),
                                                                   0, 0, $x_icon, $padding, -1, -1, 'none', 0, 0);
-                               $darea->window->draw_layout($style->fg_gc('normal'), $x_text,
+                               $darea->get_window->draw_layout($style->fg_gc('normal'), $x_text,
                                                            $o_options->{txt_ypos} || ($d_height - $darea->{layout_height})/2,
                                                            $darea->{layout});
                                1;