From 928783160a385bcb5dfdd93db1f2a0a97614d17d Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 15 May 2018 08:33:39 +0000
Subject: [PATCH] .rainbow

git-svn-id: svn://ultimatepp.org/upp/trunk@11944 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 rainbow/SlaveGuiUword/main.cpp |  2 +-
 rainbow/VirtualGui/After.h     | 45 ----------------------------------
 rainbow/VirtualGui/Local.h     |  4 +--
 rainbow/VirtualGui/Top.cpp     |  2 +-
 4 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/rainbow/SlaveGuiUword/main.cpp b/rainbow/SlaveGuiUword/main.cpp
index 9c7722876..2e9ea2855 100644
--- a/rainbow/SlaveGuiUword/main.cpp
+++ b/rainbow/SlaveGuiUword/main.cpp
@@ -255,7 +255,7 @@ void AppMain()
 	         .DefaultExt("qtf");
 
 	LoadFromFile(callback(UWord::SerializeApp));
-	UWord uword;
+	new UWord;
 	Ctrl::EventLoop();
 	StoreToFile(callback(UWord::SerializeApp));
 }
diff --git a/rainbow/VirtualGui/After.h b/rainbow/VirtualGui/After.h
index fa98f2302..93e50e5fb 100644
--- a/rainbow/VirtualGui/After.h
+++ b/rainbow/VirtualGui/After.h
@@ -4,49 +4,4 @@ public:
 	~ViewDraw();
 };
 
-
-/*
-class ViewDraw : public SystemDraw {
-	Vector<Rect> dummy;
-public:
-	ViewDraw(Ctrl *) : SystemDraw(Ctrl::framebuffer, dummy) { dummy.Add(Rect(10, 10, 100, 100)); }
-};
-*/
 class DHCtrl : Ctrl {};
-
-#if 0
-
-#ifdef PLATFORM_WIN32
-#define GUI_APP_MAIN \
-void GuiMainFn_(); \
-\
-extern "C" int main(int argc, char *argv[]) { \
-	UPP::AppInit__(argc, (const char **)argv); \
-	FBInit(); \
-	GuiMainFn_(); \
-	UPP::Ctrl::CloseTopCtrls(); \
-	FBDeInit(); \
-	return UPP::GetExitCode(); \
-} \
-\
-void GuiMainFn_()
-
-#endif
-
-#ifdef PLATFORM_POSIX
-#define GUI_APP_MAIN \
-void GuiMainFn_(); \
-\
-extern "C" int main(int argc, const char **argv, const char **envptr) { \
-	UPP::AppInit__(argc, argv, envptr); \
-	FBInit(); \
-	GuiMainFn_(); \
-	UPP::Ctrl::CloseTopCtrls(); \
-	FBDeInit(); \
-	return UPP::GetExitCode(); \
-} \
-\
-void GuiMainFn_()
-#endif
-
-#endif
\ No newline at end of file
diff --git a/rainbow/VirtualGui/Local.h b/rainbow/VirtualGui/Local.h
index e98f4c22b..bf1b9cb97 100644
--- a/rainbow/VirtualGui/Local.h
+++ b/rainbow/VirtualGui/Local.h
@@ -2,7 +2,7 @@
 
 #ifdef VIRTUALGUI
 
-NAMESPACE_UPP
+namespace Upp {
 
 class TopWindowFrame : public Ctrl {
 public:
@@ -58,6 +58,6 @@ public:
 	TopWindowFrame();
 };
 
-END_UPP_NAMESPACE
+}
 
 #endif
diff --git a/rainbow/VirtualGui/Top.cpp b/rainbow/VirtualGui/Top.cpp
index bd24f5823..592f31942 100644
--- a/rainbow/VirtualGui/Top.cpp
+++ b/rainbow/VirtualGui/Top.cpp
@@ -42,7 +42,7 @@ void TopWindow::SyncCaption()
 	frame->sizeable = sizeable;
 	frame->RefreshLayout();
 	frame->Refresh();
-	frame->close << [=] { WhenClose(); };
+	frame->close ^= [=] { WhenClose(); };
 	frame->icon = icon;
 	frame->Enable(IsEnabled());
 }