filechooser: Rename _gtk_file_is_path_not_local() to _gtk_file_has_native_path()

[~andy/gtk] / gtk / gtkcellareabox.c

diff --git a/gtk/gtkcellareabox.c b/gtk/gtkcellareabox.c
index ea3a3c8a8d24db2f917d623b822e2fca6bada8a5..aa05220ae1d1973b89ff07fb730f6cf994babb59 100644 (file)
--- a/gtk/gtkcellareabox.c
+++ b/gtk/gtkcellareabox.c
@@ -16,9 +16,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -201,8 +199,6 @@ static GSList        *get_allocated_cells    (GtkCellAreaBox        *box,
 
 struct _GtkCellAreaBoxPrivate
 {
-  GtkOrientation   orientation;
-
   /* We hold on to the previously focused cell when navigating
    * up and down in a horizontal box (or left and right on a vertical one)
    * this way we always re-enter the last focused cell.
@@ -215,6 +211,7 @@ struct _GtkCellAreaBoxPrivate
 
   GSList          *contexts;
 
+  GtkOrientation   orientation;
   gint             spacing;
 
   /* We hold on to the rtl state from a widget we are requested for
@@ -636,8 +633,8 @@ init_context_group (GtkCellAreaBox        *box,
       align_groups[i]  = group->align;
     }
 
-  /* This call implies reseting the request info */
-  gtk_cell_area_box_init_groups (context, priv->groups->len, expand_groups, align_groups);
+  /* This call implies resetting the request info */
+  _gtk_cell_area_box_init_groups (context, priv->groups->len, expand_groups, align_groups);
   g_free (expand_groups);
   g_free (align_groups);
 }
@@ -1049,25 +1046,6 @@ gtk_cell_area_box_dispose (GObject *object)
   G_OBJECT_CLASS (gtk_cell_area_box_parent_class)->dispose (object);
 }
 
-static void
-reset_orientation_style (GtkCellAreaBox *box)
-{
-  GtkStyleContext *context;
-
-  context = gtk_widget_get_style_context (GTK_WIDGET (box));
-
-  if (box->priv->orientation == GTK_ORIENTATION_VERTICAL)
-    {
-      gtk_style_context_add_class (context, GTK_STYLE_CLASS_VERTICAL);
-      gtk_style_context_remove_class (context, GTK_STYLE_CLASS_HORIZONTAL);
-    }
-  else
-    {
-      gtk_style_context_add_class (context, GTK_STYLE_CLASS_HORIZONTAL);
-      gtk_style_context_remove_class (context, GTK_STYLE_CLASS_VERTICAL);
-    }
-}
-
 static void
 gtk_cell_area_box_set_property (GObject       *object,
                                 guint          prop_id,
@@ -1083,7 +1061,6 @@ gtk_cell_area_box_set_property (GObject       *object,
 
       /* Notify that size needs to be requested again */
       reset_contexts (box);
-      reset_orientation_style (box);
 
       break;
     case PROP_SPACING:
@@ -1789,7 +1766,7 @@ compute_size_for_opposing_orientation (GtkCellAreaBox        *box,
         }
 
       /* Now we have the allocation for the group,
-       * request it's height-for-width
+       * request its height-for-width
        */
       compute_group_size_for_opposing_orientation (box, group, widget,
                                                    orientation_sizes[i].minimum_size,