diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-01-15 12:24:20 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-01-15 12:24:20 +0100 |
| commit | 7b5604b7e1af03445e7209b8a067ef359c2b4846 (patch) | |
| tree | f4e828c67e0f7d09e9a392c80f5219279622d0fd /eel/eel-editable-label.c | |
| parent | 4c7f59163c415140d76330a1b3c57b1efe35ca14 (diff) | |
| download | caja-7b5604b7e1af03445e7209b8a067ef359c2b4846.tar.bz2 caja-7b5604b7e1af03445e7209b8a067ef359c2b4846.tar.xz | |
GTK3: don't use deprecated gtk_widget_size_request
gtk_widget_size_request --> gtk_widget_get_preferred_size
Diffstat (limited to 'eel/eel-editable-label.c')
| -rw-r--r-- | eel/eel-editable-label.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c index 3edd68ef..08688cd3 100644 --- a/eel/eel-editable-label.c +++ b/eel/eel-editable-label.c @@ -44,6 +44,10 @@ #define GtkEditableInterface GtkEditableClass #endif +#if !GTK_CHECK_VERSION(3,0,0) +#define gtk_widget_get_preferred_size(x,y,z) gtk_widget_size_request(x,y) +#endif + /* g_memmove is removed in glib 2.40 */ #if GLIB_CHECK_VERSION (2, 39, 0) #define g_memmove memmove @@ -1331,11 +1335,7 @@ get_layout_location (EelEditableLabel *label, if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR) xalign = 1.0 - xalign; -#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); |