46 lines
1.2 KiB
Diff
46 lines
1.2 KiB
Diff
From 5190d010d95010a845715c719c3b85a75e0c513a Mon Sep 17 00:00:00 2001
|
|
From: William Hua <william.hua@canonical.com>
|
|
Date: Thu, 17 Dec 2015 12:18:03 -0500
|
|
Subject: [PATCH 1/2] gtkborder: restore original struct definition
|
|
|
|
We're going to add back the original struct definition removed by
|
|
a6e4de28, because using the typedef breaks all sorts of things like
|
|
gtkmm and WebKit, and having separate struct definitions allows us to
|
|
change the types in GdkBorder from gint16s to gints without breaking
|
|
ABI.
|
|
---
|
|
gtk/gtkborder.h | 10 +++++++++-
|
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/gtk/gtkborder.h b/gtk/gtkborder.h
|
|
index 6df53aa..adfa29e 100644
|
|
--- a/gtk/gtkborder.h
|
|
+++ b/gtk/gtkborder.h
|
|
@@ -34,6 +34,8 @@
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
+typedef struct _GtkBorder GtkBorder;
|
|
+
|
|
#define GTK_TYPE_BORDER (gtk_border_get_type ())
|
|
|
|
/**
|
|
@@ -46,7 +48,13 @@ G_BEGIN_DECLS
|
|
* A struct that specifies a border around a rectangular area
|
|
* that can be of different width on each side.
|
|
*/
|
|
-typedef GdkBorder GtkBorder;
|
|
+struct _GtkBorder
|
|
+{
|
|
+ gint16 left;
|
|
+ gint16 right;
|
|
+ gint16 top;
|
|
+ gint16 bottom;
|
|
+};
|
|
|
|
GDK_AVAILABLE_IN_ALL
|
|
GType gtk_border_get_type (void) G_GNUC_CONST;
|
|
--
|
|
2.5.0
|
|
|