Merge branch 'win32-theme2'

diff --combined gtk/Makefile.am
index d6661af7943480502bcaa273c6c07ffb6af73eb9,75c8703409b955967b31d4c905529ba2612bd5fa..231902f11913b7b22e401ecdaa4dbcfbee522c7f
--- 1/gtk/Makefile.am
--- 2/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@@ -465,6 -465,7 +465,7 @@@ gtk_private_h_sources =            
        gtktreedatalist.h       \
        gtktreeprivate.h        \
        gtkwidgetprivate.h      \
+       gtkwin32themeprivate.h  \
        gtkwindowprivate.h      \
        gtktreemenu.h           \
        $(gtk_clipboard_dnd_h_sources) \
@@@ -724,6 -725,7 +725,7 @@@ gtk_base_c_sources =               
        gtkwidget.c             \
        gtkwidgetpath.c         \
        gtkwindow.c             \
+       gtkwin32theme.c         \
        $(gtk_clipboard_dnd_c_sources) \
        $(gtk_appchooser_impl_c_sources)
  
@@@ -741,6 -743,7 +743,6 @@@ gtk_os_unix_c_sources =            
        gtkprintoperation-unix.c        \
        gtkprintunixdialog.c            \
          gtkprintbackend.c             \
 -      gtksearchenginebeagle.c         \
        gtksearchenginetracker.c
  gtk_all_c_sources += $(gtk_os_unix_c_sources)
  if OS_UNIX
@@@ -751,6 -754,7 +753,6 @@@ gtk_private_h_sources += 
        gtkprinteroption.h              \
        gtkprinteroptionset.h           \
        gtkprinteroptionwidget.h        \
 -      gtksearchenginebeagle.h         \
        gtksearchenginetracker.h
  gtk_c_sources += $(gtk_os_unix_c_sources)
  endif
@@@ -829,7 -833,8 +831,8 @@@ gtk_built_public_sources =                 
  # built headers that don't get installed
  gtk_built_private_headers =                   \
        gtkmarshalers.h                         \
-       gtkbuiltincache.h
+       gtkbuiltincache.h                       \
+       gtkwin32css.h
  
  gtk_built_sources =                           \
        gtktypebuiltins.c                       \
@@@ -841,6 -846,7 +844,7 @@@
  stamp_files =                                 \
        stamp-gtkmarshalers.h                   \
        stamp-gtktypebuiltins.h                 \
+       stamp-gtkwin32css.h                     \
        stamp-icons
  
  # non-header sources (headers should be specified in the above variables)
@@@ -852,6 -858,7 +856,7 @@@ gtk_extra_sources =                                
        gen-paper-names.c                       \
        gtkstatusicon-quartz.c                  \
        gtk.symbols                             \
+       gtk-win32.css                           \
        gtkversion.h.in                         \
        gtkmarshalers.list                      \
        fallback-c89.c
@@@ -897,6 -904,14 +902,14 @@@ gtkmarshalers.c: @REBUILD@ gtkmarshaler
        && cp xgen-gmlc gtkmarshalers.c \
        && rm -f xgen-gmlc
  
+ gtkwin32css.h: stamp-gtkwin32css.h
+       @true
+ stamp-gtkwin32css.h: @REBUILD@ gtk-win32.css
+       $(AWK) 'BEGIN { print "static const char *gtk_win32_default_css = " } { print "   \"" $$0 "\\n\""} END { print ";" }' < $(srcdir)/gtk-win32.css >> xgen-gmlh\
+       && (cmp -s xgen-gmlh gtkwin32css.h || cp xgen-gmlh gtkwin32css.h) \
+       && rm -f xgen-gmlh \
+       && echo timestamp > $(@F)
+ 
  gtktypebuiltins.h: stamp-gtktypebuiltins.h
        @true
  stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) $(deprecated_h_sources) gtktypebuiltins.h.template
@@@ -1356,6 -1371,7 +1369,6 @@@ GENERATED_ICONS = 
        stock-icons/16/folder-remote.png                \
        stock-icons/16/user-home.png                    \
        stock-icons/16/user-desktop.png                 \
 -      stock-icons/16/text-x-generic.png               \
        stock-icons/24/go-previous-rtl.png              \
        stock-icons/24/go-next-rtl.png                  \
        stock-icons/24/go-first-rtl.png                 \
@@@ -1367,7 -1383,8 +1380,7 @@@
        stock-icons/24/document-save.png                \
        stock-icons/24/folder-remote.png                \
        stock-icons/24/user-home.png                    \
 -      stock-icons/24/user-desktop.png                 \
 -      stock-icons/24/text-x-generic.png
 +      stock-icons/24/user-desktop.png
  
  # need to copy the icons so that we can replace the generated ones with
  # symlinks, even in the readonly srcdir case