[gtk+] Fix the remaining issues that broke the PLT check
- From: Michael Natterer <mitch src gnome org>
- To: svn-commits-list gnome org
- Subject: [gtk+] Fix the remaining issues that broke the PLT check
- Date: Wed, 8 Jul 2009 15:03:14 +0000 (UTC)
commit 2de23ea6cffba39d239eaf7307c418801ad60abd
Author: Michael Natterer <mitch gimp org>
Date: Wed Jul 8 17:01:32 2009 +0200
Fix the remaining issues that broke the PLT check
Add internal API for the default button box layouts to so we don't
need to call deprectated GTK+ functions (which are invisible with
GTK_DISABLE_DEPRECATED).
gtk/gtkbbox.c | 4 ++--
gtk/gtkhbbox.c | 6 ++++++
gtk/gtkhbbox.h | 3 +++
gtk/gtkvbbox.c | 7 +++++++
gtk/gtkvbbox.h | 2 ++
5 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c
index 245fa3c..3690a6b 100644
--- a/gtk/gtkbbox.c
+++ b/gtk/gtkbbox.c
@@ -493,9 +493,9 @@ gtk_button_box_kludge_get_layout_default (GtkButtonBox *widget)
orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (widget));
if (orientation == GTK_ORIENTATION_HORIZONTAL)
- return gtk_hbutton_box_get_layout_default ();
+ return _gtk_hbutton_box_get_layout_default ();
else
- return gtk_vbutton_box_get_layout_default ();
+ return _gtk_vbutton_box_get_layout_default ();
}
static void
diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c
index ea9c1f8..50131d1 100644
--- a/gtk/gtkhbbox.c
+++ b/gtk/gtkhbbox.c
@@ -92,5 +92,11 @@ gtk_hbutton_box_get_layout_default (void)
return default_layout_style;
}
+GtkButtonBoxStyle
+_gtk_hbutton_box_get_layout_default (void)
+{
+ return default_layout_style;
+}
+
#define __GTK_HBUTTON_BOX_C__
#include "gtkaliasdef.c"
diff --git a/gtk/gtkhbbox.h b/gtk/gtkhbbox.h
index 65d6df9..25eecba 100644
--- a/gtk/gtkhbbox.h
+++ b/gtk/gtkhbbox.h
@@ -72,6 +72,9 @@ void gtk_hbutton_box_set_spacing_default (gint spacing);
void gtk_hbutton_box_set_layout_default (GtkButtonBoxStyle layout);
#endif
+/* private API */
+GtkButtonBoxStyle _gtk_hbutton_box_get_layout_default (void);
+
G_END_DECLS
#endif /* __GTK_HBUTTON_BOX_H__ */
diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c
index 0f92621..72ba385 100644
--- a/gtk/gtkvbbox.c
+++ b/gtk/gtkvbbox.c
@@ -94,5 +94,12 @@ gtk_vbutton_box_get_layout_default (void)
return default_layout_style;
}
+GtkButtonBoxStyle
+_gtk_vbutton_box_get_layout_default (void)
+{
+ return default_layout_style;
+}
+
+
#define __GTK_VBBOX_C__
#include "gtkaliasdef.c"
diff --git a/gtk/gtkvbbox.h b/gtk/gtkvbbox.h
index 901bc70..996eb57 100644
--- a/gtk/gtkvbbox.h
+++ b/gtk/gtkvbbox.h
@@ -73,6 +73,8 @@ GtkButtonBoxStyle gtk_vbutton_box_get_layout_default (void);
void gtk_vbutton_box_set_layout_default (GtkButtonBoxStyle layout);
#endif
+/* private API */
+GtkButtonBoxStyle _gtk_vbutton_box_get_layout_default (void);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]