Fix stupid error introduced last night that was making things decidedly

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

diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index c7ca1d5ff0ec34124f8385759898074111224941..b216761b1e69c0cec157ed9c7da0ba86524562da 100644 (file)
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -2,16 +2,16 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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.
@@ -21,6 +21,13 @@
  * Copyright Owen Taylor, 1998
  */
 
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
 #ifndef __GTK_LAYOUT_H
 #define __GTK_LAYOUT_H
 
@@ -32,23 +39,17 @@
 extern "C" {
 #endif /* __cplusplus */
 
+
 #define GTK_TYPE_LAYOUT            (gtk_layout_get_type ())
 #define GTK_LAYOUT(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_LAYOUT, GtkLayout))
 #define GTK_LAYOUT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LAYOUT, GtkLayoutClass))
 #define GTK_IS_LAYOUT(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_LAYOUT))
 #define GTK_IS_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LAYOUT))
+#define GTK_LAYOUT_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LAYOUT, GtkLayoutClass))
+
 
 typedef struct _GtkLayout        GtkLayout;
 typedef struct _GtkLayoutClass   GtkLayoutClass;
-typedef struct _GtkLayoutChild   GtkLayoutChild;
-
-struct _GtkLayoutChild {
-  GtkWidget *widget;
-  GdkWindow *window;   /* For NO_WINDOW widgets */
-  gint x;
-  gint y;
-  gboolean mapped : 1;
-};
 
 struct _GtkLayout {
   GtkContainer container;
@@ -67,7 +68,6 @@ struct _GtkLayout {
   GdkWindow *bin_window;
 
   GdkVisibilityState visibility;
-  gulong configure_serial;
   gint scroll_x;
   gint scroll_y;
 
@@ -82,7 +82,7 @@ struct _GtkLayoutClass {
                                     GtkAdjustment  *vadjustment);
 };
 
-GtkType        gtk_layout_get_type        (void);
+GtkType        gtk_layout_get_type        (void) G_GNUC_CONST;
 GtkWidget*     gtk_layout_new             (GtkAdjustment *hadjustment,
                                           GtkAdjustment *vadjustment);
 void           gtk_layout_put             (GtkLayout     *layout, 
@@ -98,13 +98,9 @@ void           gtk_layout_move            (GtkLayout     *layout,
 void           gtk_layout_set_size        (GtkLayout     *layout, 
                                           guint          width,
                                           guint          height);
-
-/* These disable and enable moving and repainting the scrolling window of the GtkLayout,
- * respectively.  If you want to update the layout's offsets but do not want it to
- * repaint itself, you should use these functions.
- */
-void           gtk_layout_freeze          (GtkLayout     *layout);
-void           gtk_layout_thaw            (GtkLayout     *layout);
+void           gtk_layout_get_size        (GtkLayout     *layout,
+                                          guint         *width,
+                                          guint         *height);
 
 GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout     *layout);
 GtkAdjustment* gtk_layout_get_vadjustment (GtkLayout     *layout);
@@ -113,6 +109,20 @@ void           gtk_layout_set_hadjustment (GtkLayout     *layout,
 void           gtk_layout_set_vadjustment (GtkLayout     *layout,
                                           GtkAdjustment *adjustment);
 
+
+#ifndef GTK_DISABLE_DEPRECATED
+/* These disable and enable moving and repainting the scrolling window
+ * of the GtkLayout, respectively.  If you want to update the layout's
+ * offsets but do not want it to repaint itself, you should use these
+ * functions.
+ *
+ * - I don't understand these are supposed to work, so I suspect
+ * - they don't now.                    OWT 1/20/98
+ */
+void           gtk_layout_freeze          (GtkLayout     *layout);
+void           gtk_layout_thaw            (GtkLayout     *layout);
+#endif /* GTK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */