[gtk+] win32 theme: Always include the win32 theme



commit 92fca23244f59f0df0336814f553b8e668223c0b
Author: Benjamin Otte <otte redhat com>
Date:   Tue Feb 16 00:22:12 2016 +0100

    win32 theme: Always include the win32 theme
    
    It's not very useful outside of Windows so far, but that will hopefully
    change.

 gtk/Makefile.am |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 944ddec..566ec95 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1238,10 +1238,8 @@ gtk.gresource.xml: Makefile.am inspector/Makefile.inc
        echo "    <file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-inverse.css</file>" 
$@; \
        echo "    <file>theme/HighContrast/gtk-contained.css</file>" >> $@; \
        echo "    <file>theme/HighContrast/gtk-contained-inverse.css</file>" >> $@; \
-       if test "$(win32_theme)" = "yes"; then \
-         echo "    <file>theme/win32/gtk-win32-base.css</file>" >> $@; \
-         echo "    <file>theme/win32/gtk.css</file>" >> $@; \
-       fi; \
+       echo "    <file>theme/win32/gtk-win32-base.css</file>" >> $@; \
+       echo "    <file>theme/win32/gtk.css</file>" >> $@; \
        for f in $(srcdir)/cursor/*.png; do \
          n=`basename $$f`; \
          echo "    <file>cursor/$$n</file>" >> $@; \
@@ -1367,7 +1365,6 @@ libgtk_3_la_LIBADD = $(libadd)
 libgtk_3_la_DEPENDENCIES = $(deps)
 
 if USE_WIN32
-win32_theme = yes
 libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
 libgtk_3_la_LDFLAGS += -Wl,-luuid $(gtk_win32_res_ldflag)
 libgtk_3_la_DEPENDENCIES += $(gtk_win32_res)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]