notebook: restore previous behaviour wrt. unparenting of tab labels

[~andy/gtk] / gtk / gtklayout.h

diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index d29e7331ab4e30f18e35a5b888a21a17201547d2..f5b710e43abf2d97209b6db80e638241ef715e44 100644 (file)
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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/>.
  *
  * GtkLayout: Widget for scrolling of arbitrary-sized areas.
  *
@@ -37,7 +35,6 @@
 
 
 #include <gtk/gtkcontainer.h>
-#include <gtk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS
@@ -58,7 +55,7 @@ struct _GtkLayout
 {
   GtkContainer container;
 
-  /* <private> */
+  /*< private >*/
   GtkLayoutPrivate *priv;
 };
 
@@ -66,10 +63,6 @@ struct _GtkLayoutClass
 {
   GtkContainerClass parent_class;
 
-  void  (*set_scroll_adjustments)   (GtkLayout     *layout,
-                                    GtkAdjustment  *hadjustment,
-                                    GtkAdjustment  *vadjustment);
-
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
@@ -98,12 +91,17 @@ void           gtk_layout_get_size        (GtkLayout     *layout,
                                           guint         *width,
                                           guint         *height);
 
+GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_hadjustment)
 GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout     *layout);
+GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_vadjustment)
 GtkAdjustment* gtk_layout_get_vadjustment (GtkLayout     *layout);
+GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_hadjustment)
 void           gtk_layout_set_hadjustment (GtkLayout     *layout,
-                                          GtkAdjustment *adjustment);
+                                           GtkAdjustment *adjustment);
+GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_vadjustment)
 void           gtk_layout_set_vadjustment (GtkLayout     *layout,
-                                          GtkAdjustment *adjustment);
+                                           GtkAdjustment *adjustment);
+
 
 G_END_DECLS