From ca90faaa5456197f38092ba49d7fa08053f44f1b Mon Sep 17 00:00:00 2001
From: ttp <ttp@users.sourceforge.jp>
Date: Tue, 9 Sep 2008 13:50:05 +0000
Subject: [PATCH] =?utf8?q?AppliStation-GUI,WARNING=E3=81=8C=E5=87=BA?=
 =?utf8?q?=E3=81=9F=E3=81=A8=E3=81=8D=E3=82=82=E3=80=81=EF=BC=88=E3=81=9D?=
 =?utf8?q?=E3=81=AE=E3=81=A8=E3=81=8D=E3=81=AB=E3=81=A0=E3=81=91=E4=B8=80?=
 =?utf8?q?=E6=97=A6=EF=BC=89=E3=83=97=E3=83=AD=E3=82=B0=E3=83=AC=E3=82=B9?=
 =?utf8?q?=E3=83=90=E3=83=BC=E3=82=92=E8=B5=A4=E3=81=8F=E3=81=AA=E3=82=8B?=
 =?utf8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=EF=BC=88Vista?=
 =?utf8?q?=E3=82=AA=E3=83=B3=E3=83=AA=E3=83=BC=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://localhost/svn/AppliStation/trunk@971 34ed2c89-c49f-4a4b-abdb-c318350108cf
---
 AppliStation/AppliStation.Util/ExecutionProgressViewer.cs | 2 ++
 AppliStation/AppliStation.Util/NativeMethods.cs           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs b/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs
index 7f2d33d..6ae5799 100644
--- a/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs
+++ b/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs
@@ -153,6 +153,8 @@ namespace AppliStation.Util
 					logBox.AppendText("  [エラー] " + e.TaskMessage + System.Environment.NewLine);
 					logBox.SelectionColor = logBox.ForeColor;
 					
+					NativeMethods.ProgressBar_SetState(progressBar, 2); // VistaProgress色：エラー
+					
 					autoCloseCheckBox.Enabled = false;
 					break;
 			}
diff --git a/AppliStation/AppliStation.Util/NativeMethods.cs b/AppliStation/AppliStation.Util/NativeMethods.cs
index 3259167..d6f7964 100644
--- a/AppliStation/AppliStation.Util/NativeMethods.cs
+++ b/AppliStation/AppliStation.Util/NativeMethods.cs
@@ -2,7 +2,6 @@
 #define USE_VISTA_EFFECTS
 
 using System;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
@@ -131,6 +130,7 @@ namespace AppliStation.Util
 		/// </summary>
 		/// <remarks>Vista未満のバージョンでは何もしない。</remarks>
 		/// <param name="listView">対象のListView</param>
+		[System.Diagnostics.ConditionalAttribute("USE_VISTA_EFFECTS")]
 		public static void ListView_EnableVistaExplorerTheme(ListView listView)
 		{
 #if USE_VISTA_EFFECTS
-- 
2.11.0