]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtktable.h
use more elaborate variable names.
[~andy/gtk] / gtk / gtktable.h
index afd2cd2bdc80f35572b73dc0dc8155b98519ce4e..103f6d1929d7c5d10a2992adeb1bae3decfc9201 100644 (file)
@@ -2,19 +2,28 @@
  * 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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.
  */
+
+/*
+ * 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_TABLE_H__
 #define __GTK_TABLE_H__
 
@@ -28,20 +37,23 @@ extern "C" {
 #endif /* __cplusplus */
 
 
-#define GTK_TABLE(obj)          GTK_CHECK_CAST (obj, gtk_table_get_type (), GtkTable)
-#define GTK_TABLE_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_table_get_type (), GtkTableClass)
-#define GTK_IS_TABLE(obj)       GTK_CHECK_TYPE (obj, gtk_table_get_type ())
+#define GTK_TYPE_TABLE                 (gtk_table_get_type ())
+#define GTK_TABLE(obj)                 (GTK_CHECK_CAST ((obj), GTK_TYPE_TABLE, GtkTable))
+#define GTK_TABLE_CLASS(klass)         (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TABLE, GtkTableClass))
+#define GTK_IS_TABLE(obj)              (GTK_CHECK_TYPE ((obj), GTK_TYPE_TABLE))
+#define GTK_IS_TABLE_CLASS(klass)      (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TABLE))
+#define GTK_TABLE_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TABLE, GtkTableClass))
 
 
-typedef struct _GtkTable        GtkTable;
-typedef struct _GtkTableClass   GtkTableClass;
-typedef struct _GtkTableChild   GtkTableChild;
-typedef struct _GtkTableRowCol  GtkTableRowCol;
+typedef struct _GtkTable       GtkTable;
+typedef struct _GtkTableClass  GtkTableClass;
+typedef struct _GtkTableChild  GtkTableChild;
+typedef struct _GtkTableRowCol GtkTableRowCol;
 
 struct _GtkTable
 {
   GtkContainer container;
-
+  
   GList *children;
   GtkTableRowCol *rows;
   GtkTableRowCol *cols;
@@ -83,40 +95,45 @@ struct _GtkTableRowCol
   guint need_shrink : 1;
   guint expand : 1;
   guint shrink : 1;
+  guint empty : 1;
 };
 
 
-guint      gtk_table_get_type         (void);
-GtkWidget* gtk_table_new              (gint           rows,
-                                      gint           columns,
-                                      gint           homogeneous);
-
-void       gtk_table_attach           (GtkTable      *table,
-                                      GtkWidget     *child,
-                                      gint           left_attach,
-                                      gint           right_attach,
-                                      gint           top_attach,
-                                      gint           bottom_attach,
-                                      gint           xoptions,
-                                      gint           yoptions,
-                                      gint           xpadding,
-                                      gint           ypadding);
-void       gtk_table_attach_defaults  (GtkTable      *table,
-                                      GtkWidget     *widget,
-                                      gint           left_attach,
-                                      gint           right_attach,
-                                      gint           top_attach,
-                                      gint           bottom_attach);
-void       gtk_table_set_row_spacing  (GtkTable      *table,
-                                      gint           row,
-                                      gint           spacing);
-void       gtk_table_set_col_spacing  (GtkTable      *table,
-                                      gint           column,
-                                      gint           spacing);
-void       gtk_table_set_row_spacings (GtkTable      *table,
-                                      gint           spacing);
-void       gtk_table_set_col_spacings (GtkTable      *table,
-                                      gint           spacing);
+GtkType           gtk_table_get_type         (void) G_GNUC_CONST;
+GtkWidget* gtk_table_new             (guint            rows,
+                                      guint            columns,
+                                      gboolean         homogeneous);
+void      gtk_table_resize           (GtkTable        *table,
+                                      guint            rows,
+                                      guint            columns);
+void      gtk_table_attach           (GtkTable        *table,
+                                      GtkWidget       *child,
+                                      guint            left_attach,
+                                      guint            right_attach,
+                                      guint            top_attach,
+                                      guint            bottom_attach,
+                                      GtkAttachOptions xoptions,
+                                      GtkAttachOptions yoptions,
+                                      guint            xpadding,
+                                      guint            ypadding);
+void      gtk_table_attach_defaults  (GtkTable        *table,
+                                      GtkWidget       *widget,
+                                      guint            left_attach,
+                                      guint            right_attach,
+                                      guint            top_attach,
+                                      guint            bottom_attach);
+void      gtk_table_set_row_spacing  (GtkTable        *table,
+                                      guint            row,
+                                      guint            spacing);
+void      gtk_table_set_col_spacing  (GtkTable        *table,
+                                      guint            column,
+                                      guint            spacing);
+void      gtk_table_set_row_spacings (GtkTable        *table,
+                                      guint            spacing);
+void      gtk_table_set_col_spacings (GtkTable        *table,
+                                      guint            spacing);
+void      gtk_table_set_homogeneous  (GtkTable        *table,
+                                      gboolean         homogeneous);
 
 
 #ifdef __cplusplus