From ed13d210da8b331dead08517699911c6ce44f9ec Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 13 Jun 2011 08:20:57 +0000
Subject: [PATCH] .developing rainbow

git-svn-id: svn://ultimatepp.org/upp/trunk@3520 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/CtrlCore.h |  6 ++----
 uppsrc/CtrlCore/Win32Gui.h |  1 +
 uppsrc/CtrlCore/X11Gui.h   | 11 +++--------
 uppsrc/CtrlCore/init       |  2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h
index ac338cd9f..4c421f38e 100644
--- a/uppsrc/CtrlCore/CtrlCore.h
+++ b/uppsrc/CtrlCore/CtrlCore.h
@@ -5,12 +5,10 @@
 
 #ifdef PLATFORM_WIN32
 #include "Win32Gui.h"
-#define GUI_WIN
 #endif
 
 #ifdef PLATFORM_X11
 #include "X11Gui.h"
-#define GUI_X11
 #endif
 
 NAMESPACE_UPP
@@ -1532,8 +1530,6 @@ void   AppendClipboardImage(const Image& img);
 inline void WriteClipboardImage(const Image& img)
 	{ ClearClipboard(); AppendClipboardImage(img); }
 
-#include <CtrlCore/TopWindow.h>
-
 bool (*&DisplayErrorFn())(const Value& v);
 inline bool DisplayError(const Value& v) { return DisplayErrorFn()(v); }
 
@@ -1545,6 +1541,8 @@ String     EncodeRTF(const RichText& richtext, byte charset, int dot_page_width)
 String     EncodeRTF(const RichText& richtext);
 RichText   ParseRTF(const char *rtf);
 
+#include <CtrlCore/TopWindow.h>
+
 #include GUIPLATFORM_INCLUDE_AFTER
 
 END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/Win32Gui.h b/uppsrc/CtrlCore/Win32Gui.h
index e0f7c4efb..eadbed08a 100644
--- a/uppsrc/CtrlCore/Win32Gui.h
+++ b/uppsrc/CtrlCore/Win32Gui.h
@@ -1,3 +1,4 @@
+#define GUI_WIN
 
 NAMESPACE_UPP
 
diff --git a/uppsrc/CtrlCore/X11Gui.h b/uppsrc/CtrlCore/X11Gui.h
index a1ef4333b..32e38645f 100644
--- a/uppsrc/CtrlCore/X11Gui.h
+++ b/uppsrc/CtrlCore/X11Gui.h
@@ -1,4 +1,4 @@
-#ifdef PLATFORM_X11
+#define GUI_X11
 
 #define Time    XTime
 #define Font    XFont
@@ -225,12 +225,7 @@ public:
 
 END_UPP_NAMESPACE
 
-#endif
-
-
-#ifdef PLATFORM_X11
 #include "X11/keysym.h"
-#endif
 
 
 #define GUIPLATFORM_KEYCODES_INCLUDE "X11Keys.h"
@@ -247,8 +242,6 @@ END_UPP_NAMESPACE
 #define GUIPLATFORM_PASTECLIP_DECLS \
 	int          type;
 
-#define GUIPLATFORM_INCLUDE_AFTER "X11GuiA.h"
-
 NAMESPACE_UPP
 
 String XAtomName(Atom atom);
@@ -262,4 +255,6 @@ Index<Atom>& _NET_Supported();
 
 #include "stdids.h"
 
+#define GUIPLATFORM_INCLUDE_AFTER "X11GuiA.h"
+
 END_UPP_NAMESPACE
diff --git a/uppsrc/CtrlCore/init b/uppsrc/CtrlCore/init
index 5adddacff..6dbb31666 100644
--- a/uppsrc/CtrlCore/init
+++ b/uppsrc/CtrlCore/init
@@ -3,7 +3,7 @@
 #include "Draw/init"
 #include "plugin\bmp/init"
 #include "RichText/init"
-#define BLITZ_INDEX__ FDDB666BB117D4619615856200AE13D49
+#define BLITZ_INDEX__ F429D64BFEFB24DFF5EC8CD3A047A401C
 #include "CtrlCore.icpp"
 #undef BLITZ_INDEX__
 #endif