From 3bb6d95cbbdc2bb793084cfb61eb19dba540466d Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Mon, 12 Sep 2016 10:45:43 +0300
Subject: [PATCH] fix console mode parent theme loading

---
 src/dlangui/platforms/windows/win32drawbuf.d | 1 +
 src/dlangui/platforms/windows/win32fonts.d   | 1 +
 src/dlangui/widgets/styles.d                 | 6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/dlangui/platforms/windows/win32drawbuf.d b/src/dlangui/platforms/windows/win32drawbuf.d
index 36e9983f..01d22003 100644
--- a/src/dlangui/platforms/windows/win32drawbuf.d
+++ b/src/dlangui/platforms/windows/win32drawbuf.d
@@ -23,6 +23,7 @@ module dlangui.platforms.windows.win32drawbuf;
 
 version(Windows):
 public import dlangui.core.config;
+static if (BACKEND_GUI):
 
 import core.sys.windows.windows;
 import dlangui.core.logger;
diff --git a/src/dlangui/platforms/windows/win32fonts.d b/src/dlangui/platforms/windows/win32fonts.d
index d3fd5ac2..c0def03c 100644
--- a/src/dlangui/platforms/windows/win32fonts.d
+++ b/src/dlangui/platforms/windows/win32fonts.d
@@ -23,6 +23,7 @@ module dlangui.platforms.windows.win32fonts;
 
 version(Windows):
 public import dlangui.core.config;
+static if (BACKEND_GUI):
 
 import core.sys.windows.windows;
 import dlangui.graphics.fonts;
diff --git a/src/dlangui/widgets/styles.d b/src/dlangui/widgets/styles.d
index 32f68b3a..8e5d5589 100644
--- a/src/dlangui/widgets/styles.d
+++ b/src/dlangui/widgets/styles.d
@@ -23,6 +23,8 @@ Authors:   Vadim Lopatin, coolreader.org@gmail.com
 */
 module dlangui.widgets.styles;
 
+import dlangui.core.config;
+
 private import std.xml;
 private import std.string;
 private import std.algorithm;
@@ -1542,7 +1544,7 @@ bool loadTheme(Theme theme, string resourceId, int level = 0) {
 
     string filename;
     try {
-        filename = drawableCache.findResource(resourceId);
+        filename = drawableCache.findResource(BACKEND_CONSOLE ? "console_" ~ resourceId : resourceId);
         if (!filename || !filename.endsWith(".xml"))
             return false;
         string s = cast(string)loadResourceBytes(filename);
@@ -1567,7 +1569,7 @@ bool loadTheme(Theme theme, string resourceId, int level = 0) {
 /// load theme from XML file (null if failed)
 Theme loadTheme(string resourceId) {
     Theme res = new Theme(resourceId);
-    if (loadTheme(res, BACKEND_CONSOLE ? "console_" ~ resourceId : resourceId)) {
+    if (loadTheme(res, resourceId)) {
         res.id = resourceId;
         return res;
     }