Use gtk_widget_get_window() (appeared in Gtk 2.14) instead of poking at window struct member

This commit is contained in:
Landry Breuil
2014-12-08 22:53:59 +01:00
parent f76b9973bd
commit 41a9d833f0

View File

@@ -308,8 +308,8 @@ xtm_process_monitor_add_peak (XtmProcessMonitor *monitor, gfloat peak)
if (monitor->history->len > 1) if (monitor->history->len > 1)
g_array_remove_index (monitor->history, monitor->history->len - 1); g_array_remove_index (monitor->history, monitor->history->len - 1);
if (GDK_IS_WINDOW (GTK_WIDGET (monitor)->window)) if (GDK_IS_WINDOW (gtk_widget_get_window (GTK_WIDGET(monitor))))
gdk_window_invalidate_rect (GTK_WIDGET (monitor)->window, NULL, FALSE); gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET(monitor)), NULL, FALSE);
} }
void void
@@ -317,8 +317,8 @@ xtm_process_monitor_set_step_size (XtmProcessMonitor *monitor, gfloat step_size)
{ {
g_return_if_fail (XTM_IS_PROCESS_MONITOR (monitor)); g_return_if_fail (XTM_IS_PROCESS_MONITOR (monitor));
g_object_set (monitor, "step_size", step_size, NULL); g_object_set (monitor, "step_size", step_size, NULL);
if (GDK_IS_WINDOW (GTK_WIDGET (monitor)->window)) if (GDK_IS_WINDOW (gtk_widget_get_window (GTK_WIDGET(monitor))))
gdk_window_invalidate_rect (GTK_WIDGET (monitor)->window, NULL, FALSE); gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET(monitor)), NULL, FALSE);
} }
void void
@@ -326,8 +326,8 @@ xtm_process_monitor_clear (XtmProcessMonitor *monitor)
{ {
g_return_if_fail (XTM_IS_PROCESS_MONITOR (monitor)); g_return_if_fail (XTM_IS_PROCESS_MONITOR (monitor));
g_array_set_size (monitor->history, 0); g_array_set_size (monitor->history, 0);
if (GDK_IS_WINDOW (GTK_WIDGET (monitor)->window)) if (GDK_IS_WINDOW (gtk_widget_get_window (GTK_WIDGET(monitor))))
gdk_window_invalidate_rect (GTK_WIDGET (monitor)->window, NULL, FALSE); gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET(monitor)), NULL, FALSE);
} }
void void
@@ -336,8 +336,8 @@ xtm_process_monitor_set_source_color (XtmProcessMonitor *monitor, gdouble red, g
g_return_if_fail (XTM_IS_PROCESS_MONITOR (monitor)); g_return_if_fail (XTM_IS_PROCESS_MONITOR (monitor));
g_signal_handlers_disconnect_by_func (GTK_WIDGET (monitor), init_source_color, NULL); g_signal_handlers_disconnect_by_func (GTK_WIDGET (monitor), init_source_color, NULL);
g_object_set (monitor, "color-red", red, "color-green", green, "color-blue", blue, NULL); g_object_set (monitor, "color-red", red, "color-green", green, "color-blue", blue, NULL);
if (GDK_IS_WINDOW (GTK_WIDGET (monitor)->window)) if (GDK_IS_WINDOW (gtk_widget_get_window (GTK_WIDGET(monitor))))
gdk_window_invalidate_rect (GTK_WIDGET (monitor)->window, NULL, FALSE); gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET(monitor)), NULL, FALSE);
} }
void void
@@ -345,6 +345,6 @@ xtm_process_monitor_set_paint_box (XtmProcessMonitor *monitor, gboolean paint_bo
{ {
g_return_if_fail (XTM_IS_PROCESS_MONITOR (monitor)); g_return_if_fail (XTM_IS_PROCESS_MONITOR (monitor));
g_object_set (monitor, "paint-box", paint_box, NULL); g_object_set (monitor, "paint-box", paint_box, NULL);
if (GDK_IS_WINDOW (GTK_WIDGET (monitor)->window)) if (GDK_IS_WINDOW (gtk_widget_get_window (GTK_WIDGET(monitor))))
gdk_window_invalidate_rect (GTK_WIDGET (monitor)->window, NULL, FALSE); gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET(monitor)), NULL, FALSE);
} }