GtkEntry: Sanity check the end_pos value in _get_display_text()

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

diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 6b1664e8736fe30a1e4a1f92a291722d7f66759c..999710c1671d93592c7f7a0f86e114a90356dc5d 100644 (file)
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -49,7 +49,7 @@
  *
  * A toggle button is created by calling either gtk_toggle_button_new() or
  * gtk_toggle_button_new_with_label(). If using the former, it is advisable to
- * pack a widget, (such as a #GtkLabel and/or a #GtkPixmap), into the toggle
+ * pack a widget, (such as a #GtkLabel and/or a #GtkImage), into the toggle
  * button's container. (See #GtkButton for more information).
  *
  * The state of a #GtkToggleButton can be set specifically using
@@ -448,7 +448,8 @@ gtk_toggle_button_get_mode (GtkToggleButton *toggle_button)
  *
  * Sets the status of the toggle button. Set to %TRUE if you want the
  * GtkToggleButton to be 'pressed in', and %FALSE to raise it.
- * This action causes the toggled signal to be emitted.
+ * This action causes the #GtkToggleButton::toggled signal and the
+ * #GtkButton::clicked signal to be emitted.
  */
 void
 gtk_toggle_button_set_active (GtkToggleButton *toggle_button,
@@ -643,7 +644,7 @@ gtk_toggle_button_update_state (GtkButton *button)
   else
     depressed = priv->active;
 
-  if (button->priv->in_button && (!button->priv->button_down || priv->draw_indicator))
+  if (button->priv->in_button)
     new_state |= GTK_STATE_FLAG_PRELIGHT;
 
   if (depressed)