bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Different fixes

Browse Source
This commit is contained in:
Alexander S. Aganichev
2001-05-20 12:23:00 +00:00
parent 478e6e0e62
commit a49b93dc74
5 changed files with 53 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
goldlib/gall/gctype.h
View File

@@ -49,10 +49,16 @@ extern "C" {
extern char tl[256], tu[256];
inline int _nls_tolower(int c) { return tl[c]; }
inline int _nls_toupper(int c) { return tu[c]; }
#ifdef __MSVCRT__
inline int _nls_isspace(int c) { return (iscntrl(c) or (c == ' ')); }
#endif
#ifdef __cplusplus
}
#define tolower(a) _nls_tolower((unsigned char)(a))
#define toupper(a) _nls_toupper((unsigned char)(a))
#ifdef __MSVCRT__
#define isspace(a) _nls_isspace((unsigned char)(a))
#endif
#endif
#endif
@@ -62,9 +68,8 @@ inline int _nls_toupper(int c) { return tu[c]; }
#ifdef __cplusplus
extern "C" {
#endif
inline int iswhite(char c) { return c and (iscntrl(c) or (c == ' ')); }
// NLS chars detected by converting to lower or upper case and in case they don't match they treated as characters
inline int isxalnum(char c) { return isalnum(c) or ((c >= 128) and ((c != tolower(c)) or (c != toupper(c)))); }
inline int isxalnum(char c) { return isascii(c) ? isalnum(c) : (c != tolower(c)) or (c != toupper(c)); }
#ifdef __cplusplus
}
#endif

5
goldlib/gall/gwinmenu.cpp
View File

@@ -796,8 +796,9 @@ int wmenuitem(int wrow, int wcol, const char* str, char schar, int tagid, int fm
int width = 1 + (gwin.cmenu->ecol-border) - (gwin.cmenu->scol+border);
size_t _titlen = gwin.cmenu->title ? strlen(gwin.cmenu->title) : 0;
int length = maximum_of_two(strlen(str), _titlen);
if(length > width)
size_t _strlen = strlen(str);
size_t length = maximum_of_two(_strlen, _titlen);
if((int)length > width)
gwin.cmenu->ecol += length - width;
if(gwin.cmenu->menutype & M_VERT) {