Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-09-28 16:17:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

use HIBYTE_WORD16/LOBYTE_WORD16 to extract bytes from wParam of MSG_CHAR

Browse Source
This commit is contained in:
VincentWei
2018-02-02 12:07:08 +08:00
parent c6c60b862b
commit 7c9fb6e4f7
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/control/bidiedit.c
+3 -3
View File
@@ -2474,14 +2474,14 @@ SLEditCtrlProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
if (dwStyle & ES_READONLY) if (dwStyle & ES_READONLY)
return 0; return 0;
charBuffer [0] = LOBYTE (wParam); charBuffer [0] = LOBYTE_WORD16 (wParam);
charBuffer [1] = HIBYTE (wParam); charBuffer [1] = HIBYTE_WORD16 (wParam);
charBuffer [2] = (0x00ff0000 & wParam) >> 16; charBuffer [2] = (0x00ff0000 & wParam) >> 16;
if (charBuffer [2]) { if (charBuffer [2]) {
chars = 3; chars = 3;
} }
else if (HIBYTE (wParam)) { else if (HIBYTE_WORD16 (wParam)) {
chars = 2; chars = 2;
} }
else { else {
src/control/button.c
+3 -3
View File
@@ -816,12 +816,12 @@ static LRESULT ButtonCtrlProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
break; break;
case MSG_CHAR: case MSG_CHAR:
if (HIBYTE (wParam)==0 && BUTTON_IS_CHECKBTN (pctrl)) { if (HIBYTE_WORD16 (wParam)==0 && BUTTON_IS_CHECKBTN (pctrl)) {
int old_check = BUTTON_GET_CHECK(pctrl); int old_check = BUTTON_GET_CHECK(pctrl);
if (LOBYTE(wParam) == '+' || LOBYTE(wParam) == '=') if (LOBYTE_WORD16(wParam) == '+' || LOBYTE_WORD16(wParam) == '=')
BUTTON_SET_CHECK(pctrl, BST_CHECKED); BUTTON_SET_CHECK(pctrl, BST_CHECKED);
else if (LOBYTE(wParam) == '-') else if (LOBYTE_WORD16(wParam) == '-')
BUTTON_SET_CHECK(pctrl, BST_UNCHECKED); BUTTON_SET_CHECK(pctrl, BST_UNCHECKED);
if (old_check != BUTTON_GET_CHECK(pctrl)) if (old_check != BUTTON_GET_CHECK(pctrl))
src/control/edit.c
+3 -3
View File
@@ -2081,14 +2081,14 @@ SLEditCtrlProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
if (dwStyle & ES_READONLY) if (dwStyle & ES_READONLY)
return 0; return 0;
charBuffer [0] = LOBYTE (wParam); charBuffer [0] = LOBYTE_WORD16 (wParam);
charBuffer [1] = HIBYTE (wParam); charBuffer [1] = HIBYTE_WORD16 (wParam);
charBuffer [2] = (0x00ff0000 & wParam) >> 16; charBuffer [2] = (0x00ff0000 & wParam) >> 16;
if (charBuffer [2]) { if (charBuffer [2]) {
chars = 3; chars = 3;
} }
else if (HIBYTE (wParam)) { else if (HIBYTE_WORD16 (wParam)) {
chars = 2; chars = 2;
} }
else { else {
src/control/listbox.c
+2 -2
View File
@@ -1885,10 +1885,10 @@ static LRESULT ListboxCtrlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l
int newTop; int newTop;
PLISTBOXITEM plbi; PLISTBOXITEM plbi;
if (HIBYTE (wParam)) if (HIBYTE_WORD16 (wParam))
break; break;
head [0] = LOBYTE (wParam); head [0] = LOBYTE_WORD16 (wParam);
head [1] = '\0'; head [1] = '\0';
pData = (PLISTBOXDATA)pCtrl->dwAddData2; pData = (PLISTBOXDATA)pCtrl->dwAddData2;
src/font/utils/makepytab.c
+1 -1
View File
@@ -62,7 +62,7 @@ static void output_gbhz_py_tab (void)
int j; int j;
GBHZ_PINYIN* p = gbhz_py_tab + i; GBHZ_PINYIN* p = gbhz_py_tab + i;
printf ("\t{0x%04X /* %c%c */, 0, {", p->encoding, HIBYTE (p->encoding), LOBYTE (p->encoding)); printf ("\t{0x%04X /* %c%c */, 0, {", p->encoding, HIBYTE_WORD16 (p->encoding), LOBYTE_WORD16 (p->encoding));
for (j = 0; j < MAX_NR_PINYIN; j++) { for (j = 0; j < MAX_NR_PINYIN; j++) {
int no_py, tone; int no_py, tone;
if (p->pinyin [j] == 0) if (p->pinyin [j] == 0)
src/gui/dialog.c
+2 -2
View File
@@ -816,9 +816,9 @@ static LRESULT MsgBoxProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam
{ {
int id = 0; int id = 0;
if (HIBYTE (wParam)) if (HIBYTE_WORD16 (wParam))
break; break;
switch (LOBYTE (wParam)) { switch (LOBYTE_WORD16 (wParam)) {
case 'Y': case 'Y':
case 'y': case 'y':
id = IDYES; id = IDYES;
src/textedit/mtextedit.c
+2 -2
View File
@@ -4327,8 +4327,8 @@ static int mTextEditor_onChar(mTextEditor *self, int asciiCode, DWORD keyFlags)
return 0; return 0;
} }
ch [0] = LOBYTE (asciiCode); ch [0] = LOBYTE_WORD16 (asciiCode);
ch [1] = HIBYTE (asciiCode); ch [1] = HIBYTE_WORD16 (asciiCode);
ch [2] = (0x0ff0000 & asciiCode) >> 16; ch [2] = (0x0ff0000 & asciiCode) >> 16;
if (ch[2]) { if (ch[2]) {
chlen = 3; chlen = 3;