Some more documentation fixes

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

diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index 61ba27f6e9d5319b57d5a0b1478036c8a8509334..04dcb51c5724b48bc83280d8a39c57fb175924fd 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.
  *
@@ -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,16 +91,17 @@ void           gtk_layout_get_size        (GtkLayout     *layout,
                                           guint         *width,
                                           guint         *height);
 
-#ifndef GTK_DISABLE_DEPRECATED
-
+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);
 
-#endif
 
 G_END_DECLS