From ddf5ff9bc051308a0020f18bfcc9e03b9bfab8cb Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 7 Mar 2015 09:10:47 +0000
Subject: [PATCH] Fixed Navigator highlighting of hexa enums #1002

git-svn-id: svn://ultimatepp.org/upp/trunk@8240 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Value.h            | 3 +++
 uppsrc/ide/Browser/Browser.upp | 2 +-
 uppsrc/ide/Browser/Item.cpp    | 2 +-
 uppsrc/ide/Browser/init        | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/uppsrc/Core/Value.h b/uppsrc/Core/Value.h
index 253cf6bcf..519dceb91 100644
--- a/uppsrc/Core/Value.h
+++ b/uppsrc/Core/Value.h
@@ -215,6 +215,9 @@ public:
 	operator int() const             { return Is(INT_V) ? GetSmallRaw<int>() : GetOtherInt(); }
 	operator int64() const           { return Is(INT64_V) ? GetSmallRaw<int64>() : GetOtherInt64(); }
 	operator bool() const            { return Is(BOOL_V) ? GetSmallRaw<bool>() : GetOtherBool(); }
+	
+//	operator std::string() const     { return (String)*this; }
+//	operator std::wstring() const    { return (WString)*this; }
 
 	Value(const String& s) : data(s) { Magic(); }
 	Value(const WString& s);
diff --git a/uppsrc/ide/Browser/Browser.upp b/uppsrc/ide/Browser/Browser.upp
index 39af5c19b..b6a82363c 100644
--- a/uppsrc/ide/Browser/Browser.upp
+++ b/uppsrc/ide/Browser/Browser.upp
@@ -7,7 +7,7 @@ uses
 	RichEdit;
 
 file
-	Browser.h options PCH,
+	Browser.h options(BUILDER_OPTION) PCH,
 	Browser readonly separator,
 	Lay.cpp,
 	Iml.cpp,
diff --git a/uppsrc/ide/Browser/Item.cpp b/uppsrc/ide/Browser/Item.cpp
index 2091eee22..ed71eba4c 100644
--- a/uppsrc/ide/Browser/Item.cpp
+++ b/uppsrc/ide/Browser/Item.cpp
@@ -98,7 +98,7 @@ Vector<ItemTextPart> ParseItemNatural(const String& name,
 		p.pari = pari;
 		int n = 1;
 		if(*s >= '0' && *s <= '9') {
-			while(s[n] >= '0' && s[n] <= '9')
+			while(s[n] >= '0' && s[n] <= '9' || (s[n] == 'x' || s[n] == 'X'))
 				n++;
 			p.type = ITEM_NUMBER;
 		}
diff --git a/uppsrc/ide/Browser/init b/uppsrc/ide/Browser/init
index 7a2c8bd86..326e0d9fc 100644
--- a/uppsrc/ide/Browser/init
+++ b/uppsrc/ide/Browser/init
@@ -4,7 +4,7 @@
 #include "ide\Common/init"
 #include "PdfDraw/init"
 #include "RichEdit/init"
-#define BLITZ_INDEX__ F09f1bfac1925f12219a612fc7165f5a9
+#define BLITZ_INDEX__ Faf5167357a73176b37fced69d194f797
 #include "TopicI.icpp"
 #undef BLITZ_INDEX__
 #endif