Mercurial > hg > forks > geeqie
diff src/bar_exif.c @ 2035:4321c486aec7
use cairo for drawing
cairo is the only supported drawing method in gtk3
| author | Vladimir Nadvornik <nadvornik@suse.cz> |
|---|---|
| date | Thu, 02 Aug 2012 00:15:16 +0200 |
| parents | 9297985567b5 |
| children | e4aa52cbbecb |
line wrap: on
line diff
--- a/src/bar_exif.c Wed Aug 01 00:17:18 2012 +0200 +++ b/src/bar_exif.c Thu Aug 02 00:15:16 2012 +0200 @@ -712,6 +712,7 @@ g_free(ped); } +#if !GTK_CHECK_VERSION(3,0,0) static void bar_pane_exif_size_request(GtkWidget *pane, GtkRequisition *requisition, gpointer data) { PaneExifData *ped = data; @@ -720,11 +721,15 @@ requisition->height = ped->min_height; } } +#endif static void bar_pane_exif_size_allocate(GtkWidget *pane, GtkAllocation *alloc, gpointer data) { PaneExifData *ped = data; ped->min_height = alloc->height; +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_size_request(ped->widget, -1, ped->min_height); +#endif } static GtkWidget *bar_pane_exif_new(const gchar *id, const gchar *title, gboolean expanded) @@ -751,8 +756,12 @@ g_object_set_data(G_OBJECT(ped->widget), "pane_data", ped); g_signal_connect_after(G_OBJECT(ped->widget), "destroy", G_CALLBACK(bar_pane_exif_destroy), ped); +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_size_request(ped->widget, -1, ped->min_height); +#else g_signal_connect(G_OBJECT(ped->widget), "size-request", G_CALLBACK(bar_pane_exif_size_request), ped); +#endif g_signal_connect(G_OBJECT(ped->widget), "size-allocate", G_CALLBACK(bar_pane_exif_size_allocate), ped);