GNOME.org
 

[libegg] Ifdef GTK_WIDGET_VISIBLE and GTK_WIDGET_MAPPED for compiling with -DGSEAL_ENABLE. See bug 615348.

commit a942beeb44d5f0b8eea44610563c5ae593f9db24
Author: Andre Klapper <a9016009 gmx de>
Date:   Sat Apr 10 14:30:19 2010 +0200

    Ifdef GTK_WIDGET_VISIBLE and GTK_WIDGET_MAPPED for compiling with -DGSEAL_ENABLE. See bug 615348.

 libegg/dock/egg-dock-item.c                 |   26 +++++++++++++++++++
 libegg/dock/egg-dock-layout.c               |    8 ++++++
 libegg/dock/egg-dock-tablabel.c             |    8 ++++++
 libegg/dock/egg-dock.c                      |   36 +++++++++++++++++++++++++++
 libegg/iconchooser/eggiconchooserbutton.c   |    4 +++
 libegg/iconchooser/eggiconchooserdefault.c  |    4 +++
 libegg/toolbareditor/egg-editable-toolbar.c |    9 ++++++
 libegg/toolpalette/eggtoolitemgroup.c       |   28 +++++++++++++++++++++
 8 files changed, 123 insertions(+), 0 deletions(-)
---
diff --git a/libegg/dock/egg-dock-item.c b/libegg/dock/egg-dock-item.c
index 5cc9ac2..51f6318 100644
--- a/libegg/dock/egg-dock-item.c
+++ b/libegg/dock/egg-dock-item.c
@@ -575,7 +575,11 @@ egg_dock_item_remove (GtkContainer *container,
     
     item = EGG_DOCK_ITEM (container);
     if (item->_priv && widget == item->_priv->grip) {
+#if GTK_CHECK_VERSION(2,20,0)
+        gboolean grip_was_visible = gtk_widget_get_visible (widget);
+#else
         gboolean grip_was_visible = GTK_WIDGET_VISIBLE (widget);
+#endif
         gtk_widget_unparent (widget);
         item->_priv->grip = NULL;
         if (grip_was_visible)
@@ -589,7 +593,11 @@ egg_dock_item_remove (GtkContainer *container,
     
     g_return_if_fail (item->child == widget);
     
+#if GTK_CHECK_VERSION(2,20,0)
+    was_visible = gtk_widget_get_visible (widget);
+#else
     was_visible = GTK_WIDGET_VISIBLE (widget);
+#endif
 
     gtk_widget_unparent (widget);
     item->child = NULL;
@@ -695,7 +703,11 @@ egg_dock_item_size_allocate (GtkWidget     *widget,
                                 widget->allocation.width,
                                 widget->allocation.height);
 
+#if GTK_CHECK_VERSION(2,20,0)
+    if (item->child && gtk_widget_get_visible (item->child)) {
+#else
     if (item->child && GTK_WIDGET_VISIBLE (item->child)) {
+#endif
         GtkAllocation  child_allocation;
         int            border_width;
 
@@ -745,13 +757,23 @@ egg_dock_item_map (GtkWidget *widget)
     gdk_window_show (widget->window);
 
     if (item->child
+#if GTK_CHECK_VERSION(2,20,0)
+        && gtk_widget_get_visible (item->child)
+        && !gtk_widget_get_mapped (item->child))
+#else
         && GTK_WIDGET_VISIBLE (item->child)
         && !GTK_WIDGET_MAPPED (item->child))
+#endif
         gtk_widget_map (item->child);
 
     if (item->_priv->grip
+#if GTK_CHECK_VERSION(2,20,0)
+        && gtk_widget_get_visible (item->_priv->grip)
+        && !gtk_widget_get_mapped (item->_priv->grip))
+#else
         && GTK_WIDGET_VISIBLE (item->_priv->grip)
         && !GTK_WIDGET_MAPPED (item->_priv->grip))
+#endif
         gtk_widget_map (item->_priv->grip);
 }
 
@@ -1207,7 +1229,11 @@ egg_dock_item_dock (EggDockObject    *object,
         gtk_container_add (GTK_CONTAINER (parent), GTK_WIDGET (new_parent));
 
     /* show automatic object */
+#if GTK_CHECK_VERSION(2,20,0)
+    if (gtk_widget_get_visible (object))
+#else
     if (GTK_WIDGET_VISIBLE (object))
+#endif
         gtk_widget_show (GTK_WIDGET (new_parent));
     
     /* use extra docking parameter */
diff --git a/libegg/dock/egg-dock-layout.c b/libegg/dock/egg-dock-layout.c
index d66e9ba..dca0cdf 100644
--- a/libegg/dock/egg-dock-layout.c
+++ b/libegg/dock/egg-dock-layout.c
@@ -953,13 +953,21 @@ egg_dock_layout_recursive_build (EggDockMaster *master,
                                                  parent);
                 else if (egg_dock_object_is_compound (parent)) {
                     gtk_container_add (GTK_CONTAINER (parent), GTK_WIDGET (object));
+#if GTK_CHECK_VERSION(2,20,0)
+                    if (gtk_widget_get_visible (parent))
+#else
                     if (GTK_WIDGET_VISIBLE (parent))
+#endif
                         gtk_widget_show (GTK_WIDGET (object));
                 }
             }
             else {
                 EggDockObject *controller = egg_dock_master_get_controller (master);
+#if GTK_CHECK_VERSION(2,20,0)
+                if (controller != object && gtk_widget_get_visible (controller))
+#else
                 if (controller != object && GTK_WIDGET_VISIBLE (controller))
+#endif
                     gtk_widget_show (GTK_WIDGET (object));
             }
                 
diff --git a/libegg/dock/egg-dock-tablabel.c b/libegg/dock/egg-dock-tablabel.c
index ee18533..cf50001 100644
--- a/libegg/dock/egg-dock-tablabel.c
+++ b/libegg/dock/egg-dock-tablabel.c
@@ -338,7 +338,11 @@ egg_dock_tablabel_size_allocate (GtkWidget     *widget,
                                 allocation->width, 
                                 allocation->height);
 
+#if GTK_CHECK_VERSION(2,20,0)
+    if (bin->child && gtk_widget_get_visible (bin->child)) {
+#else
     if (bin->child && GTK_WIDGET_VISIBLE (bin->child)) {
+#endif
         GtkAllocation  child_allocation;
 
         child_allocation.x = widget->allocation.x + border_width;
@@ -394,7 +398,11 @@ egg_dock_tablabel_expose (GtkWidget      *widget,
     g_return_val_if_fail (EGG_IS_DOCK_TABLABEL (widget), FALSE);
     g_return_val_if_fail (event != NULL, FALSE);
 
+#if GTK_CHECK_VERSION(2,20,0)
+    if (gtk_widget_get_visible (widget) && gtk_widget_get_mapped (widget)) {
+#else
     if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget)) {
+#endif
         EGG_CALL_PARENT (GTK_WIDGET_CLASS, expose_event, (widget, event));
         egg_dock_tablabel_paint (widget, event);
     };
diff --git a/libegg/dock/egg-dock.c b/libegg/dock/egg-dock.c
index 35eee61..d428b0e 100644
--- a/libegg/dock/egg-dock.c
+++ b/libegg/dock/egg-dock.c
@@ -552,7 +552,11 @@ egg_dock_size_request (GtkWidget      *widget,
     border_width = container->border_width;
 
     /* make request to root */
+#if GTK_CHECK_VERSION(2,20,0)
+    if (dock->root && gtk_widget_get_visible (dock->root))
+#else
     if (dock->root && GTK_WIDGET_VISIBLE (dock->root))
+#endif
         gtk_widget_size_request (GTK_WIDGET (dock->root), requisition);
     else {
         requisition->width = 0;
@@ -588,7 +592,11 @@ egg_dock_size_allocate (GtkWidget     *widget,
     allocation->width = MAX (1, allocation->width - 2 * border_width);
     allocation->height = MAX (1, allocation->height - 2 * border_width);
 
+#if GTK_CHECK_VERSION(2,20,0)
+    if (dock->root && gtk_widget_get_visible (dock->root))
+#else
     if (dock->root && GTK_WIDGET_VISIBLE (dock->root))
+#endif
         gtk_widget_size_allocate (GTK_WIDGET (dock->root), allocation);
 }
 
@@ -607,7 +615,11 @@ egg_dock_map (GtkWidget *widget)
 
     if (dock->root) {
         child = GTK_WIDGET (dock->root);
+#if GTK_CHECK_VERSION(2,20,0)
+        if (gtk_widget_get_visible (child) && !gtk_widget_get_mapped (child))
+#else
         if (GTK_WIDGET_VISIBLE (child) && !GTK_WIDGET_MAPPED (child))
+#endif
             gtk_widget_map (child);
     }
 }
@@ -627,7 +639,11 @@ egg_dock_unmap (GtkWidget *widget)
 
     if (dock->root) {
         child = GTK_WIDGET (dock->root);
+#if GTK_CHECK_VERSION(2,20,0)
+        if (gtk_widget_get_visible (child) && gtk_widget_get_mapped (child))
+#else
         if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_MAPPED (child))
+#endif
             gtk_widget_unmap (child);
     }
     
@@ -711,14 +727,22 @@ egg_dock_remove (GtkContainer *container,
     g_return_if_fail (widget != NULL);
 
     dock = EGG_DOCK (container);
+#if GTK_CHECK_VERSION(2,20,0)
+    was_visible = gtk_widget_get_visible (widget);
+#else
     was_visible = GTK_WIDGET_VISIBLE (widget);
+#endif
 
     if (GTK_WIDGET (dock->root) == widget) {
         dock->root = NULL;
         EGG_DOCK_OBJECT_UNSET_FLAGS (widget, EGG_DOCK_ATTACHED);
         gtk_widget_unparent (widget);
 
+#if GTK_CHECK_VERSION(2,20,0)
+        if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
+#else
         if (was_visible && GTK_WIDGET_VISIBLE (GTK_WIDGET (container)))
+#endif
             gtk_widget_queue_resize (GTK_WIDGET (dock));
     }
 }
@@ -928,9 +952,15 @@ egg_dock_dock (EggDockObject    *object,
         /* Map the widget if it's visible and the parent is visible and has 
            been mapped. This is done to make sure that the GdkWindow is 
            visible. */
+#if GTK_CHECK_VERSION(2,20,0)
+        if (gtk_widget_get_visible (dock) && 
+            gtk_widget_get_visible (widget)) {
+            if (gtk_widget_get_mapped (dock))
+#else
         if (GTK_WIDGET_VISIBLE (dock) && 
             GTK_WIDGET_VISIBLE (widget)) {
             if (GTK_WIDGET_MAPPED (dock))
+#endif
                 gtk_widget_map (widget);
             
             /* Make the widget resize. */
@@ -1095,9 +1125,15 @@ egg_dock_add_floating_item (EggDock        *dock,
                                        "floaty", y,
                                        NULL));
     
+#if GTK_CHECK_VERSION(2,20,0)
+    if (gtk_widget_get_visible (dock)) {
+        gtk_widget_show (GTK_WIDGET (new_dock));
+        if (gtk_widget_get_mapped (dock))
+#else
     if (GTK_WIDGET_VISIBLE (dock)) {
         gtk_widget_show (GTK_WIDGET (new_dock));
         if (GTK_WIDGET_MAPPED (dock))
+#endif
             gtk_widget_map (GTK_WIDGET (new_dock));
         
         /* Make the widget resize. */
diff --git a/libegg/iconchooser/eggiconchooserbutton.c b/libegg/iconchooser/eggiconchooserbutton.c
index e7e079f..0a1bd4f 100644
--- a/libegg/iconchooser/eggiconchooserbutton.c
+++ b/libegg/iconchooser/eggiconchooserbutton.c
@@ -460,7 +460,11 @@ button_clicked_cb (GtkButton *button,
 
   priv = EGG_ICON_CHOOSER_BUTTON_GET_PRIVATE (user_data);
 
+#if GTK_CHECK_VERSION(2,20,0)
+  if (!gtk_widget_get_visible (priv->dialog))
+#else
   if (!GTK_WIDGET_VISIBLE (priv->dialog))
+#endif
     {
       GtkWidget *toplevel;
 
diff --git a/libegg/iconchooser/eggiconchooserdefault.c b/libegg/iconchooser/eggiconchooserdefault.c
index 887680f..68c7ab8 100644
--- a/libegg/iconchooser/eggiconchooserdefault.c
+++ b/libegg/iconchooser/eggiconchooserdefault.c
@@ -1563,7 +1563,11 @@ icon_view_style_set (GtkWidget *icon_view,
 		     GtkStyle  *old_style,
 		     gpointer user_data)
 {
+#if GTK_CHECK_VERSION(2,20,0)
+  if (gtk_widget_get_visible (icon_view))
+#else
   if (GTK_WIDGET_VISIBLE (icon_view))
+#endif
     gtk_widget_modify_bg (GTK_WIDGET (user_data), GTK_STATE_NORMAL,
 			  &(icon_view->style->base[icon_view->state]));
 }
diff --git a/libegg/toolbareditor/egg-editable-toolbar.c b/libegg/toolbareditor/egg-editable-toolbar.c
index ca6534c..2b071ae 100644
--- a/libegg/toolbareditor/egg-editable-toolbar.c
+++ b/libegg/toolbareditor/egg-editable-toolbar.c
@@ -872,7 +872,11 @@ toolbar_visibility_refresh (EggEditableToolbar *etoolbar)
 
   priv->visibility_id = gtk_ui_manager_new_merge_id (priv->manager);
 
+#if GTK_CHECK_VERSION(2,20,0)
+  showing = gtk_widget_get_visible (etoolbar);
+#else
   showing = GTK_WIDGET_VISIBLE (etoolbar);
+#endif
 
   n_toolbars = egg_toolbars_model_n_toolbars (priv->model);
   for (i = 0; i < n_toolbars; i++)
@@ -954,8 +958,13 @@ toolbar_visibility_refresh (EggEditableToolbar *etoolbar)
       gtk_action_set_visible (GTK_ACTION (action), (egg_toolbars_model_get_flags (priv->model, i)
 						    & EGG_TB_MODEL_NOT_REMOVABLE) == 0);
       gtk_action_set_sensitive (GTK_ACTION (action), showing);
+#if GTK_CHECK_VERSION(2,20,0)
+      gtk_toggle_action_set_active (action, gtk_widget_get_visible
+				    (get_dock_nth (etoolbar, i)));
+#else
       gtk_toggle_action_set_active (action, GTK_WIDGET_VISIBLE
 				    (get_dock_nth (etoolbar, i)));
+#endif
 
       for (list = priv->visibility_paths; list != NULL; list = g_list_next (list))
         {
diff --git a/libegg/toolpalette/eggtoolitemgroup.c b/libegg/toolpalette/eggtoolitemgroup.c
index 99d5c23..02024e1 100644
--- a/libegg/toolpalette/eggtoolitemgroup.c
+++ b/libegg/toolpalette/eggtoolitemgroup.c
@@ -535,7 +535,11 @@ egg_tool_item_group_is_item_visible (EggToolItemGroup      *group,
     return FALSE;
 
   return
+#if GTK_CHECK_VERSION(2,20,0)
+    (gtk_widget_get_visible (child->item)) &&
+#else
     (GTK_WIDGET_VISIBLE (child->item)) &&
+#endif
     (GTK_ORIENTATION_VERTICAL == orientation ?
      gtk_tool_item_get_visible_vertical (child->item) :
      gtk_tool_item_get_visible_horizontal (child->item));
@@ -764,7 +768,11 @@ egg_tool_item_group_real_size_query (GtkWidget      *widget,
   inquery->height = 0;
 
   /* figure out header widget size */
+#if GTK_CHECK_VERSION(2,20,0)
+  if (gtk_widget_get_visible (group->priv->header))
+#else
   if (GTK_WIDGET_VISIBLE (group->priv->header))
+#endif
     {
       GtkRequisition child_requisition;
 
@@ -813,7 +821,11 @@ egg_tool_item_group_real_size_allocate (GtkWidget      *widget,
   child_allocation.y = border_width;
 
   /* place the header widget */
+#if GTK_CHECK_VERSION(2,20,0)
+  if (gtk_widget_get_visible (group->priv->header))
+#else
   if (GTK_WIDGET_VISIBLE (group->priv->header))
+#endif
     {
       gtk_widget_size_request (group->priv->header, &child_requisition);
 
@@ -1329,7 +1341,11 @@ egg_tool_item_group_set_item_packing (EggToolItemGroup *group,
 
   gtk_widget_thaw_child_notify (GTK_WIDGET (item));
 
+#if GTK_CHECK_VERSION(2,20,0)
+  if (changed && gtk_widget_get_visible (group) && gtk_widget_get_visible (item))
+#else
   if (changed && GTK_WIDGET_VISIBLE (group) && GTK_WIDGET_VISIBLE (item))
+#endif
     gtk_widget_queue_resize (GTK_WIDGET (group));
 }
 
@@ -1693,7 +1709,11 @@ egg_tool_item_group_animation_cb (gpointer data)
 
       gtk_widget_translate_coordinates (widget, parent, 0, 0, &x, &y);
 
+#if GTK_CHECK_VERSION(2,20,0)
+      if (gtk_widget_get_visible (group->priv->header))
+#else
       if (GTK_WIDGET_VISIBLE (group->priv->header))
+#endif
         {
           height -= group->priv->header->allocation.height;
           y += group->priv->header->allocation.height;
@@ -1923,7 +1943,11 @@ egg_tool_item_group_set_item_position (EggToolItemGroup *group,
   group->priv->children = g_list_insert (group->priv->children, child, position);
 
   gtk_widget_child_notify (GTK_WIDGET (item), "position");
+#if GTK_CHECK_VERSION(2,20,0)
+  if (gtk_widget_get_visible (group) && gtk_widget_get_visible (item))
+#else
   if (GTK_WIDGET_VISIBLE (group) && GTK_WIDGET_VISIBLE (item))
+#endif
     gtk_widget_queue_resize (GTK_WIDGET (group));
 }
 
@@ -2109,7 +2133,11 @@ _egg_tool_item_group_paint (EggToolItemGroup *group,
 
       v0 = v1 - 256;
 
+#if GTK_CHECK_VERSION(2,20,0)
+      if (!gtk_widget_get_visible (group->priv->header))
+#else
       if (!GTK_WIDGET_VISIBLE (group->priv->header))
+#endif
         v0 = MAX (v0, 0);
       else if (GTK_ORIENTATION_VERTICAL == orientation)
         v0 = MAX (v0, group->priv->header->allocation.height);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]