GNOME.org
 

[gnome-panel] [all] Build with latest GSeal'ed gtk+

commit 13b2f9cdf708856655bb797f24704d9938b5942a
Author: Vincent Untz <vuntz gnome org>
Date:   Thu Mar 4 17:41:32 2010 +0100

    [all] Build with latest GSeal'ed gtk+
    
    This means we now require gtk+ 2.19.7.

 applets/clock/clock-location-tile.c            |    2 +-
 applets/clock/clock.c                          |   10 +++---
 applets/fish/fish.c                            |    2 +-
 applets/notification_area/na-tray-child.c      |    8 +++---
 applets/notification_area/na-tray-manager.c    |    2 +-
 applets/notification_area/na-tray.c            |    2 +-
 applets/notification_area/testtray.c           |    2 +-
 applets/wncklet/window-menu.c                  |    2 +-
 configure.in                                   |    2 +-
 gnome-panel/applet.c                           |    8 +++---
 gnome-panel/button-widget.c                    |   10 +++---
 gnome-panel/drawer.c                           |    2 +-
 gnome-panel/libpanel-util/panel-icon-chooser.c |    2 +-
 gnome-panel/menu.c                             |   10 +++---
 gnome-panel/nothing.cP                         |   12 ++++----
 gnome-panel/panel-applet-frame.c               |   12 ++++----
 gnome-panel/panel-ditem-editor.c               |    4 +-
 gnome-panel/panel-frame.c                      |    8 +++---
 gnome-panel/panel-menu-bar.c                   |    2 +-
 gnome-panel/panel-menu-button.c                |    2 +-
 gnome-panel/panel-separator.c                  |    2 +-
 gnome-panel/panel-struts.c                     |    4 +-
 gnome-panel/panel-toplevel.c                   |   34 ++++++++++++------------
 gnome-panel/panel-widget.c                     |   18 ++++++------
 gnome-panel/xstuff.c                           |    2 +-
 libpanel-applet/panel-applet.c                 |   18 ++++++------
 26 files changed, 91 insertions(+), 91 deletions(-)
---
diff --git a/applets/clock/clock-location-tile.c b/applets/clock/clock-location-tile.c
index febe14a..71e6b75 100644
--- a/applets/clock/clock-location-tile.c
+++ b/applets/clock/clock-location-tile.c
@@ -546,7 +546,7 @@ clock_location_tile_refresh (ClockLocationTile *this, gboolean force_refresh)
 		gtk_widget_show (priv->current_marker);
 	}
 	else {
-		if (GTK_WIDGET_VISIBLE (priv->current_marker)) {
+		if (gtk_widget_get_visible (priv->current_marker)) {
 			gtk_widget_hide (priv->current_marker);
 			gtk_widget_hide (priv->current_button);
 			gtk_widget_show (priv->current_spacer);
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index 84f456f..2a71259 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -326,7 +326,7 @@ clock_set_timeout (ClockData *cd,
 		/* timeout of one minute if we don't care about the seconds */
  		if (cd->format != CLOCK_FORMAT_UNIX &&
 		    !cd->showseconds && 
-		    (!cd->set_time_window || !GTK_WIDGET_VISIBLE (cd->set_time_window)))
+		    (!cd->set_time_window || !gtk_widget_get_visible (cd->set_time_window)))
  			timeouttime += 1000 * (59 - now % 60);
  	}
 
@@ -344,7 +344,7 @@ clock_timeout_callback (gpointer data)
         time (&new_time);
 
 	if (!cd->showseconds && 
-	    (!cd->set_time_window || !GTK_WIDGET_VISIBLE (cd->set_time_window)) &&
+	    (!cd->set_time_window || !gtk_widget_get_visible (cd->set_time_window)) &&
 	    cd->format != CLOCK_FORMAT_UNIX &&
 	    cd->format != CLOCK_FORMAT_CUSTOM) {
 		if (cd->format == CLOCK_FORMAT_INTERNET &&
@@ -615,11 +615,11 @@ update_clock (ClockData * cd)
 	update_tooltip (cd);
         update_location_tiles (cd);
 
-        if (cd->map_widget && cd->calendar_popup && GTK_WIDGET_VISIBLE (cd->calendar_popup))
+        if (cd->map_widget && cd->calendar_popup && gtk_widget_get_visible (cd->calendar_popup))
                 clock_map_update_time (CLOCK_MAP (cd->map_widget));
 
 	if (cd->current_time_label &&
-	    GTK_WIDGET_VISIBLE (cd->current_time_label)) {
+	    gtk_widget_get_visible (cd->current_time_label)) {
 		utf8 = format_time_24 (cd);
 		gtk_label_set_text (GTK_LABEL (cd->current_time_label), utf8);
 		g_free (utf8);
@@ -1231,7 +1231,7 @@ update_calendar_popup (ClockData *cd)
                 create_map_section (cd);
         }
 
-        if (cd->calendar_popup && GTK_WIDGET_REALIZED (cd->panel_button)) {
+        if (cd->calendar_popup && gtk_widget_get_realized (cd->panel_button)) {
 		calendar_window_refresh (CALENDAR_WINDOW (cd->calendar_popup));
 		position_calendar_popup (cd);
 		gtk_window_present (GTK_WINDOW (cd->calendar_popup));
diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index 2fbfdcf..04974df 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -1468,7 +1468,7 @@ update_pixmap (FishApplet *fish)
 	cairo_matrix_t matrix;
 	cairo_pattern_t *pattern;
 
-	if (!GTK_WIDGET_REALIZED (widget) ||
+	if (!gtk_widget_get_realized (widget) ||
 	    widget->allocation.width <= 0 ||
 	    widget->allocation.height <= 0)
 		return;
diff --git a/applets/notification_area/na-tray-child.c b/applets/notification_area/na-tray-child.c
index c7e3f61..d3195bc 100644
--- a/applets/notification_area/na-tray-child.c
+++ b/applets/notification_area/na-tray-child.c
@@ -144,7 +144,7 @@ na_tray_child_size_allocate (GtkWidget      *widget,
    * Fake transparency: if the widget moved, we need to force the contents to
    *   be redrawn with the new offset for the parent-relative background.
    */
-  if ((moved || resized) && GTK_WIDGET_MAPPED (widget))
+  if ((moved || resized) && gtk_widget_get_mapped (widget))
     {
       if (na_tray_child_has_alpha (child))
         gdk_window_invalidate_rect (gdk_window_get_parent (widget->window),
@@ -154,7 +154,7 @@ na_tray_child_size_allocate (GtkWidget      *widget,
   GTK_WIDGET_CLASS (na_tray_child_parent_class)->size_allocate (widget,
                                                                 allocation);
 
-  if ((moved || resized) && GTK_WIDGET_MAPPED (widget))
+  if ((moved || resized) && gtk_widget_get_mapped (widget))
     {
       if (na_tray_child_has_alpha (NA_TRAY_CHILD (widget)))
         gdk_window_invalidate_rect (gdk_window_get_parent (widget->window),
@@ -378,7 +378,7 @@ na_tray_child_set_composited (NaTrayChild *child,
     return;
 
   child->composited = composited;
-  if (GTK_WIDGET_REALIZED (child))
+  if (gtk_widget_get_realized (GTK_WIDGET (child)))
     gdk_window_set_composited (GTK_WIDGET (child)->window, composited);
 }
 
@@ -391,7 +391,7 @@ na_tray_child_force_redraw (NaTrayChild *child)
 {
   GtkWidget *widget = GTK_WIDGET (child);
 
-  if (GTK_WIDGET_MAPPED (child) && child->parent_relative_bg)
+  if (gtk_widget_get_mapped (widget) && child->parent_relative_bg)
     {
 #if 1
       /* Sending an ExposeEvent might cause redraw problems if the
diff --git a/applets/notification_area/na-tray-manager.c b/applets/notification_area/na-tray-manager.c
index 1bf54f1..d2e1a75 100644
--- a/applets/notification_area/na-tray-manager.c
+++ b/applets/notification_area/na-tray-manager.c
@@ -545,7 +545,7 @@ na_tray_manager_unmanage (NaTrayManager *manager)
 
   invisible = manager->invisible;
   g_assert (GTK_IS_INVISIBLE (invisible));
-  g_assert (GTK_WIDGET_REALIZED (invisible));
+  g_assert (gtk_widget_get_realized (invisible));
   g_assert (GDK_IS_WINDOW (invisible->window));
   
   display = gtk_widget_get_display (invisible);
diff --git a/applets/notification_area/na-tray.c b/applets/notification_area/na-tray.c
index 4f9bcb4..026fc42 100644
--- a/applets/notification_area/na-tray.c
+++ b/applets/notification_area/na-tray.c
@@ -261,7 +261,7 @@ icon_tip_show_next (IconTip *icontip)
 
   na_fixed_tip_set_markup (icontip->fixedtip, buffer->text);
 
-  if (!GTK_WIDGET_MAPPED (icontip->fixedtip))
+  if (!gtk_widget_get_mapped (icontip->fixedtip))
     gtk_widget_show (icontip->fixedtip);
 
   icontip->id = buffer->id;
diff --git a/applets/notification_area/testtray.c b/applets/notification_area/testtray.c
index c0300b6..3e34fec 100644
--- a/applets/notification_area/testtray.c
+++ b/applets/notification_area/testtray.c
@@ -53,7 +53,7 @@ update_child_count (TrayData *data)
   guint n_children = 0;
   char text[64];
 
-  if (!GTK_WIDGET_REALIZED (data->window))
+  if (!gtk_widget_get_realized (data->window))
     return;
 
   gtk_container_foreach (GTK_CONTAINER (data->box), (GtkCallback) do_add, &n_children);
diff --git a/applets/wncklet/window-menu.c b/applets/wncklet/window-menu.c
index d827540..acaf37b 100644
--- a/applets/wncklet/window-menu.c
+++ b/applets/wncklet/window-menu.c
@@ -118,7 +118,7 @@ window_menu_on_expose (GtkWidget *widget,
 {
 	WindowMenu *window_menu = data;
 
-	if (GTK_WIDGET_HAS_FOCUS (window_menu->applet))
+	if (gtk_widget_has_focus (window_menu->applet))
 		gtk_paint_focus (widget->style,
 				 widget->window, 
 				 GTK_WIDGET_STATE (widget),
diff --git a/configure.in b/configure.in
index fd14ebd..46ccc8f 100644
--- a/configure.in
+++ b/configure.in
@@ -54,7 +54,7 @@ LIBGNOME_DESKTOP_REQUIRED=2.24.0
 GDK_PIXBUF_REQUIRED=2.7.1
 PANGO_REQUIRED=1.15.4
 GLIB_REQUIRED=2.18.0
-GTK_REQUIRED=2.15.1
+GTK_REQUIRED=2.19.7
 LIBBONOBOUI_REQUIRED=2.1.1
 ORBIT_REQUIRED=2.4.0
 LIBWNCK_REQUIRED=2.19.5
diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c
index 3aa9e68..7c36e87 100644
--- a/gnome-panel/applet.c
+++ b/gnome-panel/applet.c
@@ -607,7 +607,7 @@ panel_applet_position_menu (GtkMenu   *menu,
 	gdk_window_get_origin (applet->window, &menu_x, &menu_y);
 	gtk_widget_get_pointer (applet, &pointer_x, &pointer_y);
 
-	if (GTK_WIDGET_NO_WINDOW (applet)) {
+	if (!gtk_widget_get_has_window (applet)) {
 		menu_x += applet->allocation.x;
 		menu_y += applet->allocation.y;
 	}
@@ -672,7 +672,7 @@ applet_show_menu (AppletInfo     *info,
 	gtk_menu_set_screen (GTK_MENU (info->menu),
 			     gtk_window_get_screen (GTK_WINDOW (panel_widget->toplevel)));
 
-	if (!GTK_WIDGET_REALIZED (info->menu))
+	if (!gtk_widget_get_realized (info->menu))
 		gtk_widget_show (info->menu);
 
 	gtk_menu_popup (GTK_MENU (info->menu),
@@ -1259,7 +1259,7 @@ panel_applet_register (GtkWidget       *applet,
 	
 	g_return_val_if_fail (applet != NULL && panel != NULL, NULL);
 
-	if ( ! GTK_WIDGET_NO_WINDOW (applet))
+	if (gtk_widget_get_has_window (applet))
 		gtk_widget_set_events (applet, (gtk_widget_get_events (applet) |
 						APPLET_EVENT_MASK) &
 				       ~( GDK_POINTER_MOTION_MASK |
@@ -1325,7 +1325,7 @@ panel_applet_register (GtkWidget       *applet,
 	}
 
 	if (BUTTON_IS_WIDGET (applet) ||
-	    !GTK_WIDGET_NO_WINDOW (applet)) {
+	    gtk_widget_get_has_window (applet)) {
 		g_signal_connect (applet, "button_press_event",
 				  G_CALLBACK (applet_button_press),
 				  info);
diff --git a/gnome-panel/button-widget.c b/gnome-panel/button-widget.c
index c2ed14b..85f36f8 100644
--- a/gnome-panel/button-widget.c
+++ b/gnome-panel/button-widget.c
@@ -378,7 +378,7 @@ button_widget_expose (GtkWidget         *widget,
 	button_widget = BUTTON_WIDGET (widget);
 	button = GTK_BUTTON (widget);
 	
-	if (!GTK_WIDGET_VISIBLE (widget) || !GTK_WIDGET_MAPPED (widget))
+	if (!gtk_widget_get_visible (widget) || !gtk_widget_get_mapped (widget))
 		return FALSE;
 
 	if (!button_widget->priv->pixbuf_hc && !button_widget->priv->pixbuf)
@@ -396,7 +396,7 @@ button_widget_expose (GtkWidget         *widget,
 						  0.8,
 						  TRUE);
 	} else if (panel_global_config_get_highlight_when_over () && 
-		   (button->in_button || GTK_WIDGET_HAS_FOCUS (widget)))
+		   (button->in_button || gtk_widget_has_focus (widget)))
 		pb = g_object_ref (button_widget->priv->pixbuf_hc);
 	else
 		pb = g_object_ref (button_widget->priv->pixbuf);
@@ -462,7 +462,7 @@ button_widget_expose (GtkWidget         *widget,
 				   widget->allocation.height - 1);
 	}
 
-	if (GTK_WIDGET_HAS_FOCUS (widget)) {
+	if (gtk_widget_has_focus (widget)) {
 		gint focus_width, focus_pad;
 		gint x, y, width, height;
 
@@ -527,7 +527,7 @@ button_widget_size_allocate (GtkWidget     *widget,
 
 	widget->allocation = *allocation;
 
-	if (GTK_WIDGET_REALIZED (widget)) {
+	if (gtk_widget_get_realized (widget)) {
 		gdk_window_move_resize (button->event_window, 
 					allocation->x,
 					allocation->y,
@@ -724,7 +724,7 @@ button_widget_set_activatable (ButtonWidget *button,
 	if (button->priv->activatable != activatable) {
 		button->priv->activatable = activatable;
 
-		if (GTK_WIDGET_DRAWABLE (button))
+		if (gtk_widget_is_drawable (GTK_WIDGET (button)))
 			gtk_widget_queue_draw (GTK_WIDGET (button));
 
 		g_object_notify (G_OBJECT (button), "activatable");
diff --git a/gnome-panel/drawer.c b/gnome-panel/drawer.c
index ca034ac..ef6e98b 100644
--- a/gnome-panel/drawer.c
+++ b/gnome-panel/drawer.c
@@ -419,7 +419,7 @@ drawer_button_size_allocated (GtkWidget     *widget,
 			      GtkAllocation *alloc,
 			      Drawer        *drawer)
 {
-	if (!GTK_WIDGET_REALIZED (widget))
+	if (!gtk_widget_get_realized (widget))
 		return;
 
 	gtk_widget_queue_resize (GTK_WIDGET (drawer->toplevel));
diff --git a/gnome-panel/libpanel-util/panel-icon-chooser.c b/gnome-panel/libpanel-util/panel-icon-chooser.c
index 90828e6..07d1464 100644
--- a/gnome-panel/libpanel-util/panel-icon-chooser.c
+++ b/gnome-panel/libpanel-util/panel-icon-chooser.c
@@ -374,7 +374,7 @@ _panel_icon_chooser_clicked (GtkButton *button)
 	}
 
 	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
-	if (GTK_WIDGET_TOPLEVEL (toplevel))
+	if (gtk_widget_is_toplevel (toplevel))
 		parent = GTK_WINDOW (toplevel);
 	else
 		parent = NULL;
diff --git a/gnome-panel/menu.c b/gnome-panel/menu.c
index 52fdd57..9154d52 100644
--- a/gnome-panel/menu.c
+++ b/gnome-panel/menu.c
@@ -191,7 +191,7 @@ reload_image_menu_items (void)
 		GtkWidget *image = l->data;
 		gboolean   is_mapped;
       
-		is_mapped = GTK_WIDGET_MAPPED (image);
+		is_mapped = gtk_widget_get_mapped (image);
 
 		if (is_mapped)
 			gtk_widget_unmap (image);
@@ -445,7 +445,7 @@ menu_item_style_set (GtkImage *image,
 
 	widget = GTK_WIDGET (image);
 
-	is_mapped = GTK_WIDGET_MAPPED (widget);
+	is_mapped = gtk_widget_get_mapped (widget);
 	if (is_mapped)
 		gtk_widget_unmap (widget);
 
@@ -515,7 +515,7 @@ load_icons_handler_again:
 	icons_to_load = g_list_delete_link (icons_to_load, icons_to_load);
 
 	/* if not visible anymore, just ignore */
-	if ( ! GTK_WIDGET_VISIBLE (icon->pixmap)) {
+	if ( ! gtk_widget_get_visible (icon->pixmap)) {
 		icon_to_load_free (icon);
 		/* we didn't do anything long/hard, so just do this again,
 		 * this is fun, don't go back to main loop */
@@ -827,7 +827,7 @@ restore_grabs(GtkWidget *w, gpointer data)
 		GtkWidget *tmp = parent;
 
 		while (tmp) {
-			if (!GTK_WIDGET_MAPPED (tmp)) {
+			if (!gtk_widget_get_mapped (tmp)) {
 				viewable = FALSE;
 				break;
 			}
@@ -1039,7 +1039,7 @@ drag_end_menu_cb (GtkWidget *widget, GdkDragContext     *context)
       
       while (tmp)
 	{
-	  if (!GTK_WIDGET_MAPPED (tmp))
+	  if (!gtk_widget_get_mapped (tmp))
 	    {
 	      viewable = FALSE;
 	      break;
diff --git a/gnome-panel/nothing.cP b/gnome-panel/nothing.cP
index 8b20a0d..e325926 100644
--- a/gnome-panel/nothing.cP
+++ b/gnome-panel/nothing.cP
@@ -80,8 +80,8 @@ goat_timeout_func(gpointer data)
 	int old_x;
 	int old_y;
 
-	if(!GTK_WIDGET_REALIZED(goat_darea) ||
-	   !GTK_WIDGET_DRAWABLE(goat_darea))
+	if(!gtk_widget_get_realized(goat_darea) ||
+	   !gtk_widget_is_drawable(goat_darea))
 		return TRUE;
 
 	if (!goat_pix[0] || !goat_pix[1]) {
@@ -167,7 +167,7 @@ goat_expose(GtkWidget *widget, GdkEventExpose *event)
 {
 	cairo_t *cr;
 
-	if(!GTK_WIDGET_DRAWABLE(widget))
+	if(!gtk_widget_is_drawable(widget))
 		return FALSE;
 
 	cr = gdk_cairo_create (goat_darea->window);
@@ -654,7 +654,7 @@ inv_draw (gpointer data)
 		return FALSE;
 	}
 
-	if ( ! GTK_WIDGET_DRAWABLE (geginv_canvas) ||
+	if ( ! gtk_widget_is_drawable (geginv_canvas) ||
 	    geginv_pixmap == NULL)
 		return TRUE;
 
@@ -765,7 +765,7 @@ inv_draw_explosion (int x, int y)
 	GdkColor red;
 	GdkGC *gc;
 
-	if ( ! GTK_WIDGET_DRAWABLE (geginv_canvas))
+	if ( ! gtk_widget_is_drawable (geginv_canvas))
 		return;
 
 	cmap = gdk_drawable_get_colormap (geginv_canvas->window);
@@ -1323,7 +1323,7 @@ geginv_realized (GtkWidget *w, gpointer data)
 static gboolean
 inv_expose (GtkWidget *widget, GdkEventExpose *event)
 {
-	if ( ! GTK_WIDGET_DRAWABLE (widget) ||
+	if ( ! gtk_widget_is_drawable (widget) ||
 	    geginv_pixmap == NULL)
 		return FALSE;
 
diff --git a/gnome-panel/panel-applet-frame.c b/gnome-panel/panel-applet-frame.c
index 7e1e0f5..0880a5a 100644
--- a/gnome-panel/panel-applet-frame.c
+++ b/gnome-panel/panel-applet-frame.c
@@ -577,7 +577,7 @@ panel_applet_frame_paint (GtkWidget    *widget,
 	if (!frame->priv->has_handle)
 		return;
   
-	if (GTK_WIDGET_DRAWABLE (widget)) {
+	if (gtk_widget_is_drawable (widget)) {
 		GtkOrientation orientation = GTK_ORIENTATION_HORIZONTAL;
 
 		switch (frame->priv->orientation) {
@@ -611,7 +611,7 @@ static gboolean
 panel_applet_frame_expose (GtkWidget      *widget,
 			   GdkEventExpose *event)
 {
-	if (GTK_WIDGET_DRAWABLE (widget)) {
+	if (gtk_widget_is_drawable (widget)) {
 		GTK_WIDGET_CLASS (panel_applet_frame_parent_class)->expose_event (widget, event);
 
 		panel_applet_frame_paint (widget, &event->area);
@@ -662,7 +662,7 @@ panel_applet_frame_size_request (GtkWidget      *widget,
 	requisition->width = 0;
 	requisition->height = 0;
   
-	if (bin->child && GTK_WIDGET_VISIBLE (bin->child)) {
+	if (bin->child && gtk_widget_get_visible (bin->child)) {
 		gtk_widget_size_request (bin->child, &child_requisition);
 
 		requisition->width  = child_requisition.width;
@@ -758,14 +758,14 @@ panel_applet_frame_size_allocate (GtkWidget     *widget,
 	/* If the child allocation changed, that means that the frame is drawn
 	 * in a new place, so we must redraw the entire widget.
 	 */
-	if (GTK_WIDGET_MAPPED (widget) &&
+	if (gtk_widget_get_mapped (widget) &&
 	    (new_allocation.x != frame->priv->child_allocation.x ||
 	     new_allocation.y != frame->priv->child_allocation.y ||
 	     new_allocation.width != frame->priv->child_allocation.width ||
 	     new_allocation.height != frame->priv->child_allocation.height))
 	 	gdk_window_invalidate_rect (widget->window, &widget->allocation, FALSE);
 
-	if (GTK_WIDGET_REALIZED (widget)) {
+	if (gtk_widget_get_realized (widget)) {
 		gdk_window_move_resize (widget->window,
 			allocation->x + GTK_CONTAINER (widget)->border_width,
 			allocation->y + GTK_CONTAINER (widget)->border_width,
@@ -773,7 +773,7 @@ panel_applet_frame_size_allocate (GtkWidget     *widget,
 			MAX (allocation->height - GTK_CONTAINER (widget)->border_width * 2, 0));
 	}
 
-	if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+	if (bin->child && gtk_widget_get_visible (bin->child))
 		gtk_widget_size_allocate (bin->child, &new_allocation);
   
 	frame->priv->child_allocation = new_allocation;
diff --git a/gnome-panel/panel-ditem-editor.c b/gnome-panel/panel-ditem-editor.c
index 641a121..9f91e06 100644
--- a/gnome-panel/panel-ditem-editor.c
+++ b/gnome-panel/panel-ditem-editor.c
@@ -840,10 +840,10 @@ panel_ditem_editor_changed (PanelDItemEditor *dialog)
 static void
 panel_ditem_editor_activated (PanelDItemEditor *dialog)
 {
-	if (GTK_WIDGET_VISIBLE (dialog->priv->ok_button))
+	if (gtk_widget_get_visible (dialog->priv->ok_button))
 		gtk_dialog_response (GTK_DIALOG (dialog),
 				     GTK_RESPONSE_OK);
-	else if (GTK_WIDGET_VISIBLE (dialog->priv->close_button))
+	else if (gtk_widget_get_visible (dialog->priv->close_button))
 		gtk_dialog_response (GTK_DIALOG (dialog),
 				     GTK_RESPONSE_CLOSE);
 }
diff --git a/gnome-panel/panel-frame.c b/gnome-panel/panel-frame.c
index 4bf2777..e83a230 100644
--- a/gnome-panel/panel-frame.c
+++ b/gnome-panel/panel-frame.c
@@ -45,7 +45,7 @@ panel_frame_size_request (GtkWidget      *widget,
 	requisition->width = 1;
 	requisition->height = 1;
 
-	if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+	if (bin->child && gtk_widget_get_visible (bin->child))
 		gtk_widget_size_request (bin->child, requisition);
 
 	requisition->width  += GTK_CONTAINER (widget)->border_width;
@@ -95,14 +95,14 @@ panel_frame_size_allocate (GtkWidget     *widget,
 	if (frame->edges & PANEL_EDGE_BOTTOM)
 		child_allocation.height -= widget->style->ythickness;
 
-	if (GTK_WIDGET_MAPPED (widget) &&
+	if (gtk_widget_get_mapped (widget) &&
 	    (child_allocation.x != bin->child->allocation.x ||
 	     child_allocation.y != bin->child->allocation.y ||
 	     child_allocation.width  != bin->child->allocation.width ||
 	     child_allocation.height != bin->child->allocation.height))
 		gdk_window_invalidate_rect (widget->window, &widget->allocation, FALSE);
 
-	if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+	if (bin->child && gtk_widget_get_visible (bin->child))
 		gtk_widget_size_allocate (bin->child, &child_allocation);
 }
 
@@ -188,7 +188,7 @@ panel_frame_expose (GtkWidget      *widget,
 	PanelFrame *frame = (PanelFrame *) widget;
 	gboolean    retval = FALSE;
 
-	if (!GTK_WIDGET_DRAWABLE (widget))
+	if (!gtk_widget_is_drawable (widget))
 		return retval;
 
 	if (GTK_WIDGET_CLASS (panel_frame_parent_class)->expose_event)
diff --git a/gnome-panel/panel-menu-bar.c b/gnome-panel/panel-menu-bar.c
index e1a7ad9..9c317d3 100644
--- a/gnome-panel/panel-menu-bar.c
+++ b/gnome-panel/panel-menu-bar.c
@@ -306,7 +306,7 @@ panel_menu_bar_on_expose (GtkWidget      *widget,
 {
 	PanelMenuBar *menubar = data;
 
-	if (GTK_WIDGET_HAS_FOCUS (menubar))
+	if (gtk_widget_has_focus (GTK_WIDGET (menubar)))
 		gtk_paint_focus (widget->style,
 				 widget->window, 
 				 GTK_WIDGET_STATE (menubar),
diff --git a/gnome-panel/panel-menu-button.c b/gnome-panel/panel-menu-button.c
index e9676b3..13fe265 100644
--- a/gnome-panel/panel-menu-button.c
+++ b/gnome-panel/panel-menu-button.c
@@ -349,7 +349,7 @@ panel_menu_button_menu_deactivated (PanelMenuButton *button)
 
 	GTK_BUTTON (button)->in_button = FALSE;
 	button_widget_set_ignore_leave (BUTTON_WIDGET (button), FALSE);
-	gtk_button_released (GTK_BUTTON (button));
+	g_signal_emit_by_name (GTK_BUTTON (button), "button-release-event");
 }
 
 static void 
diff --git a/gnome-panel/panel-separator.c b/gnome-panel/panel-separator.c
index 91b736e..46457db 100644
--- a/gnome-panel/panel-separator.c
+++ b/gnome-panel/panel-separator.c
@@ -70,7 +70,7 @@ static gboolean
 panel_separator_expose_event (GtkWidget      *widget,
 			      GdkEventExpose *event)
 {
-	if (GTK_WIDGET_DRAWABLE (widget)) {
+	if (gtk_widget_is_drawable (widget)) {
 		GTK_WIDGET_CLASS (panel_separator_parent_class)->expose_event (widget, event);
 
 		panel_separator_paint (widget, &event->area);
diff --git a/gnome-panel/panel-struts.c b/gnome-panel/panel-struts.c
index cef816d..0b496d8 100644
--- a/gnome-panel/panel-struts.c
+++ b/gnome-panel/panel-struts.c
@@ -258,7 +258,7 @@ panel_struts_set_window_hint (PanelToplevel *toplevel)
 
 	widget = GTK_WIDGET (toplevel);
 
-	if (!GTK_WIDGET_REALIZED (widget))
+	if (!gtk_widget_get_realized (widget))
 		return;
 
 	if (!(strut = panel_struts_find_strut (toplevel))) {
@@ -321,7 +321,7 @@ panel_struts_set_window_hint (PanelToplevel *toplevel)
 void
 panel_struts_unset_window_hint (PanelToplevel *toplevel)
 {
-	if (!GTK_WIDGET_REALIZED (toplevel))
+	if (!gtk_widget_get_realized (GTK_WIDGET (toplevel)))
 		return;
 
 	panel_xutils_set_strut (GTK_WIDGET (toplevel)->window, 0, 0, 0, 0);
diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
index 3795ab9..8470591 100644
--- a/gnome-panel/panel-toplevel.c
+++ b/gnome-panel/panel-toplevel.c
@@ -1344,7 +1344,7 @@ panel_toplevel_contains_pointer (PanelToplevel *toplevel)
 	display = gdk_display_get_default ();
 	widget  = GTK_WIDGET (toplevel);
 
-	if (!GTK_WIDGET_REALIZED (widget))
+	if (!gtk_widget_get_realized (widget))
 		return FALSE;
 
 	screen = NULL;
@@ -1554,14 +1554,14 @@ panel_toplevel_update_edges (PanelToplevel *toplevel)
 		    toplevel->priv->y_centered)
 			edges |= PANEL_EDGE_TOP | PANEL_EDGE_BOTTOM;
 
-		if (GTK_WIDGET_VISIBLE (toplevel->priv->hide_button_left) ||
-		    GTK_WIDGET_VISIBLE (toplevel->priv->hide_button_right)) {
+		if (gtk_widget_get_visible (toplevel->priv->hide_button_left) ||
+		    gtk_widget_get_visible (toplevel->priv->hide_button_right)) {
 			inner_frame = TRUE;
 			edges |= PANEL_EDGE_LEFT | PANEL_EDGE_RIGHT;
 		}
 
-		if (GTK_WIDGET_VISIBLE (toplevel->priv->hide_button_top) ||
-		    GTK_WIDGET_VISIBLE (toplevel->priv->hide_button_bottom)) {
+		if (gtk_widget_get_visible (toplevel->priv->hide_button_top) ||
+		    gtk_widget_get_visible (toplevel->priv->hide_button_bottom)) {
 			inner_frame = TRUE;
 			edges |= PANEL_EDGE_TOP | PANEL_EDGE_BOTTOM;
 		}
@@ -1697,8 +1697,8 @@ panel_toplevel_update_attached_position (PanelToplevel *toplevel,
 	int               monitor_x, monitor_y;
 	int               monitor_width, monitor_height;
 
-	if (!GTK_WIDGET_REALIZED (toplevel->priv->attach_toplevel) ||
-	    !GTK_WIDGET_REALIZED (toplevel->priv->attach_widget))
+	if (!gtk_widget_get_realized (GTK_WIDGET (toplevel->priv->attach_toplevel)) ||
+	    !gtk_widget_get_realized (toplevel->priv->attach_widget))
 		return;
 
 	toplevel_box = toplevel->priv->geometry;
@@ -2912,7 +2912,7 @@ panel_toplevel_move_resize_window (PanelToplevel *toplevel,
 
 	widget = GTK_WIDGET (toplevel);
 
-	g_assert (GTK_WIDGET_REALIZED (widget));
+	g_assert (gtk_widget_get_realized (widget));
 
 	if (move && resize)
 		gdk_window_move_resize (widget->window,
@@ -3020,7 +3020,7 @@ panel_toplevel_check_resize (GtkContainer *container)
 
 	widget = GTK_WIDGET (container);
 
-	if (!GTK_WIDGET_VISIBLE (widget))
+	if (!gtk_widget_get_visible (widget))
 		return;
 
 	requisition.width  = -1;
@@ -3053,7 +3053,7 @@ panel_toplevel_size_request (GtkWidget      *widget,
 	 * see if we need to move to a new monitor */
 	panel_toplevel_update_monitor (toplevel);
 
-	if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+	if (bin->child && gtk_widget_get_visible (bin->child))
 		gtk_widget_size_request (bin->child, requisition);
 
 	old_geometry = toplevel->priv->geometry;
@@ -3063,7 +3063,7 @@ panel_toplevel_size_request (GtkWidget      *widget,
 	requisition->width  = toplevel->priv->geometry.width;
 	requisition->height = toplevel->priv->geometry.height;
 
-	if (!GTK_WIDGET_REALIZED (widget))
+	if (!gtk_widget_get_realized (widget))
 		return;
 
 	if (old_geometry.width  != toplevel->priv->geometry.width ||
@@ -3124,14 +3124,14 @@ panel_toplevel_size_allocate (GtkWidget     *widget,
 	challoc.width  = MAX (1, challoc.width);
 	challoc.height = MAX (1, challoc.height);
 
-	if (GTK_WIDGET_MAPPED (widget) &&
+	if (gtk_widget_get_mapped (widget) &&
 	    (challoc.x != bin->child->allocation.x ||
 	     challoc.y != bin->child->allocation.y ||
 	     challoc.width  != bin->child->allocation.width ||
 	     challoc.height != bin->child->allocation.height))
 	 	gdk_window_invalidate_rect (widget->window, &widget->allocation, FALSE);
 
-	if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+	if (bin->child && gtk_widget_get_visible (bin->child))
 		gtk_widget_size_allocate (bin->child, &challoc);
 }
 
@@ -3143,7 +3143,7 @@ panel_toplevel_expose (GtkWidget      *widget,
 	PanelFrameEdge  edges;
 	gboolean        retval = FALSE;
 
-	if (!GTK_WIDGET_DRAWABLE (widget))
+	if (!gtk_widget_is_drawable (widget))
 		return retval;
 
 	if (GTK_WIDGET_CLASS (panel_toplevel_parent_class)->expose_event)
@@ -3479,7 +3479,7 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
 
 	if (toplevel->priv->attached) {
 		/* Re-map unmapped attached toplevels */
-		if (!GTK_WIDGET_MAPPED (toplevel))
+		if (!gtk_widget_get_mapped (GTK_WIDGET (toplevel)))
 			gtk_widget_map (GTK_WIDGET (toplevel));
 
 		gtk_window_present (GTK_WINDOW (toplevel->priv->attach_toplevel));
@@ -3546,7 +3546,7 @@ panel_toplevel_hide (PanelToplevel    *toplevel,
 		panel_toplevel_update_hide_buttons (toplevel);
 	}
 
-	if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
+	if (toplevel->priv->animate && gtk_widget_get_realized (GTK_WIDGET (toplevel)))
 		panel_toplevel_start_animation (toplevel);
 	else if (toplevel->priv->attached)
 		gtk_widget_hide (GTK_WIDGET (toplevel));
@@ -3594,7 +3594,7 @@ panel_toplevel_unhide (PanelToplevel *toplevel)
 	if (toplevel->priv->attach_toplevel)
 		panel_toplevel_push_autohide_disabler (toplevel->priv->attach_toplevel);
 
-	if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
+	if (toplevel->priv->animate && gtk_widget_get_realized (GTK_WIDGET (toplevel)))
 		panel_toplevel_start_animation (toplevel);
 	else if (toplevel->priv->attached)
 		gtk_widget_show (GTK_WIDGET (toplevel));
diff --git a/gnome-panel/panel-widget.c b/gnome-panel/panel-widget.c
index 02babf7..f3ee92f 100644
--- a/gnome-panel/panel-widget.c
+++ b/gnome-panel/panel-widget.c
@@ -205,7 +205,7 @@ add_all_move_bindings (PanelWidget *panel)
 static void
 panel_widget_force_grab_focus (GtkWidget *widget)
 {
-	gboolean can_focus = GTK_WIDGET_CAN_FOCUS (widget);
+	gboolean can_focus = gtk_widget_get_can_focus (widget);
 	/*
 	 * This follows what gtk_socket_claim_focus() does
 	 */
@@ -1313,7 +1313,7 @@ panel_widget_set_background_region (PanelWidget *panel)
 
 	widget = GTK_WIDGET (panel);
 
-	if (!GTK_WIDGET_REALIZED (widget))
+	if (!gtk_widget_get_realized (widget))
 		return;
 
 	gdk_window_get_origin (widget->window, &origin_x, &origin_y);
@@ -1343,7 +1343,7 @@ panel_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
 	ltr = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR;
 	
 	widget->allocation = *allocation;
-	if (GTK_WIDGET_REALIZED (widget))
+	if (gtk_widget_get_realized (widget))
 		gdk_window_move_resize (widget->window,
 					allocation->x, 
 					allocation->y,
@@ -1533,7 +1533,7 @@ panel_widget_is_cursor(PanelWidget *panel, int overlap)
 	
 	if(!widget ||
 	   !GTK_IS_WIDGET(widget) ||
-	   !GTK_WIDGET_VISIBLE(widget))
+	   !gtk_widget_get_visible(widget))
 		return FALSE;
 
 	gtk_widget_get_pointer(widget, &x, &y);
@@ -1552,7 +1552,7 @@ static void
 panel_widget_style_set (GtkWidget *widget,
 			GtkStyle  *previous_style)
 {
-	if (GTK_WIDGET_REALIZED (widget))
+	if (gtk_widget_get_realized (widget))
 		panel_background_set_default_style (
 			&PANEL_WIDGET (widget)->background,
 			&widget->style->bg [GTK_WIDGET_STATE (widget)],
@@ -1563,7 +1563,7 @@ static void
 panel_widget_state_changed (GtkWidget    *widget,
 			    GtkStateType  previous_state)
 {
-	if (GTK_WIDGET_REALIZED (widget))
+	if (gtk_widget_get_realized (widget))
 		panel_background_set_default_style (
 			&PANEL_WIDGET (widget)->background,
 			&widget->style->bg [GTK_WIDGET_STATE (widget)],
@@ -2330,7 +2330,7 @@ bind_applet_events(GtkWidget *widget, gpointer data)
 	 * GtkEventBox) for processing by us.
 	 */
 	
-	if (!GTK_WIDGET_NO_WINDOW(widget))
+	if (gtk_widget_get_has_window (widget))
 		g_signal_connect (G_OBJECT(widget), "event",
 				  G_CALLBACK (panel_sub_event_handler),
 				  data);
@@ -2587,7 +2587,7 @@ panel_widget_reparent (PanelWidget *old_panel,
 	if (info && info->type == PANEL_OBJECT_BONOBO)
 		panel_applet_frame_set_panel (PANEL_APPLET_FRAME (ad->applet), new_panel);
 
-	if (GTK_WIDGET_CAN_FOCUS (new_panel))
+	if (gtk_widget_get_can_focus (GTK_WIDGET (new_panel)))
 		GTK_WIDGET_UNSET_FLAGS (new_panel, GTK_CAN_FOCUS);
 	if (focus_widget) {
 		panel_widget_force_grab_focus (focus_widget);
@@ -2793,7 +2793,7 @@ static gboolean
 panel_widget_real_focus (GtkWidget        *widget,
                          GtkDirectionType  direction)
 {
-	if (GTK_WIDGET_CAN_FOCUS (widget) && GTK_FIXED (widget)->children) {
+	if (gtk_widget_get_can_focus (widget) && GTK_FIXED (widget)->children) {
 		GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_FOCUS);
 	}
 	return GTK_WIDGET_CLASS (panel_widget_parent_class)->focus (widget, direction);
diff --git a/gnome-panel/xstuff.c b/gnome-panel/xstuff.c
index 2ac9c44..fef44e7 100644
--- a/gnome-panel/xstuff.c
+++ b/gnome-panel/xstuff.c
@@ -594,7 +594,7 @@ xstuff_zoom_animate (GtkWidget *widget,
 		rect = *opt_rect;
 	else {
 		gdk_window_get_origin (widget->window, &rect.x, &rect.y);
-		if (GTK_WIDGET_NO_WINDOW (widget)) {
+		if (!gtk_widget_get_has_window (widget)) {
 			rect.x += widget->allocation.x;
 			rect.y += widget->allocation.y;
 		}
diff --git a/libpanel-applet/panel-applet.c b/libpanel-applet/panel-applet.c
index 6652ba8..4a8e5e6 100644
--- a/libpanel-applet/panel-applet.c
+++ b/libpanel-applet/panel-applet.c
@@ -396,7 +396,7 @@ panel_applet_find_toplevel_dock_window (PanelApplet *applet,
 	int	    num_children;
 
 	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (applet));
-	if (!GTK_WIDGET_REALIZED (toplevel))
+	if (!gtk_widget_get_realized (toplevel))
 		return None;
 
 	xwin = GDK_WINDOW_XID (toplevel->window);
@@ -605,7 +605,7 @@ container_has_focusable_child (GtkContainer *container)
 
 	for (t = list; t; t = t->next) {
 		child = GTK_WIDGET (t->data);
-		if (GTK_WIDGET_CAN_FOCUS (child)) {
+		if (gtk_widget_get_can_focus (child)) {
 			retval = TRUE;
 			break;
 		} else if (GTK_IS_CONTAINER (child)) {
@@ -709,7 +709,7 @@ panel_applet_button_press (GtkWidget      *widget,
 	PanelApplet *applet = PANEL_APPLET (widget);
 
 	if (!container_has_focusable_child (GTK_CONTAINER (applet))) {
-		if (!GTK_WIDGET_HAS_FOCUS (widget)) {
+		if (!gtk_widget_has_focus (widget)) {
 			GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
 			gtk_widget_grab_focus (widget);
 		}
@@ -803,7 +803,7 @@ panel_applet_size_allocate (GtkWidget     *widget,
 		child_allocation.width  = MAX (allocation->width  - border_width * 2, 0);
 		child_allocation.height = MAX (allocation->height - border_width * 2, 0);
 
-		if (GTK_WIDGET_REALIZED (widget))
+		if (gtk_widget_get_realized (widget))
 			gdk_window_move_resize (widget->window,
 						allocation->x + GTK_CONTAINER (widget)->border_width,
 						allocation->y + GTK_CONTAINER (widget)->border_width,
@@ -842,7 +842,7 @@ panel_applet_expose (GtkWidget      *widget,
 	GTK_WIDGET_CLASS (panel_applet_parent_class)->expose_event (widget,
 								    event);
 
-        if (!GTK_WIDGET_HAS_FOCUS (widget))
+        if (!gtk_widget_has_focus (widget))
 		return FALSE;
 
 	/*
@@ -890,7 +890,7 @@ panel_applet_focus (GtkWidget        *widget,
 	}
 
 	previous_focus_child = GTK_CONTAINER (widget)->focus_child;
-	if (!previous_focus_child && !GTK_WIDGET_HAS_FOCUS (widget)) {
+	if (!previous_focus_child && !gtk_widget_has_focus (widget)) {
 		if (gtk_widget_get_has_tooltip (widget)) {
 			GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
 			gtk_widget_grab_focus (widget);
@@ -901,7 +901,7 @@ panel_applet_focus (GtkWidget        *widget,
 	ret = GTK_WIDGET_CLASS (panel_applet_parent_class)->focus (widget, dir);
 
 	if (!ret && !previous_focus_child) {
- 		if (!GTK_WIDGET_HAS_FOCUS (widget))  {
+		if (!gtk_widget_has_focus (widget))  {
 			/*
 			 * Applet does not have a widget which can focus so set
 			 * the focus on the applet unless it already had focus
@@ -996,7 +996,7 @@ panel_applet_get_pixmap (PanelApplet     *applet,
 
 	g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL);
 
-	if (!GTK_WIDGET_REALIZED (applet))
+	if (!gtk_widget_get_realized (GTK_WIDGET (applet)))
 		return NULL;
 
 	display = gdk_display_get_default ();
@@ -1056,7 +1056,7 @@ panel_applet_handle_background_string (PanelApplet  *applet,
 
 	retval = PANEL_NO_BACKGROUND;
 
-	if (!GTK_WIDGET_REALIZED (applet) || !applet->priv->background)
+	if (!gtk_widget_get_realized (GTK_WIDGET (applet)) || !applet->priv->background)
 		return retval;
 
 	elements = g_strsplit (applet->priv->background, ":", -1);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]