github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Fixed to compile

Browse source
This commit is contained in:
Mirek Fidler 2021-12-09 00:44:12 +01:00
parent 85873b75f0
commit 802d9f3e9f
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/Core/CharSet.h
View file

@ -10,6 +10,7 @@ enum {
#define CHARSET_TOASCII 253
#define CHARSET_UTF32 254 // auxilary
#define CHARSET_UTF8 255
#define CHARSET_UNICODE 255 // deprecated
enum {
DEFAULTCHAR = 0x1f

4
uppsrc/ide/LayDes/LayDes.h
View file

@ -201,7 +201,7 @@ public:
String SaveProperties(int y = 0) const;
String Save(int i, int y, const String& eol) const;
LayoutItem() { csize.cx = -1; hide = false; charset = CHARSET_UNICODE; }
LayoutItem() { csize.cx = -1; hide = false; charset = CHARSET_UTF8; }
};
Image GetTypeIcon(const String& type, int cx, int cy, int i, Color bg);
@ -246,7 +246,7 @@ public:
rval_default(LayoutData);
LayoutData() { size = Size(400, 200); charset = CHARSET_UNICODE; }
LayoutData() { size = Size(400, 200); charset = CHARSET_UTF8; }
};
class LayDesigner;

4
uppsrc/ide/LayDes/textprop.cpp
View file

@ -42,7 +42,7 @@ String NoCr(const String& s)
int LTProperty::Filter(int chr) const
{
return charset == CHARSET_UNICODE ? chr : FromUnicode(chr, charset) == DEFAULTCHAR ? 0 : chr;
return charset == CHARSET_UTF8 ? chr : FromUnicode(chr, charset) == DEFAULTCHAR ? 0 : chr;
}
void LTProperty::EditAction()
@ -56,7 +56,7 @@ LTProperty::LTProperty()
context.WhenAction = THISBACK(Context);
id = LayImg::Id();
id.WhenAction = THISBACK(Id);
charset = CHARSET_UNICODE; //!! not good, but better than a crash; TRC 06/04/10//TODO
charset = CHARSET_UTF8; //!! not good, but better than a crash; TRC 06/04/10//TODO
}
void LTProperty::SyncLid()