gtk+ r20682 - in trunk: . gtk

[johan svn gnome org]

Author: johan
Date: Tue Jun 24 13:41:13 2008
New Revision: 20682
URL: http://svn.gnome.org/viewvc/gtk+?rev=20682&view=rev

Log:
Revert GtkScaleButton accesses for plus/minus buttons, as per #539944

Modified:
   trunk/ChangeLog
   trunk/gtk/gtk.symbols
   trunk/gtk/gtkcontainer.c
   trunk/gtk/gtkscalebutton.c
   trunk/gtk/gtkscalebutton.h

Modified: trunk/gtk/gtk.symbols
==============================================================================
--- trunk/gtk/gtk.symbols	(original)
+++ trunk/gtk/gtk.symbols	Tue Jun 24 13:41:13 2008
@@ -3309,8 +3309,6 @@
 gtk_scale_button_set_value
 gtk_scale_button_get_adjustment
 gtk_scale_button_set_adjustment
-gtk_scale_button_get_minus_button
-gtk_scale_button_get_plus_button
 #endif
 #endif
 

Modified: trunk/gtk/gtkcontainer.c
==============================================================================
--- trunk/gtk/gtkcontainer.c	(original)
+++ trunk/gtk/gtkcontainer.c	Tue Jun 24 13:41:13 2008
@@ -819,6 +819,7 @@
   g_return_if_fail (GTK_IS_CONTAINER (container));
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (widget->parent == NULL);
+  g_return_if_fail (widget->parent == container);
 
   g_object_ref (container);
   g_object_ref (widget);

Modified: trunk/gtk/gtkscalebutton.c
==============================================================================
--- trunk/gtk/gtkscalebutton.c	(original)
+++ trunk/gtk/gtkscalebutton.c	Tue Jun 24 13:41:13 2008
@@ -1321,41 +1321,5 @@
   g_object_notify (G_OBJECT (button), "value");
 }
  
-/**
- * gtk_scale_button_get_plus_button:
- * @button: a #GtkScaleButton
- *
- * Retrieves the scale buttons plus button widget
- *
- * Return value: the plus button widget
- *
- * Since: 2.14
- */
-GtkWidget*
-gtk_scale_button_get_plus_button (GtkScaleButton *button)
-{
-  g_return_val_if_fail (GTK_IS_SCALE_BUTTON (button), button);
-
-  return button->plus_button;
-}
-
-/**
- * gtk_scale_button_get_minus_button:
- * @button: a #GtkScaleButton
- *
- * Retrieves the scale buttons minus button widget
- *
- * Return value: the minus button widget
- *
- * Since: 2.14
- */
-GtkWidget*
-gtk_scale_button_get_minus_button (GtkScaleButton *button)
-{
-  g_return_val_if_fail (GTK_IS_SCALE_BUTTON (button), button);
-
-  return button->minus_button;
-}
-
 #define __GTK_SCALE_BUTTON_C__
 #include "gtkaliasdef.c"

Modified: trunk/gtk/gtkscalebutton.h
==============================================================================
--- trunk/gtk/gtkscalebutton.h	(original)
+++ trunk/gtk/gtkscalebutton.h	Tue Jun 24 13:41:13 2008
@@ -95,8 +95,6 @@
 GtkAdjustment*	gtk_scale_button_get_adjustment	(GtkScaleButton *button);
 void		gtk_scale_button_set_adjustment	(GtkScaleButton *button,
 						 GtkAdjustment  *adjustment);
-GtkWidget*	gtk_scale_button_get_plus_button (GtkScaleButton *button);
-GtkWidget*	gtk_scale_button_get_minus_button (GtkScaleButton *button);
 
 G_END_DECLS