diff options
author | Daniel P. Berrange <dan@berrange.com> | 2011-07-01 15:26:33 +0100 |
---|---|---|
committer | Daniel P. Berrange <berrange@redhat.com> | 2011-07-11 12:07:21 +0100 |
commit | 7f91cdf4ab1cf43b51b9337c10eb4697903cefe2 (patch) | |
tree | acdacdc63ba828e2001c627cb80c1037674c6a82 /src/view | |
parent | cff795065a9c5ee14e5c43b636809f3217d6aaed (diff) | |
download | virt-viewer-7f91cdf4ab1cf43b51b9337c10eb4697903cefe2.tar.gz virt-viewer-7f91cdf4ab1cf43b51b9337c10eb4697903cefe2.tar.xz virt-viewer-7f91cdf4ab1cf43b51b9337c10eb4697903cefe2.zip |
Update to optionally build with GTK3
Diffstat (limited to 'src/view')
-rw-r--r-- | src/view/ovBox.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/view/ovBox.c b/src/view/ovBox.c index 955c20b..8b450d0 100644 --- a/src/view/ovBox.c +++ b/src/view/ovBox.c @@ -475,7 +475,6 @@ ViewOvBoxUnrealize(GtkWidget *widget) // IN * *----------------------------------------------------------------------------- */ - static void ViewOvBoxSizeRequest(GtkWidget *widget, // IN GtkRequisition *requisition) // OUT @@ -505,7 +504,7 @@ ViewOvBoxSizeRequest(GtkWidget *widget, // IN requisition->height = MAX(underR.height + min, priv->overR.height); } -#ifdef WITH_GTK3 +#if GTK_CHECK_VERSION(3, 0, 0) static void ViewOvBox_get_preferred_width (GtkWidget *widget, gint *minimal_width, @@ -529,7 +528,6 @@ ViewOvBox_get_preferred_height (GtkWidget *widget, *minimal_height = *natural_height = requisition.height; } -#else #endif @@ -712,7 +710,7 @@ ViewOvBoxClassInit(ViewOvBoxClass *klass) // IN widgetClass->unmap = ViewOvBoxUnmap; widgetClass->realize = ViewOvBoxRealize; widgetClass->unrealize = ViewOvBoxUnrealize; -#if WITH_GTK3 +#if GTK_CHECK_VERSION(3, 0, 0) widgetClass->get_preferred_width = ViewOvBox_get_preferred_width; widgetClass->get_preferred_height = ViewOvBox_get_preferred_height; #else |