diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-04-04 09:42:31 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-04-04 09:42:31 +0000 |
| commit | 13a536b5f52edf6e7044d5b60c5ceb90354aaa1c (patch) | |
| tree | db9be65872dd003443640ae4ab0c87012dc1c05f /src | |
| parent | Warning cleanup. (diff) | |
| download | inkscape-13a536b5f52edf6e7044d5b60c5ceb90354aaa1c.tar.gz inkscape-13a536b5f52edf6e7044d5b60c5ceb90354aaa1c.zip | |
Fix build with gtk < 2.24
(bzr r11145)
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/eek-preview.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp index eb77bc8d7..134cf9342 100644 --- a/src/widgets/eek-preview.cpp +++ b/src/widgets/eek-preview.cpp @@ -254,8 +254,15 @@ gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* event ) if ( preview->_previewPixbuf ) { GtkDrawingArea* da = &(preview->drawing); GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(da)); - gint w = gdk_window_get_width(window); - gint h = gdk_window_get_height(window); + GdkDrawable* drawable = (GdkDrawable*) window; + gint w = 0; + gint h = 0; +#if GTK_CHECK_VERSION(2,24,0) + w = gdk_window_get_width(window); + h = gdk_window_get_height(window); +#else + gdk_drawable_get_size(drawable, &w, &h); +#endif if ((w != preview->_scaledW) || (h != preview->_scaledH)) { if (preview->_scaled) { @@ -267,7 +274,6 @@ gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* event ) } GdkPixbuf* pix = (preview->_scaled) ? preview->_scaled : preview->_previewPixbuf; - GdkDrawable* drawable = (GdkDrawable*) window; cairo_t* cr2 = gdk_cairo_create(drawable); gdk_cairo_set_source_pixbuf(cr2, pix, 0, 0); cairo_paint(cr2); |