github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-05 17:44:55 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Fixed Navigator highlighting of hexa enums #1002

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8240 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-03-07 09:10:47 +00:00
parent 047f136521
commit ddf5ff9bc0
4 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
uppsrc/Core/Value.h
View file

@ -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);

2
uppsrc/ide/Browser/Browser.upp
View file

@ -7,7 +7,7 @@ uses
RichEdit;
file
Browser.h options PCH,
Browser.h options(BUILDER_OPTION) PCH,
Browser readonly separator,
Lay.cpp,
Iml.cpp,

2
uppsrc/ide/Browser/Item.cpp
View file

@ -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;
}

2
uppsrc/ide/Browser/init
View file

@ -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