From 9a1d35aa86dfe5ed655587a305246d80f4642106 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Tue, 7 Apr 2015 12:24:03 +0300
Subject: [PATCH] trying to fix unittests

---
 dlanguilib.visualdproj             |  2 +-
 src/dlangui/platforms/sdl/sdlapp.d | 49 ++++++++++++++----------------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/dlanguilib.visualdproj b/dlanguilib.visualdproj
index 4f8010fd..fed6a040 100644
--- a/dlanguilib.visualdproj
+++ b/dlanguilib.visualdproj
@@ -72,7 +72,7 @@
   <debuglevel>0</debuglevel>
   <debugids>DebugFocus FontResources</debugids>
   <versionlevel>0</versionlevel>
-  <versionids>EmbedStandardResources Unicode USE_FREETYPE USE_OPENGL</versionids>
+  <versionids>EmbedStandardResources Unicode USE_FREETYPE USE_OPENGL USE_SDL</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>1</createImplib>
diff --git a/src/dlangui/platforms/sdl/sdlapp.d b/src/dlangui/platforms/sdl/sdlapp.d
index 946e72b7..29236353 100644
--- a/src/dlangui/platforms/sdl/sdlapp.d
+++ b/src/dlangui/platforms/sdl/sdlapp.d
@@ -1237,24 +1237,13 @@ version (Windows) {
 
     int myWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int iCmdShow)
     {
-        initLogs();
-        Log.d("myWinMain()");
+        //Log.d("myWinMain()");
         string basePath = exePath();
-        Log.i("Current executable: ", exePath());
+        //Log.i("Current executable: ", exePath());
         string cmdline = fromStringz(lpCmdLine).dup;
-        Log.i("Command line: ", cmdline);
+        //Log.i("Command line: ", cmdline);
         string[] args = splitCmdLine(cmdline);
-        Log.i("Command line params: ", args);
-
-        if (!initFontManager()) {
-            Log.e("******************************************************************");
-            Log.e("No font files found!!!");
-            Log.e("Currently, only hardcoded font paths implemented.");
-            Log.e("Probably you can modify sdlapp.d to add some fonts for your system.");
-            Log.e("TODO: use fontconfig");
-            Log.e("******************************************************************");
-            assert(false);
-        }
+        //Log.i("Command line params: ", args);
 
         return sdlmain(args);
     }
@@ -1265,21 +1254,25 @@ version (Windows) {
 		
         initLogs();
 
-        if (!initFontManager()) {
-            Log.e("******************************************************************");
-            Log.e("No font files found!!!");
-            Log.e("Currently, only hardcoded font paths implemented.");
-            Log.e("Probably you can modify sdlapp.d to add some fonts for your system.");
-            Log.e("TODO: use fontconfig");
-            Log.e("******************************************************************");
-            assert(false);
-        }
-
         return sdlmain(args);
 	}
 }
 
 int sdlmain(string[] args) {
+
+    initLogs();
+
+    if (!initFontManager()) {
+        Log.e("******************************************************************");
+        Log.e("No font files found!!!");
+        Log.e("Currently, only hardcoded font paths implemented.");
+        Log.e("Probably you can modify sdlapp.d to add some fonts for your system.");
+        Log.e("TODO: use fontconfig");
+        Log.e("******************************************************************");
+        assert(false);
+    }
+
+
     currentTheme = createDefaultTheme();
 
     try {
@@ -1331,7 +1324,11 @@ int sdlmain(string[] args) {
 
     int res = 0;
 
-    res = UIAppMain(args);
+    version (unittest) {
+    } else {
+        res = UIAppMain(args);
+    }
+    
     //Log.e("Widget instance count after UIAppMain: ", Widget.instanceCount());
 
     Log.d("Destroying SDL platform");