From d76f0bfa4e2200647c318d41b495ac510511ed0a Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 4 Feb 2011 15:05:04 +0000
Subject: [PATCH] .uppsrc: minor fixes

git-svn-id: svn://ultimatepp.org/upp/trunk@3160 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Defs.h             | 2 +-
 uppsrc/CtrlLib/Splitter.cpp    | 7 ++++---
 uppsrc/CtrlLib/init            | 2 +-
 uppsrc/art/BlueBar/BlueBar.upp | 2 ++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/uppsrc/Core/Defs.h b/uppsrc/Core/Defs.h
index cea7265c9..3f2bbcacb 100644
--- a/uppsrc/Core/Defs.h
+++ b/uppsrc/Core/Defs.h
@@ -1,7 +1,7 @@
 #ifdef PLATFORM_WIN32
 #define __BREAK__        (*(int *)0 = 0)
 #else
-#define __BREAK__        (*(int *)0 = 0) // kill(getpid(), SIGTRAP)
+#define __BREAK__        (*(volatile int *)0 = 0) // kill(getpid(), SIGTRAP)
 #endif
 
 #ifdef COMPILER_MSC
diff --git a/uppsrc/CtrlLib/Splitter.cpp b/uppsrc/CtrlLib/Splitter.cpp
index 339f70b6f..f5c89774b 100644
--- a/uppsrc/CtrlLib/Splitter.cpp
+++ b/uppsrc/CtrlLib/Splitter.cpp
@@ -255,14 +255,15 @@ Splitter& Splitter::SetStyle(const Style& s)
 }
 
 Splitter::Splitter() {
+	chstyle = NULL;
 	style = -1;
-	pos.Add(5000);
 	width = 4;
-	SetFrame(NullFrame());
 	vert = false;
+	mouseindex = -1;
+	pos.Add(5000);
+	SetFrame(NullFrame());
 	NoWantFocus();
 	VSizePos(0, 0).HSizePos(0, 0);
-	mouseindex = -1;
 	SetStyle(StyleDefault());
 }
 
diff --git a/uppsrc/CtrlLib/init b/uppsrc/CtrlLib/init
index a413c8714..93fe61c1f 100644
--- a/uppsrc/CtrlLib/init
+++ b/uppsrc/CtrlLib/init
@@ -2,7 +2,7 @@
 #define _CtrlLib_icpp_init_stub
 #include "CtrlCore/init"
 #include "PdfDraw/init"
-#define BLITZ_INDEX__ F400D659105863656EF428C4BB2E0C6EA
+#define BLITZ_INDEX__ F7B97C944BA67CEA5EF77747BEFD63724
 #include "CtrlLib.icpp"
 #undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/art/BlueBar/BlueBar.upp b/uppsrc/art/BlueBar/BlueBar.upp
index edcf91255..df3cb66c0 100644
--- a/uppsrc/art/BlueBar/BlueBar.upp
+++ b/uppsrc/art/BlueBar/BlueBar.upp
@@ -1,5 +1,7 @@
 description "Visual style for ToolBar and MenuBar";
 
+uses
+	CtrlLib;
 file
 	BlueBar.h,
 	BlueSkin.iml,