make the ms-windows engine compile again

diff --git a/modules/engines/Makefile.am b/modules/engines/Makefile.am
index 5af553f16e928df5024016df06615d7da0295184..5dce19124a29c23bedaa2b1843127c4c73fb7357 100644 (file)
--- a/modules/engines/Makefile.am
+++ b/modules/engines/Makefile.am
@@ -5,7 +5,7 @@ wimp = ms-windows
 endif
 
 # the theme engines need to be ported to GtkThemingEngine
-# SUBDIRS = $(wimp) pixbuf
+SUBDIRS = $(wimp) pixbuf
 
 DIST_SUBDIRS = ms-windows pixbuf
 

diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index aabcb0d0d96d8373732ef15a5ecfba19f5bba77e..ca7d38ff689d5f6c1791e068ebcfd098a49dcf27 100755 (executable)
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -43,6 +43,10 @@
 
 #include "gtk/gtk.h"
 #include "gtk/gtk.h"
+#ifndef GTK_COMPILATION
+#define GTK_COMPILATION
+#endif
+#include "gtk/gtkmenushellprivate.h"
 
 #ifdef BUILDING_STANDALONE
 #include "gdk/gdkwin32.h"
@@ -1337,9 +1341,9 @@ draw_arrow (GtkStyle *style,
       reverse_engineer_stepper_box (widget, arrow_type,
                                    &box_x, &box_y, &box_width, &box_height);
 
-      if (gtk_range_get_adjustment(&scrollbar->range)->page_size >=
-          (gtk_range_get_adjustment(&scrollbar->range)->upper -
-           gtk_range_get_adjustment(&scrollbar->range)->lower))
+      if (gtk_adjustment_get_page_size(gtk_range_get_adjustment(&scrollbar->range)) >=
+          (gtk_adjustment_get_upper(gtk_range_get_adjustment(&scrollbar->range)) -
+           gtk_adjustment_get_lower(gtk_range_get_adjustment(&scrollbar->range))))
        {
          is_disabled = TRUE;
        }
@@ -1577,7 +1581,7 @@ draw_menu_item (cairo_t *cr, GtkWidget *widget, GtkStyle *style,
 
       if (state_type == GTK_STATE_PRELIGHT)
        {
-         draw_3d_border (dc, &rect, bar->active);
+        draw_3d_border (dc, &rect, bar->priv->active);
        }
 
       release_window_dc (&dc_info);
@@ -1881,9 +1885,9 @@ draw_box (GtkStyle *style,
            }
          else
            {
-              if (gtk_range_get_adjustment(&scrollbar->range)->page_size >=
-                 (gtk_range_get_adjustment(&scrollbar->range)->upper -
-                  gtk_range_get_adjustment(&scrollbar->range)->lower))
+              if (gtk_adjustment_get_page_size(gtk_range_get_adjustment(&scrollbar->range)) >=
+                 (gtk_adjustment_get_page_size(gtk_range_get_adjustment(&scrollbar->range)) -
+                  gtk_adjustment_get_page_size(gtk_range_get_adjustment(&scrollbar->range))))
                {
                  return;
                }