summaryrefslogtreecommitdiff
path: root/gtk/gtkwidget.h
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2010-09-11 19:41:24 -0400
committerHavoc Pennington <hp@pobox.com>2010-09-11 19:41:24 -0400
commit733991c84df4300ec54af8b557385759a93360f0 (patch)
tree4c800a2d3b7d32afecf2275ace504234f5090b42 /gtk/gtkwidget.h
parent83008588e162b78f8f66ba371c3691a2ca759f3b (diff)
downloadgtk+-widget-padding.tar.gz
Rename GtkWidget padding to marginwidget-padding
Diffstat (limited to 'gtk/gtkwidget.h')
-rw-r--r--gtk/gtkwidget.h41
1 files changed, 21 insertions, 20 deletions
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 85491109f4..8efdcd6ce7 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -506,7 +506,7 @@ struct _GtkWidgetAuxInfo
guint h_align : 4;
guint v_align : 4;
- GtkBorder padding;
+ GtkBorder margin;
};
struct _GtkWidgetShapeInfo
@@ -736,25 +736,26 @@ void gtk_widget_set_support_multidevice (GtkWidget *widget,
AtkObject* gtk_widget_get_accessible (GtkWidget *widget);
-/* Padding and alignment */
-GtkAlign gtk_widget_get_h_align (GtkWidget *widget);
-void gtk_widget_set_h_align (GtkWidget *widget,
- GtkAlign align);
-GtkAlign gtk_widget_get_v_align (GtkWidget *widget);
-void gtk_widget_set_v_align (GtkWidget *widget,
- GtkAlign align);
-int gtk_widget_get_padding_left (GtkWidget *widget);
-void gtk_widget_set_padding_left (GtkWidget *widget,
- int padding);
-int gtk_widget_get_padding_right (GtkWidget *widget);
-void gtk_widget_set_padding_right (GtkWidget *widget,
- int padding);
-int gtk_widget_get_padding_top (GtkWidget *widget);
-void gtk_widget_set_padding_top (GtkWidget *widget,
- int padding);
-int gtk_widget_get_padding_bottom (GtkWidget *widget);
-void gtk_widget_set_padding_bottom (GtkWidget *widget,
- int padding);
+/* Margin and alignment */
+GtkAlign gtk_widget_get_h_align (GtkWidget *widget);
+void gtk_widget_set_h_align (GtkWidget *widget,
+ GtkAlign align);
+GtkAlign gtk_widget_get_v_align (GtkWidget *widget);
+void gtk_widget_set_v_align (GtkWidget *widget,
+ GtkAlign align);
+int gtk_widget_get_margin_left (GtkWidget *widget);
+void gtk_widget_set_margin_left (GtkWidget *widget,
+ int margin);
+int gtk_widget_get_margin_right (GtkWidget *widget);
+void gtk_widget_set_margin_right (GtkWidget *widget,
+ int margin);
+int gtk_widget_get_margin_top (GtkWidget *widget);
+void gtk_widget_set_margin_top (GtkWidget *widget,
+ int margin);
+int gtk_widget_get_margin_bottom (GtkWidget *widget);
+void gtk_widget_set_margin_bottom (GtkWidget *widget,
+ int margin);
+
/* The following functions must not be called on an already
* realized widget. Because it is possible that somebody