diff options
| author | Jasmine Hassan <[email protected]> | 2012-11-07 19:27:12 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:52 +0200 |
| commit | 7e395411a8ef934accc205f34b4c67e03282a2dc (patch) | |
| tree | e48e5692d8efc07f7214356b1b5f0cb4ab38f1a9 | |
| parent | aebf60348dd7675678c28a5c850d1900b7b95e8c (diff) | |
| download | caja-7e395411a8ef934accc205f34b4c67e03282a2dc.tar.bz2 caja-7e395411a8ef934accc205f34b4c67e03282a2dc.tar.xz | |
[editable-label] use gtk_widget_get_preferred_size() for GTK3
and gtk_widget_size_request() for GTK2
http://git.gnome.org/browse/nautilus/commit/?id=4963a3c9e5526ffd139b1b0b5bff18b6ea91a717
| -rw-r--r-- | eel/eel-editable-label.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c index 57386f88..5a916aed 100644 --- a/eel/eel-editable-label.c +++ b/eel/eel-editable-label.c @@ -1216,7 +1216,11 @@ get_layout_location (EelEditableLabel *label, if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR) xalign = 1.0 - xalign; - gtk_widget_get_child_requisition (widget, &req); +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_get_preferred_size (widget, &req, NULL); +#else + gtk_widget_size_request (widget, &req); +#endif gtk_misc_get_padding (misc, &xpad, &ypad); gtk_widget_get_allocation (widget, &allocation); |