From a2ca885eb37a019802f80ea3f1e387176e455108 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 17 Aug 2013 15:57:39 +0000
Subject: [PATCH] Skylark: minor fix, CtrlLib: ErrorOK

git-svn-id: svn://ultimatepp.org/upp/trunk@6244 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/BuildAll/BuildAll.cpp | 2 +-
 uppsrc/Core/Util.cpp         | 9 +++++++++
 uppsrc/Core/Util.h           | 1 +
 uppsrc/CtrlLib/ChGtk.cpp     | 1 +
 uppsrc/CtrlLib/ChWin32.cpp   | 1 +
 uppsrc/CtrlLib/Prompt.cpp    | 5 +++++
 uppsrc/CtrlLib/RichText.h    | 1 +
 uppsrc/Skylark/App.cpp       | 4 ----
 8 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/uppsrc/BuildAll/BuildAll.cpp b/uppsrc/BuildAll/BuildAll.cpp
index 7820e508c..0ece52a91 100644
--- a/uppsrc/BuildAll/BuildAll.cpp
+++ b/uppsrc/BuildAll/BuildAll.cpp
@@ -16,7 +16,7 @@ bool failed;
 const char *exclude[] = {
 	"SDLEXAMPLE", "OLECALC", // REACTIVATE LATER
 	"LOG:R",
-	"WINFB", "LINUXFB", "FRAMEBUFFER", "COUNTER",
+	"WINFB", "LINUXFB", "FRAMEBUFFER", "COUNTER", "REGEXPEXT",
 #ifdef PLATFORM_WIN32
 	"SQL_MYSQL",
 #endif
diff --git a/uppsrc/Core/Util.cpp b/uppsrc/Core/Util.cpp
index 12d9f25b3..726949078 100644
--- a/uppsrc/Core/Util.cpp
+++ b/uppsrc/Core/Util.cpp
@@ -874,6 +874,15 @@ void BeepExclamation()
 #endif
 }
 
+void BeepError()
+{
+#ifdef PLATFORM_WIN32
+	MessageBeep(MB_ICONERROR);
+#else
+	LinuxBeep("error.wav");
+#endif
+}
+
 void BeepQuestion()
 {
 #ifdef PLATFORM_WIN32
diff --git a/uppsrc/Core/Util.h b/uppsrc/Core/Util.h
index 0d7b621b5..8e0907a99 100644
--- a/uppsrc/Core/Util.h
+++ b/uppsrc/Core/Util.h
@@ -213,6 +213,7 @@ String GetLastErrorMessage();
 void   BeepInformation();
 void   BeepExclamation();
 void   BeepQuestion();
+void   BeepError();
 
 inline
 void memsetw(void *t, word value, int count)
diff --git a/uppsrc/CtrlLib/ChGtk.cpp b/uppsrc/CtrlLib/ChGtk.cpp
index 218c9e366..33a4b34b0 100644
--- a/uppsrc/CtrlLib/ChGtk.cpp
+++ b/uppsrc/CtrlLib/ChGtk.cpp
@@ -649,6 +649,7 @@ void ChHostSkin()
 	ChCtrlImg(CtrlImg::I_information, "gtk-dialog-info", 6);
 	ChCtrlImg(CtrlImg::I_question, "gtk-dialog-question", 6);
 	ChCtrlImg(CtrlImg::I_exclamation, "gtk-dialog-warning", 6);
+	ChCtrlImg(CtrlImg::I_error, "gtk-dialog-error", 6);
 
 	static struct {
 		void  (*set)(Image);
diff --git a/uppsrc/CtrlLib/ChWin32.cpp b/uppsrc/CtrlLib/ChWin32.cpp
index 0f1721d26..ec42c3381 100644
--- a/uppsrc/CtrlLib/ChWin32.cpp
+++ b/uppsrc/CtrlLib/ChWin32.cpp
@@ -610,6 +610,7 @@ void ChSysInit()
 	CtrlImg::Set(CtrlImg::I_information, Win32Icon(IDI_INFORMATION));
 	CtrlImg::Set(CtrlImg::I_question, Win32Icon(IDI_QUESTION));
 	CtrlImg::Set(CtrlImg::I_exclamation, Win32Icon(IDI_EXCLAMATION));
+	CtrlImg::Set(CtrlImg::I_error, Win32Icon(IDI_ERROR));
 
 	FrameButtonWidth_Write(GetSystemMetrics(SM_CYHSCROLL));
 	ScrollBarArrowSize_Write(GetSystemMetrics(SM_CXHSCROLL));
diff --git a/uppsrc/CtrlLib/Prompt.cpp b/uppsrc/CtrlLib/Prompt.cpp
index 129135a79..a373b13fd 100644
--- a/uppsrc/CtrlLib/Prompt.cpp
+++ b/uppsrc/CtrlLib/Prompt.cpp
@@ -164,6 +164,11 @@ void ShowExc(const Exc& exc) {
 	Prompt(Ctrl::GetAppName(), CtrlImg::exclamation(), DeQtf(exc), t_("OK"));
 }
 
+void ErrorOK(const char *qtf) {
+	BeepError();
+	Prompt(Ctrl::GetAppName(), CtrlImg::error(), qtf, t_("OK"));
+}
+
 int PromptOKCancel(const char *qtf) {
 	BeepQuestion();
 	return Prompt(Ctrl::GetAppName(), CtrlImg::question(), qtf, t_("OK"), t_("Cancel"));
diff --git a/uppsrc/CtrlLib/RichText.h b/uppsrc/CtrlLib/RichText.h
index 1bbbb3164..c5b4f93a6 100644
--- a/uppsrc/CtrlLib/RichText.h
+++ b/uppsrc/CtrlLib/RichText.h
@@ -138,6 +138,7 @@ int  PromptAbortRetry(const char *qtf);
 int  PromptAbortRetryIgnore(const char *qtf);
 
 void Exclamation(const char *qtf);
+void ErrorOK(const char *qtf);
 
 Image YesButtonImage();
 Image NoButtonImage();
diff --git a/uppsrc/Skylark/App.cpp b/uppsrc/Skylark/App.cpp
index c9cb251f2..8d44211a3 100644
--- a/uppsrc/Skylark/App.cpp
+++ b/uppsrc/Skylark/App.cpp
@@ -252,10 +252,6 @@ void SkylarkApp::Run()
 #endif
 		Main();
 
-#if defined(_DEBUG) && defined(PLATFORM_POSIX)
-	FileDelete(pidf);
-#endif
-
 	SKYLARKLOG("ExitSkylark");
 }