summaryrefslogtreecommitdiff
path: root/pluma/pluma-status-combo-box.c
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2015-11-20 00:40:13 +0100
committerWolfgang Ulbrich <[email protected]>2015-12-01 23:25:13 +0100
commit9c41b25138d7bff3554d4be038f92c16d56dc734 (patch)
treea69ba189c5626a2a0e4998bc3acf716f734e6910 /pluma/pluma-status-combo-box.c
parent1b8d58e81e5ef71c217b7dd3dc8f72e1552ff826 (diff)
downloadpluma-9c41b25138d7bff3554d4be038f92c16d56dc734.tar.bz2
pluma-9c41b25138d7bff3554d4be038f92c16d56dc734.tar.xz
GTK3: replace depracated gtk_widget_size_request with gtk_widget_get_preferred_size
Diffstat (limited to 'pluma/pluma-status-combo-box.c')
-rw-r--r--pluma/pluma-status-combo-box.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/pluma/pluma-status-combo-box.c b/pluma/pluma-status-combo-box.c
index f138ab2c..aaae9824 100644
--- a/pluma/pluma-status-combo-box.c
+++ b/pluma/pluma-status-combo-box.c
@@ -180,8 +180,12 @@ menu_position_func (GtkMenu *menu,
GtkAllocation allocation;
*push_in = FALSE;
-
+
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_get_preferred_size (gtk_widget_get_toplevel (GTK_WIDGET (menu)), NULL, &request);
+#else
gtk_widget_size_request (gtk_widget_get_toplevel (GTK_WIDGET (menu)), &request);
+#endif
/* get the origin... */
gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (combo)), x, y);
@@ -205,8 +209,12 @@ button_press_event (GtkWidget *widget,
GtkRequisition request;
GtkAllocation allocation;
gint max_height;
-
+
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_get_preferred_size (combo->priv->menu, NULL, &request);
+#else
gtk_widget_size_request (combo->priv->menu, &request);
+#endif
gtk_widget_get_allocation (GTK_WIDGET (combo), &allocation);
/* do something relative to our own height here, maybe we can do better */