Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-09-26 20:45:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename notif_proc to NotifProc in CONTROL structure; fix conditional compilation errors

Browse Source
This commit is contained in:
Vincent Wei
2020-02-29 17:52:40 +08:00
parent df03ad014f
commit 513618d4ca
3 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/window.c
+16 -16
View File
@@ -5991,7 +5991,7 @@ HWND GUIAPI CreateWindowEx2 (const char* spClassName,
pNewCtrl->old_under_pointer = NULL;
pNewCtrl->primitive = NULL;
pNewCtrl->notif_proc = NULL;
pNewCtrl->NotifProc = NULL;
pNewCtrl->pMainWin = (PMAINWIN)pMainWin;
pNewCtrl->pParent = (PCONTROL)hParentWnd;
@@ -6225,8 +6225,8 @@ NOTIFPROC GUIAPI SetNotificationCallback (HWND hwnd, NOTIFPROC notif_proc)
MG_CHECK_RET (MG_IS_APP_WINDOW(hwnd), NULL);
old_proc = control->notif_proc;
control->notif_proc = notif_proc;
old_proc = control->NotifProc;
control->NotifProc = notif_proc;
return old_proc;
}
@@ -6236,7 +6236,7 @@ NOTIFPROC GUIAPI GetNotificationCallback (HWND hwnd)
MG_CHECK_RET (MG_IS_APP_WINDOW(hwnd), NULL);
return control->notif_proc;
return control->NotifProc;
}
/****************************** Hook support ********************************/
@@ -7196,13 +7196,13 @@ void GUIAPI DumpWindow (FILE* fp, HWND hwnd)
fprintf (fp, "Style -- %lx\n", control->dwStyle);
fprintf (fp, "ExStyle -- %lx\n", control->dwExStyle);
fprintf (fp, "PrivCDC -- %p\n", control->privCDC);
fprintf (fp, "PrivCDC -- %p\n", control->privCDC);
fprintf (fp, "AddData -- %lx\n", control->dwAddData);
fprintf (fp, "AddData2 -- %lx\n", control->dwAddData2);
fprintf (fp, "WinProc -- %p\n", control->ControlProc);
fprintf (fp, "NotifProc -- %p\n", main_wnd->NotifProc);
fprintf (fp, "NotifProc -- %p\n", control->NotifProc);
fprintf (fp, "Caption -- %s\n", control->spCaption);
fprintf (fp, "ID -- %ld\n", control->id);
@@ -7226,19 +7226,19 @@ void GUIAPI DumpWindow (FILE* fp, HWND hwnd)
fprintf (fp, "The handle (*%p) is a virtual Window", hwnd);
fprintf (fp, "AddData -- %lx\n", main_wnd->dwAddData);
fprintf (fp, "AddData2 -- %lx\n", main_wnd->dwAddData2);
fprintf (fp, "AddData -- %lx\n", virt_wnd->dwAddData);
fprintf (fp, "AddData2 -- %lx\n", virt_wnd->dwAddData2);
fprintf (fp, "WinProc -- %p\n", main_wnd->MainWindowProc);
fprintf (fp, "NotifProc -- %p\n", main_wnd->NotifProc);
fprintf (fp, "Caption -- %s\n", main_wnd->spCaption);
fprintf (fp, "ID -- %d\n", main_wnd->id);
fprintf (fp, "WinProc -- %p\n", virt_wnd->WndProc);
fprintf (fp, "NotifProc -- %p\n", virt_wnd->NotifProc);
fprintf (fp, "Caption -- %s\n", virt_wnd->spCaption);
fprintf (fp, "ID -- %ld\n", virt_wnd->id);
fprintf (fp, "Hosting -- %p\n", main_wnd->pHosting);
fprintf (fp, "FirstHosted -- %p\n", main_wnd->pFirstHosted);
fprintf (fp, "NextHosted -- %p\n", main_wnd->pNextHosted);
fprintf (fp, "Hosting -- %p\n", virt_wnd->pHosting);
fprintf (fp, "FirstHosted -- %p\n", virt_wnd->pFirstHosted);
fprintf (fp, "NextHosted -- %p\n", virt_wnd->pNextHosted);
fprintf (fp, "MsgQueue -- %p\n", main_wnd->pMsgQueue);
fprintf (fp, "MsgQueue -- %p\n", virt_wnd->pMsgQueue);
}
#endif /* defined _MGHAVE_VIRTUAL_WINDOW */
else {
src/include/ctrlclass.h
+1 -1
View File
@@ -107,7 +107,7 @@ typedef struct _CONTROL
LINT id; // the identifier of child window.
WNDPROC ControlProc; // the window procedure of this control.
NOTIFPROC notif_proc; // the notification callback procedure.
NOTIFPROC NotifProc; // the notification callback procedure.
DWORD dwAddData; // the additional data.
DWORD dwAddData2; // the second addtional data.
src/include/debug.h
+27 -27
View File
@@ -277,12 +277,12 @@ dump_window_details (HWND hwnd, const char* name)
_MG_PRINTF ("AddData -- %lx\n", main_wnd->dwAddData);
_MG_PRINTF ("AddData2 -- %lx\n", main_wnd->dwAddData2);
_MG_PRINTF ("WinProc -- %p\n", main_wnd->MainWindowProc);
_MG_PRINTF ("NotifProc -- %p\n", main_wnd->NotifProc);
_MG_PRINTF ("Caption -- %s\n", main_wnd->spCaption);
_MG_PRINTF ("WinProc -- %p\n", main_wnd->MainWindowProc);
_MG_PRINTF ("NotifProc -- %p\n", main_wnd->NotifProc);
_MG_PRINTF ("Caption -- %s\n", main_wnd->spCaption);
_MG_PRINTF ("ID -- %ld\n", main_wnd->id);
_MG_PRINTF ("FirstChild -- %p\n", main_wnd->hFirstChild);
_MG_PRINTF ("FirstChild -- %p\n", main_wnd->hFirstChild);
control = (PCONTROL)main_wnd->hFirstChild;
while (control) {
@@ -292,17 +292,17 @@ dump_window_details (HWND hwnd, const char* name)
control = control->next;
}
_MG_PRINTF ("ActiveChild -- %p\n", main_wnd->hActiveChild);
_MG_PRINTF ("Hosting -- %p\n", main_wnd->pHosting);
_MG_PRINTF ("FirstHosted -- %p\n", main_wnd->pFirstHosted);
_MG_PRINTF ("NextHosted -- %p\n", main_wnd->pNextHosted);
_MG_PRINTF ("BkColor -- %x\n", main_wnd->iBkColor);
_MG_PRINTF ("Menu -- %p\n", main_wnd->hMenu);
_MG_PRINTF ("Accel -- %p\n", main_wnd->hAccel);
_MG_PRINTF ("Cursor -- %p\n", main_wnd->hCursor);
_MG_PRINTF ("Icon -- %p\n", main_wnd->hIcon);
_MG_PRINTF ("SysMenu -- %p\n", main_wnd->hSysMenu);
_MG_PRINTF ("MsgQueue -- %p\n", main_wnd->pMsgQueue);
_MG_PRINTF ("ActiveChild -- %p\n", main_wnd->hActiveChild);
_MG_PRINTF ("Hosting -- %p\n", main_wnd->pHosting);
_MG_PRINTF ("FirstHosted -- %p\n", main_wnd->pFirstHosted);
_MG_PRINTF ("NextHosted -- %p\n", main_wnd->pNextHosted);
_MG_PRINTF ("BkColor -- %x\n", main_wnd->iBkColor);
_MG_PRINTF ("Menu -- %p\n", main_wnd->hMenu);
_MG_PRINTF ("Accel -- %p\n", main_wnd->hAccel);
_MG_PRINTF ("Cursor -- %p\n", main_wnd->hCursor);
_MG_PRINTF ("Icon -- %p\n", main_wnd->hIcon);
_MG_PRINTF ("SysMenu -- %p\n", main_wnd->hSysMenu);
_MG_PRINTF ("MsgQueue -- %p\n", main_wnd->pMsgQueue);
}
else if (main_wnd->WinType == TYPE_CONTROL) {
PCONTROL control = (PCONTROL)hwnd;
@@ -318,13 +318,13 @@ dump_window_details (HWND hwnd, const char* name)
_MG_PRINTF ("Style -- %lx\n", control->dwStyle);
_MG_PRINTF ("ExStyle -- %lx\n", control->dwExStyle);
_MG_PRINTF ("PrivCDC -- %p\n", control->privCDC);
_MG_PRINTF ("PrivCDC -- %p\n", control->privCDC);
_MG_PRINTF ("AddData -- %lx\n", control->dwAddData);
_MG_PRINTF ("AddData2 -- %lx\n", control->dwAddData2);
_MG_PRINTF ("WinProc -- %p\n", control->ControlProc);
_MG_PRINTF ("NotifProc -- %p\n", main_wnd->NotifProc);
_MG_PRINTF ("NotifProc -- %p\n", control->NotifProc);
_MG_PRINTF ("Caption -- %s\n", control->spCaption);
_MG_PRINTF ("ID -- %ld\n", control->id);
@@ -348,19 +348,19 @@ dump_window_details (HWND hwnd, const char* name)
_MG_PRINTF ("The handle (*%p) is a virtual Window", hwnd);
_MG_PRINTF ("AddData -- %lx\n", main_wnd->dwAddData);
_MG_PRINTF ("AddData2 -- %lx\n", main_wnd->dwAddData2);
_MG_PRINTF ("AddData -- %lx\n", virt_wnd->dwAddData);
_MG_PRINTF ("AddData2 -- %lx\n", virt_wnd->dwAddData2);
_MG_PRINTF ("WinProc -- %p\n", main_wnd->MainWindowProc);
_MG_PRINTF ("NotifProc -- %p\n", main_wnd->NotifProc);
_MG_PRINTF ("Caption -- %s\n", main_wnd->spCaption);
_MG_PRINTF ("ID -- %d\n", main_wnd->id);
_MG_PRINTF ("WinProc -- %p\n", virt_wnd->WndProc);
_MG_PRINTF ("NotifProc -- %p\n", virt_wnd->NotifProc);
_MG_PRINTF ("Caption -- %s\n", virt_wnd->spCaption);
_MG_PRINTF ("ID -- %ld\n", virt_wnd->id);
_MG_PRINTF ("Hosting -- %p\n", main_wnd->pHosting);
_MG_PRINTF ("FirstHosted -- %p\n", main_wnd->pFirstHosted);
_MG_PRINTF ("NextHosted -- %p\n", main_wnd->pNextHosted);
_MG_PRINTF ("Hosting -- %p\n", virt_wnd->pHosting);
_MG_PRINTF ("FirstHosted -- %p\n", virt_wnd->pFirstHosted);
_MG_PRINTF ("NextHosted -- %p\n", virt_wnd->pNextHosted);
_MG_PRINTF ("MsgQueue -- %p\n", main_wnd->pMsgQueue);
_MG_PRINTF ("MsgQueue -- %p\n", virt_wnd->pMsgQueue);
}
#endif /* defined _MGHAVE_VIRTUAL_WINDOW */
else {