X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fgtkcols.h;h=b7410cb41c131b85fc9f115d3c587d24d621e59f;hb=6ef6cb1573a9a587e4912f735ad837f149f50a5a;hp=5bcc62768adaf9597b054173b0ea004ec1ad7c74;hpb=df85003ea56581734754d7404fa08e4081f9dd34;p=PuTTY.git

diff --git a/unix/gtkcols.h b/unix/gtkcols.h
index 5bcc6276..b7410cb4 100644
--- a/unix/gtkcols.h
+++ b/unix/gtkcols.h
@@ -8,18 +8,18 @@
 #define COLUMNS_H
 
 #include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 #define TYPE_COLUMNS (columns_get_type())
-#define COLUMNS(obj) (GTK_CHECK_CAST((obj), TYPE_COLUMNS, Columns))
-#define COLUMNS_CLASS(klass) \
-                (GTK_CHECK_CLASS_CAST((klass), TYPE_COLUMNS, ColumnsClass))
-#define IS_COLUMNS(obj) (GTK_CHECK_TYPE((obj), TYPE_COLUMNS))
-#define IS_COLUMNS_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), TYPE_COLUMNS))
+#define COLUMNS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_COLUMNS, Columns))
+#define COLUMNS_CLASS(klass)                                            \
+    (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_COLUMNS, ColumnsClass))
+#define IS_COLUMNS(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), TYPE_COLUMNS))
+#define IS_COLUMNS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), TYPE_COLUMNS))
 
 typedef struct Columns_tag Columns;
 typedef struct ColumnsClass_tag ColumnsClass;
@@ -42,18 +42,21 @@ struct ColumnsChild_tag {
     GtkWidget *widget;
     gint colstart, colspan;
     gboolean force_left;	       /* for recalcitrant GtkLabels */
+    ColumnsChild *same_height_as;
     /* Otherwise, this entry represents a change in the column setup. */
     gint ncols;
     gint *percentages;
+    gint x, y, w, h;           /* used during an individual size computation */
 };
 
-GtkType columns_get_type(void);
+GType columns_get_type(void);
 GtkWidget *columns_new(gint spacing);
 void columns_set_cols(Columns *cols, gint ncols, const gint *percentages);
 void columns_add(Columns *cols, GtkWidget *child,
                  gint colstart, gint colspan);
 void columns_taborder_last(Columns *cols, GtkWidget *child);
 void columns_force_left_align(Columns *cols, GtkWidget *child);
+void columns_force_same_height(Columns *cols, GtkWidget *ch1, GtkWidget *ch2);
 
 #ifdef __cplusplus
 }