X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtklayout.h;h=04dcb51c5724b48bc83280d8a39c57fb175924fd;hb=320613c439c6c7eeb5bc64685522195e0a6adc4e;hp=0cf7a12e4a0e40b68357b4bfdc16af943570421b;hpb=ef03cb52872c19788e889b55ce9b30ff5a616677;p=~andy%2Fgtk
diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index 0cf7a12e4..04dcb51c5 100644
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -2,19 +2,17 @@
* 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
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see .
*
* GtkLayout: Widget for scrolling of arbitrary-sized areas.
*
@@ -22,104 +20,89 @@
*/
/*
- * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
+ * 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/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#ifndef __GTK_LAYOUT_H
-#define __GTK_LAYOUT_H
+#ifndef __GTK_LAYOUT_H__
+#define __GTK_LAYOUT_H__
+
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
-#include
#include
-#include
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#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))
+#define GTK_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LAYOUT, GtkLayout))
+#define GTK_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LAYOUT, GtkLayoutClass))
+#define GTK_IS_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LAYOUT))
+#define GTK_IS_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LAYOUT))
+#define GTK_LAYOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LAYOUT, GtkLayoutClass))
-typedef struct _GtkLayout GtkLayout;
-typedef struct _GtkLayoutClass GtkLayoutClass;
+typedef struct _GtkLayout GtkLayout;
+typedef struct _GtkLayoutPrivate GtkLayoutPrivate;
+typedef struct _GtkLayoutClass GtkLayoutClass;
-struct _GtkLayout {
+struct _GtkLayout
+{
GtkContainer container;
- GList *children;
-
- guint width;
- guint height;
-
- guint xoffset;
- guint yoffset;
-
- GtkAdjustment *hadjustment;
- GtkAdjustment *vadjustment;
-
- GdkWindow *bin_window;
-
- GdkVisibilityState visibility;
- gulong configure_serial;
- gint scroll_x;
- gint scroll_y;
-
- guint freeze_count;
+ /*< private >*/
+ GtkLayoutPrivate *priv;
};
-struct _GtkLayoutClass {
+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);
+ void (*_gtk_reserved3) (void);
+ void (*_gtk_reserved4) (void);
};
-GtkType gtk_layout_get_type (void);
+GType gtk_layout_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_layout_new (GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment);
-void gtk_layout_put (GtkLayout *layout,
- GtkWidget *widget,
- gint x,
+GdkWindow* gtk_layout_get_bin_window (GtkLayout *layout);
+void gtk_layout_put (GtkLayout *layout,
+ GtkWidget *child_widget,
+ gint x,
gint y);
-
-void gtk_layout_move (GtkLayout *layout,
- GtkWidget *widget,
- gint x,
+
+void gtk_layout_move (GtkLayout *layout,
+ GtkWidget *child_widget,
+ gint x,
gint y);
-
-void gtk_layout_set_size (GtkLayout *layout,
+
+void gtk_layout_set_size (GtkLayout *layout,
guint width,
guint height);
+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);
-/* 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);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
-#endif /* __GTK_LAYOUT_H */
+#endif /* __GTK_LAYOUT_H__ */