diff options
| author | Jasmine Hassan <[email protected]> | 2012-11-08 01:03:47 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:52 +0200 |
| commit | 48d2f19ea2b821d1f3b3017afc912154ab2ee7da (patch) | |
| tree | 599e2a5998d582176ca84f7abf30f88c600705fc /src/caja-side-pane.c | |
| parent | e5b2fbf43e1c1ad5552abb004e5ebc4beb17ce2c (diff) | |
| download | caja-48d2f19ea2b821d1f3b3017afc912154ab2ee7da.tar.bz2 caja-48d2f19ea2b821d1f3b3017afc912154ab2ee7da.tar.xz | |
[src] use gtk_widget_get_preferred_size()
http://git.gnome.org/browse/nautilus/commit/?id=c47d18f566fa9518ca7750922da7da66d3211f3e
Diffstat (limited to 'src/caja-side-pane.c')
| -rw-r--r-- | src/caja-side-pane.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/caja-side-pane.c b/src/caja-side-pane.c index a5d6544e..d3922b9f 100644 --- a/src/caja-side-pane.c +++ b/src/caja-side-pane.c @@ -30,6 +30,10 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> +#if !GTK_CHECK_VERSION(3,0,0) +#define gtk_widget_get_preferred_size(x,y,z) gtk_widget_size_request(x,y) +#endif + typedef struct { char *title; @@ -146,7 +150,7 @@ caja_side_pane_size_allocate (GtkWidget *widget, frame = pane->details->title_frame; hbox = pane->details->title_hbox; - gtk_widget_get_child_requisition (hbox, &child_requisition); + gtk_widget_get_preferred_size (hbox, &child_requisition, NULL); width = child_requisition.width; gtk_widget_get_allocation (frame, &frame_allocation); @@ -249,7 +253,7 @@ select_button_press_callback (GtkWidget *widget, gtk_widget_get_allocation (widget, &allocation); width = allocation.width; gtk_widget_set_size_request (side_pane->details->menu, -1, -1); - gtk_widget_size_request (side_pane->details->menu, &requisition); + gtk_widget_get_preferred_size (side_pane->details->menu, &requisition, NULL); gtk_widget_set_size_request (side_pane->details->menu, MAX (width, requisition.width), -1); |