filechooserbutton: Test that the expected filename is shown

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

diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index d701b74c4fbc096cb838039ba0adc885e4f2fe7b..9f4b4e203f9ef49bb833a479c069991284b5acdd 100644 (file)
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -12,9 +12,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/>.
  */
 
 #include "config.h"
@@ -43,12 +41,12 @@
  * elements on a #cairo_t. Typically, one cell renderer is used to
  * draw many cells on the screen.  To this extent, it isn't expected that a
  * CellRenderer keep any permanent state around.  Instead, any state is set
- * just prior to use using #GObject<!-- -->s property system.  Then, the
+ * just prior to use using #GObjects property system.  Then, the
  * cell is measured using gtk_cell_renderer_get_size(). Finally, the cell
  * is rendered in the correct location using gtk_cell_renderer_render().
  *
  * There are a number of rules that must be followed when writing a new
- * #GtkCellRenderer.  First and formost, its important that a certain set
+ * #GtkCellRenderer.  First and foremost, it's important that a certain set
  * of properties will always yield a cell renderer of the same size,
  * barring a #GtkStyle change.  The #GtkCellRenderer also has a number of
  * generic properties that are expected to be honored by all children.
@@ -62,6 +60,11 @@
  * To make a cell renderer activatable or editable, you have to
  * implement the #GtkCellRendererClass.activate or
  * #GtkCellRendererClass.start_editing virtual functions, respectively.
+ *
+ * Many properties of #GtkCellRenderer and its subclasses have a
+ * corresponding "set" property, e.g. "cell-background-set" corresponds
+ * to "cell-background". These "set" properties reflect whether a property
+ * has been set or not. You should not set them independently.
  */
 
 
@@ -422,11 +425,11 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
 
   ADD_SET_PROP ("cell-background-set", PROP_CELL_BACKGROUND_SET,
                 P_("Cell background set"),
-                P_("Whether this tag affects the cell background color"));
+                P_("Whether the cell background color is set"));
 
   g_type_class_add_private (class, sizeof (GtkCellRendererPrivate));
 
-  _gtk_cell_renderer_class_set_accessible_type (class, GTK_TYPE_RENDERER_CELL_ACCESSIBLE);
+  gtk_cell_renderer_class_set_accessible_type (class, GTK_TYPE_RENDERER_CELL_ACCESSIBLE);
 }
 
 static void
@@ -865,6 +868,8 @@ gtk_cell_renderer_start_editing (GtkCellRenderer      *cell,
                                                                (GdkRectangle *) background_area,
                                                                (GdkRectangle *) cell_area,
                                                                flags);
+  gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (editable)),
+                               GTK_STYLE_CLASS_CELL);
 
   g_signal_emit (cell, 
                 cell_renderer_signals[EDITING_STARTED], 0,
@@ -1776,8 +1781,8 @@ gtk_cell_renderer_get_state (GtkCellRenderer      *cell,
   return state;
 }
 
-/*
- * _gtk_cell_renderer_class_set_accessible_type:
+/**
+ * gtk_cell_renderer_class_set_accessible_type:
  * @renderer_class: class to set the accessible type for
  * @type: The object type that implements the accessible for @widget_class.
  *     The type must be a subtype of #GtkRendererCellAccessible
@@ -1790,8 +1795,8 @@ gtk_cell_renderer_get_state (GtkCellRenderer      *cell,
  * renderers.
  **/
 void
-_gtk_cell_renderer_class_set_accessible_type (GtkCellRendererClass *renderer_class,
-                                              GType                 type)
+gtk_cell_renderer_class_set_accessible_type (GtkCellRendererClass *renderer_class,
+                                             GType                 type)
 {
   GtkCellRendererClassPrivate *priv;