Mercurial > dwindows
comparison os2/dw.c @ 1393:eb83c9830dfa
Compile fixes for that last commit on OS/2.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sat, 26 Nov 2011 22:55:33 +0000 |
parents | 943266c86aed |
children | a151d45a7041 |
comparison
equal
deleted
inserted
replaced
1392:943266c86aed | 1393:eb83c9830dfa |
---|---|
3826 LONG lHight; | 3826 LONG lHight; |
3827 LONG lWidth; | 3827 LONG lWidth; |
3828 POINTL txtPointl[TXTBOX_COUNT]; | 3828 POINTL txtPointl[TXTBOX_COUNT]; |
3829 POINTL ptlWork = {0,0}; | 3829 POINTL ptlWork = {0,0}; |
3830 ULONG ulColor = CLR_YELLOW; | 3830 ULONG ulColor = CLR_YELLOW; |
3831 void *blah; | 3831 void *bubbleproc; |
3832 | 3832 |
3833 hwndBubbleLast = hwnd; | 3833 hwndBubbleLast = hwnd; |
3834 hwndBubble = WinCreateWindow(HWND_DESKTOP, | 3834 hwndBubble = WinCreateWindow(HWND_DESKTOP, |
3835 WC_STATIC, | 3835 WC_STATIC, |
3836 NULL, | 3836 NULL, |
3874 lHight = txtPointl[TXTBOX_TOPLEFT].y - | 3874 lHight = txtPointl[TXTBOX_TOPLEFT].y - |
3875 txtPointl[TXTBOX_BOTTOMLEFT].y + 8; | 3875 txtPointl[TXTBOX_BOTTOMLEFT].y + 8; |
3876 | 3876 |
3877 ptlWork.y -= lHight; | 3877 ptlWork.y -= lHight; |
3878 | 3878 |
3879 blah = (void *)WinSubclassWindow(hwndBubble, _BubbleProc); | 3879 bubbleproc = (void *)WinSubclassWindow(hwndBubble, _BubbleProc); |
3880 | 3880 |
3881 if(blah) | 3881 if(bubbleproc) |
3882 WinSetWindowPtr(hwndBubble, QWP_USER, blah); | 3882 WinSetWindowPtr(hwndBubble, QWP_USER, bubbleproc); |
3883 | 3883 |
3884 WinSetWindowPos(hwndBubble, | 3884 WinSetWindowPos(hwndBubble, |
3885 HWND_TOP, | 3885 HWND_TOP, |
3886 ptlWork.x, | 3886 ptlWork.x, |
3887 ptlWork.y, | 3887 ptlWork.y, |
5637 NULL, | 5637 NULL, |
5638 NULL); | 5638 NULL); |
5639 | 5639 |
5640 strncpy(blah->bubbletext, text, BUBBLE_HELP_MAX - 1); | 5640 strncpy(blah->bubbletext, text, BUBBLE_HELP_MAX - 1); |
5641 blah->bubbletext[BUBBLE_HELP_MAX - 1] = '\0'; | 5641 blah->bubbletext[BUBBLE_HELP_MAX - 1] = '\0'; |
5642 blah->old = WinSubclassWindow(tmp, _BtProc); | 5642 blah->oldproc = WinSubclassWindow(tmp, _BtProc); |
5643 | 5643 |
5644 WinSetWindowPtr(tmp, QWP_USER, blah); | 5644 WinSetWindowPtr(tmp, QWP_USER, blah); |
5645 | 5645 |
5646 if(icon) | 5646 if(icon) |
5647 dw_window_set_data(tmp, "_dw_button_icon", (void *)icon); | 5647 dw_window_set_data(tmp, "_dw_button_icon", (void *)icon); |