spinbutton: don't override initial text in non-numeric-only spin buttons

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

diff --git a/gtk/gtkcellareacontext.c b/gtk/gtkcellareacontext.c
index cc2cbb0eda9b714708ab16dc7ca3fd27643c4a97..f464c3ab30233d59b231042cba94e8a29d969b83 100644 (file)
--- a/gtk/gtkcellareacontext.c
+++ b/gtk/gtkcellareacontext.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/>.
  */
 
 /**
@@ -32,7 +30,7 @@
  * #GtkTreeModel rows that are requested and rendered in the same context.
  *
  * #GtkCellLayout widgets can create any number of contexts in which to
- * request and render groups of data rows. However its important that the
+ * request and render groups of data rows. However, it's important that the
  * same context which was used to request sizes for a given #GtkTreeModel
  * row also be used for the same row when calling other #GtkCellArea APIs
  * such as gtk_cell_area_render() and gtk_cell_area_event().
@@ -87,17 +85,9 @@ G_DEFINE_TYPE (GtkCellAreaContext, gtk_cell_area_context, G_TYPE_OBJECT);
 static void
 gtk_cell_area_context_init (GtkCellAreaContext *context)
 {
-  GtkCellAreaContextPrivate *priv;
-
   context->priv = G_TYPE_INSTANCE_GET_PRIVATE (context,
                                                GTK_TYPE_CELL_AREA_CONTEXT,
                                                GtkCellAreaContextPrivate);
-  priv = context->priv;
-
-  priv->min_width  = -1;
-  priv->nat_width  = -1;
-  priv->min_height = -1;
-  priv->nat_height = -1;
 }
 
 static void
@@ -289,27 +279,27 @@ gtk_cell_area_context_real_reset (GtkCellAreaContext *context)
 
   g_object_freeze_notify (G_OBJECT (context));
 
-  if (priv->min_width != -1)
+  if (priv->min_width != 0)
     {
-      priv->min_width = -1;
+      priv->min_width = 0;
       g_object_notify (G_OBJECT (context), "minimum-width");
     }
 
-  if (priv->nat_width != -1)
+  if (priv->nat_width != 0)
     {
-      priv->nat_width = -1;
+      priv->nat_width = 0;
       g_object_notify (G_OBJECT (context), "natural-width");
     }
 
-  if (priv->min_height != -1)
+  if (priv->min_height != 0)
     {
-      priv->min_height = -1;
+      priv->min_height = 0;
       g_object_notify (G_OBJECT (context), "minimum-height");
     }
 
-  if (priv->nat_height != -1)
+  if (priv->nat_height != 0)
     {
-      priv->nat_height = -1;
+      priv->nat_height = 0;
       g_object_notify (G_OBJECT (context), "natural-height");
     }
 
@@ -339,12 +329,12 @@ gtk_cell_area_context_real_allocate (GtkCellAreaContext *context,
  *
  * Fetches the #GtkCellArea this @context was created by.
  *
- * This is generally unneeded by layouting widgets; however
+ * This is generally unneeded by layouting widgets; however,
  * it is important for the context implementation itself to
  * fetch information about the area it is being used for.
  *
  * For instance at #GtkCellAreaContextClass.allocate() time
- * its important to know details about any cell spacing
+ * it's important to know details about any cell spacing
  * that the #GtkCellArea is configured with in order to
  * compute a proper allocation.
  *
@@ -444,7 +434,7 @@ gtk_cell_area_context_allocate (GtkCellAreaContext *context,
  * requested with this context.
  *
  * After gtk_cell_area_context_reset() is called and/or before ever
- * requesting the size of a #GtkCellArea, the returned values are -1.
+ * requesting the size of a #GtkCellArea, the returned values are 0.
  *
  * Since: 3.0
  */
@@ -478,7 +468,7 @@ gtk_cell_area_context_get_preferred_width (GtkCellAreaContext *context,
  * requested with this context.
  *
  * After gtk_cell_area_context_reset() is called and/or before ever
- * requesting the size of a #GtkCellArea, the returned values are -1.
+ * requesting the size of a #GtkCellArea, the returned values are 0.
  *
  * Since: 3.0
  */