X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtklayout.h;h=04dcb51c5724b48bc83280d8a39c57fb175924fd;hb=320613c439c6c7eeb5bc64685522195e0a6adc4e;hp=709c35451ca0c4a9bce14a504390964d2b5b2602;hpb=a78ab0cfa1d5e5e15d505bce0761a00708400ce3;p=~andy%2Fgtk

diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index 709c35451..04dcb51c5 100644
--- 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.
  *
@@ -28,16 +26,15 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_LAYOUT_H__
 #define __GTK_LAYOUT_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcontainer.h>
-#include <gtk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS
@@ -94,14 +91,14 @@ void           gtk_layout_get_size        (GtkLayout     *layout,
 					   guint         *width,
 					   guint         *height);
 
-GDK_DEPRECATED_FOR(gtk_scrollable_get_hadjustment)
+GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_hadjustment)
 GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout     *layout);
-GDK_DEPRECATED_FOR(gtk_scrollable_get_vadjustment)
+GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_vadjustment)
 GtkAdjustment* gtk_layout_get_vadjustment (GtkLayout     *layout);
-GDK_DEPRECATED_FOR(gtk_scrollable_set_hadjustment)
+GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_hadjustment)
 void           gtk_layout_set_hadjustment (GtkLayout     *layout,
                                            GtkAdjustment *adjustment);
-GDK_DEPRECATED_FOR(gtk_scrollable_set_vadjustment)
+GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_vadjustment)
 void           gtk_layout_set_vadjustment (GtkLayout     *layout,
                                            GtkAdjustment *adjustment);