Make it compile with older versions of GTK+

1 files changed, 15 insertions, 15 deletions

diff --git a/sivviewport.c b/sivviewport.c
index 7387752..a10b16d 100644
--- a/sivviewport.c
+++ b/sivviewport.c
@@ -262,7 +262,7 @@ siv_viewport_get_property (GObject         *object,
 static void
 siv_viewport_init (SivViewport *viewport)
 {
-  gtk_widget_set_has_window (GTK_WIDGET (viewport), TRUE);
+  GTK_WIDGET_UNSET_FLAGS (viewport, GTK_NO_WINDOW);
 
   gtk_widget_set_redraw_on_allocate (GTK_WIDGET (viewport), FALSE);
   gtk_container_set_resize_mode (GTK_CONTAINER (viewport), GTK_RESIZE_QUEUE);
@@ -437,7 +437,7 @@ viewport_set_hadjustment_values (SivViewport *viewport,
   
   hadjustment->lower = 0;
 
-  if (bin->child && gtk_widget_get_visible (bin->child))
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     {
       GtkRequisition child_requisition;
       
@@ -474,7 +474,7 @@ viewport_set_vadjustment_values (SivViewport *viewport,
   
   vadjustment->lower = 0;
 
-  if (bin->child && gtk_widget_get_visible (bin->child))
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     {
       GtkRequisition child_requisition;
       
@@ -588,7 +588,7 @@ siv_viewport_set_shadow_type (SivViewport   *viewport,
     {
       viewport->shadow_type = type;
 
-      if (gtk_widget_get_visible (GTK_WIDGET (viewport)))
+      if (GTK_WIDGET_VISIBLE (GTK_WIDGET (viewport)))
 	{
 	  gtk_widget_size_allocate (GTK_WIDGET (viewport), &(GTK_WIDGET (viewport)->allocation));
 	  gtk_widget_queue_draw (GTK_WIDGET (viewport));
@@ -665,7 +665,7 @@ siv_viewport_realize (GtkWidget *widget)
   gint attributes_mask;
   gint event_mask;
 
-  gtk_widget_set_realized (widget, TRUE);
+  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
   attributes.x = widget->allocation.x + border_width;
   attributes.y = widget->allocation.y + border_width;
@@ -748,7 +748,7 @@ static void
 siv_viewport_paint (GtkWidget    *widget,
 		    GdkRectangle *area)
 {
-  if (gtk_widget_is_drawable (widget))
+  if (GTK_WIDGET_DRAWABLE (widget))
     {
       SivViewport *viewport = SIV_VIEWPORT (widget);
 
@@ -765,7 +765,7 @@ siv_viewport_expose (GtkWidget      *widget,
 {
   SivViewport *viewport;
 
-  if (gtk_widget_is_drawable (widget))
+  if (GTK_WIDGET_DRAWABLE (widget))
     {
       viewport = SIV_VIEWPORT (widget);
 
@@ -815,7 +815,7 @@ siv_viewport_size_request (GtkWidget      *widget,
       requisition->height += 2 * widget->style->ythickness;
     }
 
-  if (bin->child && gtk_widget_get_visible (bin->child))
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     {
       gtk_widget_size_request (bin->child, &child_requisition);
       requisition->width += child_requisition.width;
@@ -838,7 +838,7 @@ siv_viewport_size_allocate (GtkWidget     *widget,
   /* If our size changed, and we have a shadow, queue a redraw on widget->window to
    * redraw the shadow correctly.
    */
-  if (gtk_widget_get_mapped (widget) &&
+  if (GTK_WIDGET_MAPPED (widget) &&
       viewport->shadow_type != GTK_SHADOW_NONE &&
       (widget->allocation.width != allocation->width ||
        widget->allocation.height != allocation->height))
@@ -853,7 +853,7 @@ siv_viewport_size_allocate (GtkWidget     *widget,
   child_allocation.y = 0;
   child_allocation.width = hadjustment->upper;
   child_allocation.height = vadjustment->upper;
-  if (gtk_widget_get_realized (widget))
+  if (GTK_WIDGET_REALIZED (widget))
     {
       GtkAllocation view_allocation;
       gdk_window_move_resize (widget->window,
@@ -874,7 +874,7 @@ siv_viewport_size_allocate (GtkWidget     *widget,
                               child_allocation.width,
                               child_allocation.height);
     }
-  if (bin->child && gtk_widget_get_visible (bin->child))
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     gtk_widget_size_allocate (bin->child, &child_allocation);
 
   gtk_adjustment_changed (hadjustment);
@@ -892,8 +892,8 @@ siv_viewport_adjustment_value_changed (GtkAdjustment *adjustment,
   SivViewport *viewport = SIV_VIEWPORT (data);
   GtkBin *bin = GTK_BIN (data);
 
-  if (bin->child && gtk_widget_get_visible (bin->child) &&
-      gtk_widget_get_realized (GTK_WIDGET (viewport)))
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child) &&
+      GTK_WIDGET_REALIZED (GTK_WIDGET (viewport)))
     {
       GtkAdjustment *hadjustment = siv_viewport_get_hadjustment (viewport);
       GtkAdjustment *vadjustment = siv_viewport_get_vadjustment (viewport);
@@ -918,8 +918,8 @@ static void
 siv_viewport_style_set (GtkWidget *widget,
 			GtkStyle  *previous_style)
 {
-   if (gtk_widget_get_realized (widget) &&
-       gtk_widget_get_has_window (widget))
+   if (GTK_WIDGET_REALIZED (widget) &&
+       !GTK_WIDGET_NO_WINDOW (widget))
      {
 	SivViewport *viewport = SIV_VIEWPORT (widget);