dwindows: win/dw.c comparison

comparison win/dw.c @ 2135:d9720d48d61e

Win: Code cleanup, create internal helper functions _dw_window_get_cinfo() and _dw_window_new_cinfo() to simply code dealing with ColorInfo structs. Remove the vcenter and unused user fields replacing them with style and rect. Style will cache the requested style for a window instead of the active style, which may differ based on the state of the system. So now we can just check the style to see if VCENTER is set.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 08 Jul 2020 22:24:33 +0000
parents	9e6e4ebd5e96
children	bbd81ee0ca9a

comparison

equal deleted inserted replaced

-:9e6e4ebd5e96
+:d9720d48d61e
 return SignalTranslate[z].message;
 }
 return 0L;
 }
+/* Internal function to get the ColorInfo struct from a widget/window */
+ColorInfo *_dw_window_get_cinfo(HWND handle)
+{
+return (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
+}
+/* Internal function to add ColorInfo and subclass a widget/window */
+ColorInfo *_dw_window_new_cinfo(HWND handle, BOOL subclass)
+{
+ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
+if(cinfo)
+{
+cinfo->back = cinfo->fore = -1;
+if(subclass)
+cinfo->pOldProc = SubclassWindow(handle, _colorwndproc);
+SetWindowLongPtr(handle, GWLP_USERDATA, (LONG_PTR)cinfo);
+}
+return cinfo;
+}
 /* This function removes any handlers on windows and frees
 * the user memory and resources allocated to it.
 */
 BOOL CALLBACK _free_window_memory(HWND handle, LPARAM lParam)
 {
-ColorInfo *thiscinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
+ColorInfo *thiscinfo = _dw_window_get_cinfo(handle);
 HFONT oldfont = (HFONT)SendMessage(handle, WM_GETFONT, 0, 0);
 HICON oldicon = (HICON)SendMessage(handle, WM_GETICON, 0, 0);
 TCHAR tmpbuf[100] = {0};
 TOOLINFO ti = { 0 };
 }
 }
 else if(_tcsnicmp(tmpbuf, UPDOWN_CLASS, _tcslen(UPDOWN_CLASS)+1)==0)
 {
 /* for spinbuttons, we need to get the spinbutton's "buddy", the text window associated and destroy it */
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(handle);
 if(cinfo && cinfo->buddy)
-DestroyWindow( cinfo->buddy );
+DestroyWindow(cinfo->buddy);
 }
 /* Some Edge Windows have an empty class.. abort. */
 else if(_tcslen(tmpbuf) == 0)
 return TRUE;
 TCHAR tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 if(_tcsnicmp(tmpbuf, UPDOWN_CLASS, _tcslen(UPDOWN_CLASS))==0) /* Spinner */
 {
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(handle);
 if(cinfo && cinfo->buddy)
 return cinfo->buddy;
 }
 if(_tcsnicmp(tmpbuf, COMBOBOXCLASSNAME, _tcslen(COMBOBOXCLASSNAME))==0) /* Combobox */
 {
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(handle);
 if(cinfo && cinfo->buddy)
 return cinfo->buddy;
 }
 return handle;
 return 1;
 }
 }
 else if(_tcsnicmp(tmpbuf, ScrollClassName, _tcslen(ScrollClassName))==0) /* Scroll Box */
 {
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(box->items[z].hwnd, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(handle);
 Box *scrollbox = (Box *)GetWindowLongPtr(cinfo->combo, GWLP_USERDATA);
 if(scrollbox && _focus_check_box(scrollbox, handle, start == 3 ? 3 : 0, direction, defaultitem))
 return 1;
 }
 }
 #endif
 else if(_tcsnicmp(tmpbuf, UPDOWN_CLASS, _tcslen(UPDOWN_CLASS)+1)==0)
 {
 /* Handle special case Spinbutton */
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(handle);
 MoveWindow(handle, currentx + pad + (width - 20) + xborder, currenty + pad + yborder,
 20, height, FALSE);
 if(cinfo)
 }
 }
 else if(_tcsncmp(tmpbuf, ScrollClassName, _tcslen(ScrollClassName)+1)==0)
 {
 /* Handle special case of scrollbox */
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(handle);
 int cx, cy, depth = 0;
 Box *thisbox = (Box *)GetWindowLongPtr(cinfo->combo, GWLP_USERDATA);
 SCROLLINFO hsi, vsi;
 RECT rect;
 _handle_splitbar_resize(handle, *percent, type, width, height);
 }
 else if(_tcsnicmp(tmpbuf, STATICCLASSNAME, _tcslen(STATICCLASSNAME)+1)==0)
 {
 /* Handle special case Vertically Center static text */
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(handle);
-if(cinfo && cinfo->vcenter)
+if(cinfo && cinfo->style & DW_DT_VCENTER)
 {
 /* We are centered so calculate a new position */
 TCHAR tmpbuf[1024] = {0}, *thisbuf = tmpbuf;
 int textheight, diff, total = height;
 * made dark, hide it and add the button to the titlebar instead.
 */
 if(msg == WM_NCCALCSIZE && mp2 && _DW_DARK_MODE_ENABLED && _DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC)
 {
 MARGINS *margins = dw_window_get_data(hWnd, "_dw_margins");
-RECT *border_thickness = dw_window_get_data(hWnd, "_dw_border");
+ColorInfo *cinfo = _dw_window_get_cinfo(hWnd);
-if (margins && border_thickness)
+if(margins && cinfo)
 {
 NCCALCSIZE_PARAMS* sz = (NCCALCSIZE_PARAMS*)mp2;
-sz->rgrc[0].left += border_thickness->left;
+sz->rgrc[0].left += cinfo->rect.left;
-sz->rgrc[0].right -= border_thickness->right;
+sz->rgrc[0].right -= cinfo->rect.right;
-sz->rgrc[0].bottom -= border_thickness->bottom;
+sz->rgrc[0].bottom -= cinfo->rect.bottom;
 if (_DwmExtendFrameIntoClientArea)
 _DwmExtendFrameIntoClientArea(hWnd, margins);
 SetWindowPos(hWnd, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
 return 0;
 /* Do default processing, except change the result for caption area */
 lResult = DefWindowProc(hWnd, msg, mp1, mp2);
 if(lResult == HTCLIENT)
 {
 MARGINS *margins = dw_window_get_data(hWnd, "_dw_margins");
-RECT *border_thickness = dw_window_get_data(hWnd, "_dw_border");
+ColorInfo *cinfo = _dw_window_get_cinfo(hWnd);
-if (margins && border_thickness)
+if(margins && cinfo)
 {
 POINT pt = { LOWORD(mp2), HIWORD(mp2) };
 ScreenToClient(hWnd, &pt);
-if (pt.y < border_thickness->top) return HTTOP;
+if (pt.y < cinfo->rect.top) return HTTOP;
 if (pt.y < margins->cyTopHeight)  return HTCAPTION;
 }
 }
 return lResult;
 }
 lasthwnd = hWnd;
 #ifdef DARK_MODE_TITLEBAR_MENU
 if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_ENABLED)
 {
-RECT *border_thickness = dw_window_get_data(hWnd, "_dw_border");
+ColorInfo *cinfo = _dw_window_get_cinfo(hWnd);
-if(border_thickness)
+if(cinfo)
 {
-dw_debug("Modifying resize from original %d, %d, %d, %d\n", x, y, xborder, yborder);
+x -= (cinfo->rect.left + cinfo->rect.right);
-x -= (border_thickness->left + border_thickness->right);
+y -= (cinfo->rect.top + cinfo->rect.bottom);
-y -= (border_thickness->top + border_thickness->bottom);
+xborder = cinfo->rect.left;
-xborder = border_thickness->left;
+yborder = cinfo->rect.top;
-yborder = border_thickness->top;
-dw_debug("To resize %d, %d, %d, %d\n", x, y, xborder, yborder);
 }
 }
 #endif
 ShowWindow(mybox->items[0].hwnd, SW_HIDE);
 }
 break;
 #endif
 case WM_PAINT:
 {
-ColorInfo *thiscinfo = (ColorInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
+ColorInfo *thiscinfo = _dw_window_get_cinfo(hWnd);
 if(thiscinfo && thiscinfo->fore != -1 && thiscinfo->back != -1)
 {
 PAINTSTRUCT ps;
 HDC hdcPaint = BeginPaint(hWnd, &ps);
 return rcode;
 }
 LRESULT CALLBACK _spinnerwndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2)
 {
-ColorInfo *cinfo;
+ColorInfo *cinfo = _dw_window_get_cinfo(hWnd);
-cinfo = (ColorInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
 if(msg == WM_MOUSEMOVE)
 _wndproc(hWnd, msg, mp1, mp2);
 if(cinfo)
 }
 /* Subclass function that will handle setting colors on controls */
 LRESULT CALLBACK _colorwndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2)
 {
-ColorInfo *cinfo;
+ColorInfo *cinfo = _dw_window_get_cinfo(hWnd);
 TCHAR tmpbuf[100] = {0};
 WNDPROC pOldProc = 0;
 LRESULT ret = -1;
-cinfo = (ColorInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
 GetClassName(hWnd, tmpbuf, 99);
 if(_tcsncmp(tmpbuf, FRAMECLASSNAME, _tcslen(FRAMECLASSNAME)+1) == 0)
 cinfo = &(((Box *)cinfo)->cinfo);
 /*
 * Find the toplevel window for the current window and check if it
 * has a default click set
 */
 HWND tl = _toplevel_window( hWnd );
-ColorInfo *mycinfo = (ColorInfo *)GetWindowLongPtr( tl, GWLP_USERDATA );
+ColorInfo *mycinfo = _dw_window_get_cinfo(tl);
-if ( mycinfo && mycinfo->clickdefault )
+if(mycinfo && mycinfo->clickdefault)
 {
-_click_default( mycinfo->clickdefault );
+_click_default(mycinfo->clickdefault);
 return (LRESULT)TRUE;
 }
 }
 }
 case WM_CTLCOLOREDIT:
 case WM_CTLCOLORMSGBOX:
 case WM_CTLCOLORSCROLLBAR:
 case WM_CTLCOLORDLG:
 {
-ColorInfo *thiscinfo = (ColorInfo *)GetWindowLongPtr((HWND)mp2, GWLP_USERDATA);
+ColorInfo *thiscinfo = _dw_window_get_cinfo((HWND)mp2);
 if(msg == WM_CTLCOLORBTN)
 {
 /* Groupbox color info is on the frame window it is attached to */
 if(GetWindowLongPtr((HWND)mp2, GWL_STYLE) & BS_GROUPBOX)
 SetTextColor((HDC)mp1, _DW_GetSysColor(COLOR_WINDOWTEXT));
 #endif
 /* Handle background */
 if(thiscinfo->back == DW_RGB_TRANSPARENT)
 {
-ColorInfo *parentcinfo = (ColorInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
+ColorInfo *parentcinfo = _dw_window_get_cinfo(hWnd);
 if(parentcinfo && parentcinfo->back != -1)
 thisback = parentcinfo->back;
 }
 if(thisback == DW_CLR_DEFAULT)
 case WM_CTLCOLORSCROLLBAR:
 case WM_CTLCOLORDLG:
 {
 if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_ENABLED)
 {
-ColorInfo *parentcinfo = (ColorInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
+ColorInfo *parentcinfo = _dw_window_get_cinfo(hWnd);
 int thisback = thiscinfo ? thiscinfo->back : -1;
 if(thisback == DW_RGB_TRANSPARENT && parentcinfo)
 thisback = parentcinfo->back;
 switch (msg)
 {
 case WM_HSCROLL:
 case WM_VSCROLL:
 {
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(hwnd);
 SCROLLINFO hsi, vsi, *si = &hsi;
 int bar = SB_HORZ;
 int which = LOWORD(mp1);
 /* Initialize the scroll info structs */
 HDC hdcPaint;
 PAINTSTRUCT ps;
 RECT rc;
 unsigned long cx, cy;
 TCHAR tempbuf[1025] = { 0 };
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(hwnd);
 HFONT hfont = _acquire_font(hwnd, cinfo ? cinfo->fontname : NULL);
 HFONT oldfont = (HFONT)SendMessage(hwnd, WM_GETFONT, 0, 0);
 dw_window_get_pos_size(hwnd, NULL, NULL, &cx, &cy);
 GetWindowText(hwnd, tempbuf, 1024);
 #ifdef AEROGLASS
 /* Window procedure to handle drawing themed text when in composited mode */
 LRESULT CALLBACK _staticwndproc(HWND hwnd, ULONG msg, WPARAM mp1, LPARAM mp2)
 {
-ColorInfo *parentcinfo, *cinfo = (ColorInfo *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+ColorInfo *parentcinfo, *cinfo = _dw_window_get_cinfo(hwnd);
 WNDPROC pOldProc;
 if (!cinfo)
 return DefWindowProc(hwnd, msg, mp1, mp2);
 /* Need the parent to do the check completely */
-parentcinfo = (ColorInfo *)GetWindowLongPtr(GetParent(hwnd), GWLP_USERDATA);
+parentcinfo = _dw_window_get_cinfo(GetParent(hwnd));
 /* If we don't require themed drawing */
 if(((cinfo->back != -1 && cinfo->back != DW_RGB_TRANSPARENT) || (parentcinfo && parentcinfo->back != -1))
 || !_dw_composition || !(GetWindowLongPtr(_toplevel_window(hwnd), GWL_EXSTYLE) & WS_EX_LAYERED))
 return _colorwndproc(hwnd, msg, mp1, mp2);
 * Abstract: Subclass procedure for buttons
 */
 LRESULT CALLBACK _BtProc(HWND hwnd, ULONG msg, WPARAM mp1, LPARAM mp2)
 {
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(hwnd);
 WNDPROC pOldProc;
 int retval = -1;
 if ( !cinfo )
 return DefWindowProc(hwnd, msg, mp1, mp2);
 *          fontname: Name and size of the font in the form "size.fontname"
 */
 int API dw_window_set_font(HWND handle, const char *fontname)
 {
 HFONT hfont, oldfont;
-ColorInfo *cinfo;
+ColorInfo *cinfo = _dw_window_get_cinfo(handle);
 TCHAR tmpbuf[100] = {0};
-cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
 GetClassName(handle, tmpbuf, 99);
 if ( _tcsnicmp( tmpbuf, FRAMECLASSNAME, _tcslen(FRAMECLASSNAME)+1) == 0 )
 {
 /* groupbox */
 oldfont = (HFONT)SendMessage(handle, WM_GETFONT, 0, 0);
 hfont = _acquire_font(handle, fontname);
 if(hfont && fontname)
 {
-if(cinfo)
+if(cinfo || (cinfo = _dw_window_new_cinfo(handle, TRUE)))
 {
-strcpy(cinfo->fontname, fontname);
+strncpy(cinfo->fontname, fontname, 127);
 if(!oldfont)
 oldfont = cinfo->hfont;
 cinfo->hfont = hfont;
-}
-else if((cinfo = calloc(1, sizeof(ColorInfo))))
-{
-cinfo->fore = cinfo->back = -1;
-strncpy(cinfo->fontname, fontname, 127);
-cinfo->pOldProc = SubclassWindow(handle, _colorwndproc);
-SetWindowLongPtr(handle, GWLP_USERDATA, (LONG_PTR)cinfo);
 }
 }
 /* If we changed the font... */
 if(hfont)
 {
 *          fore: Foreground color in RGB format.
 *          back: Background color in RGB format.
 */
 int API dw_window_set_color(HWND handle, ULONG fore, ULONG back)
 {
-ColorInfo *cinfo;
+ColorInfo *cinfo = _dw_window_get_cinfo(handle);
 Box *thisbox;
 TCHAR tmpbuf[100] = {0};
-cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
 GetClassName(handle, tmpbuf, 99);
 if(_tcsnicmp(tmpbuf, WC_LISTVIEW, _tcslen(WC_LISTVIEW))==0)
 {
 thisbox->cinfo.fore = fore;
 thisbox->cinfo.back = back;
 }
 }
-if(cinfo)
+if(cinfo || (cinfo = _dw_window_new_cinfo(handle, TRUE)))
 {
 cinfo->fore = fore;
 cinfo->back = back;
-}
-else if((cinfo = calloc(1, sizeof(ColorInfo))))
-{
-cinfo->fore = fore;
-cinfo->back = back;
-cinfo->pOldProc = SubclassWindow(handle, _colorwndproc);
-SetWindowLongPtr(handle, GWLP_USERDATA, (LONG_PTR)cinfo);
 }
 InvalidateRgn(handle, NULL, TRUE);
 return TRUE;
 }
 HWND hwndframe;
 Box *newbox = calloc(sizeof(Box), 1);
 ULONG flStyleEx = 0;
 #ifdef AEROGLASS
 MARGINS *margins = calloc(1, sizeof(MARGINS));
-RECT *border_thickness = calloc(1, sizeof(RECT));
 if (_dw_composition && (flStyle & DW_FCF_COMPOSITED))
 flStyleEx = WS_EX_LAYERED;
 #endif
 newbox->type = DW_VERT;
 newbox->vsize = newbox->hsize = SIZEEXPAND;
 newbox->cinfo.fore = newbox->cinfo.back = -1;
+newbox->cinfo.style = flStyle;
 if(!(flStyle & WS_CAPTION))
 flStyle |= WS_POPUPWINDOW;
 if(flStyle & DW_FCF_TASKLIST ||
 if(hwndOwner)
 SetParent(hwndframe, hwndOwner);
 #ifdef AEROGLASS
 /* Determine the borders of the default window frame */
-AdjustWindowRectEx(border_thickness, flStyle, FALSE, 0);
+AdjustWindowRectEx(&(newbox->cinfo.rect), flStyle, FALSE, 0);
-border_thickness->left *= -1;
+newbox->cinfo.rect.left *= -1;
-border_thickness->top *= -1;
+newbox->cinfo.rect.top *= -1;
 /* With the DW_FCF_COMPOSITED flag, expand it to the entire window */
 if (flStyle & DW_FCF_COMPOSITED)
 {
 MARGINS fullmar = { -1 };
 *margins = fullmar;
 }
 else
 {
 /* Otherwise use the calculated border sizes */
-margins->cyTopHeight = border_thickness->top;
+margins->cyTopHeight = newbox->cinfo.rect.top;
 }
 dw_window_set_data(hwndframe, "_dw_margins", margins);
-dw_window_set_data(hwndframe, "_dw_border", border_thickness);
 /* Attempt to enable Aero glass background on the entire window */
 if(_DwmExtendFrameIntoClientArea && _dw_composition &&
 ((flStyle & DW_FCF_COMPOSITED) || (_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_ENABLED)))
 {
 *       type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
 *       pad: Number of pixels to pad around the box.
 */
 HWND API dw_scrollbox_new(int type, int pad)
 {
-ColorInfo *cinfo = calloc(sizeof(ColorInfo), 1);
+HWND hwndframe, box = dw_box_new(type, pad);
-HWND hwndframe, box = dw_box_new(type, pad);
+HWND tmpbox = dw_box_new(DW_VERT, 0);
-HWND tmpbox = dw_box_new(DW_VERT, 0);
+ColorInfo *cinfo;
-dw_box_pack_start(tmpbox, box, 1, 1, TRUE, TRUE, 0);
+dw_box_pack_start(tmpbox, box, 1, 1, TRUE, TRUE, 0);
-cinfo->fore = cinfo->back = -1;
+hwndframe = CreateWindow(ScrollClassName,
-hwndframe = CreateWindow(ScrollClassName,
+NULL,
-NULL,
+WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN | WS_VSCROLL | WS_HSCROLL,
-WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN | WS_VSCROLL | WS_HSCROLL,
+0,0,0,0,
-0,0,0,0,
+DW_HWND_OBJECT,
-DW_HWND_OBJECT,
+NULL,
-NULL,
+DWInstance,
-DWInstance,
+NULL);
-NULL);
+if((cinfo = _dw_window_new_cinfo(hwndframe, FALSE)))
-cinfo->buddy = box;
+{
-cinfo->combo = tmpbox;
+cinfo->buddy = box;
-SetParent(tmpbox, hwndframe);
+cinfo->combo = tmpbox;
-SetWindowLongPtr(hwndframe, GWLP_USERDATA, (LONG_PTR)cinfo);
+}
-return hwndframe;
+SetParent(tmpbox, hwndframe);
+return hwndframe;
 }
 /*
 * Returns the position of the scrollbar in the scrollbox
 * Parameters:
 HWND API dw_notebook_new(ULONG id, int top)
 {
 ULONG flags = 0;
 HWND tmp;
 NotebookPage **array = calloc(256, sizeof(NotebookPage *));
-ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
+ColorInfo *cinfo;
 if(!top)
 flags = TCS_BOTTOM;
 tmp = CreateWindow(WC_TABCONTROL,
 0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)(uintptr_t)id,
 DWInstance,
 NULL);
-cinfo->fore = cinfo->back = -1;
+if((cinfo = _dw_window_new_cinfo(tmp, FALSE)))
 cinfo->pOldProc = SubclassWindow(tmp, _simplewndproc);
-SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
 dw_window_set_data(tmp, "_dw_array", (void *)array);
 dw_window_set_font(tmp, DefaultFont);
 return tmp;
 }
 DW_HWND_OBJECT,
 (HMENU)(uintptr_t)id,
 DWInstance,
 NULL);
 #ifdef AEROGLASS
-ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
+ColorInfo *cinfo = _dw_window_new_cinfo(tmp, FALSE);
-cinfo->back = cinfo->fore = -1;
+if(cinfo)
+cinfo->pOldProc = SubclassWindow(tmp, _staticwndproc);
-cinfo->pOldProc = SubclassWindow(tmp, _staticwndproc);
-SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
 #endif
 dw_window_set_font(tmp, DefaultFont);
 dw_window_set_color(tmp, DW_CLR_DEFAULT, DW_RGB_TRANSPARENT);
 return tmp;
 }
 0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)(uintptr_t)id,
 DWInstance,
 NULL);
-ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
+_dw_window_new_cinfo(tmp, TRUE);
-cinfo->back = cinfo->fore = -1;
-cinfo->pOldProc = SubclassWindow(tmp, _colorwndproc);
-SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
 dw_window_set_font(tmp, DefaultFont);
 return tmp;
 }
 /*
 0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)(uintptr_t)id,
 DWInstance,
 NULL);
-ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
+_dw_window_new_cinfo(tmp, TRUE);
-cinfo->back = cinfo->fore = -1;
-cinfo->pOldProc = SubclassWindow(tmp, _colorwndproc);
-SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
 dw_window_set_font(tmp, DefaultFont);
 return tmp;
 }
 BOOL CALLBACK _subclass_child(HWND handle, LPARAM lp)
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_button_new(const char *text, ULONG id)
 {
-ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
 HWND tmp = CreateWindow(BUTTONCLASSNAME,
 UTF8toWide(text),
 WS_CHILD | BS_PUSHBUTTON |
 WS_VISIBLE | WS_CLIPCHILDREN,
 0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)(uintptr_t)id,
 DWInstance,
 NULL);
-cinfo->fore = cinfo->back = -1;
+ColorInfo *cinfo;
-cinfo->pOldProc = SubclassWindow(tmp, _BtProc);
+if((cinfo = _dw_window_new_cinfo(tmp, FALSE)))
-SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
+cinfo->pOldProc = SubclassWindow(tmp, _BtProc);
 dw_window_set_font(tmp, DefaultFont);
 return tmp;
 }
 #ifdef TOOLBAR
 *       text: Bubble help text to be displayed.
 *       id: An ID of a bitmap in the resource file.
 */
 HWND API dw_bitmapbutton_new(const char *text, ULONG id)
 {
-HWND tmp;
-ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
 HICON icon = LoadImage(DWInstance, MAKEINTRESOURCE(id), IMAGE_ICON, 0, 0, 0);
 HBITMAP hbitmap = icon ? 0 : LoadBitmap(DWInstance, MAKEINTRESOURCE(id));
+ColorInfo *cinfo;
+HWND tmp;
 #ifdef TOOLBAR
 if((tmp = _create_toolbar(text, id, icon, hbitmap)))
 {
-cinfo->fore = cinfo->back = -1;
+if((cinfo = _dw_window_new_cinfo(tmp, FALSE)))
 cinfo->pOldProc = SubclassWindow(tmp, _simplewndproc);
-SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
 return tmp;
 }
 #endif
 tmp = CreateWindow(BUTTONCLASSNAME,
 DW_HWND_OBJECT,
 (HMENU)(uintptr_t)id,
 DWInstance,
 NULL);
-cinfo->fore = cinfo->back = -1;
+if((cinfo = _dw_window_new_cinfo(tmp, FALSE)))
 cinfo->pOldProc = SubclassWindow(tmp, _BtProc);
-SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
 _create_tooltip(tmp, text);
 if(icon)
-{
+SendMessage(tmp, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)icon);
-SendMessage(tmp, BM_SETIMAGE, (WPARAM) IMAGE_ICON, (LPARAM) icon);
-}
 else if(hbitmap)
-{
+SendMessage(tmp, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbitmap);
-SendMessage(tmp, BM_SETIMAGE, (WPARAM) IMAGE_BITMAP, (LPARAM) hbitmap);
-}
 return tmp;
 }
 /*
 * Create a new bitmap button window (widget) to be packed from a file.
 *                 (BMP or ICO on OS/2 or Windows, XPM on Unix)
 */
 HWND API dw_bitmapbutton_new_from_file(const char *text, unsigned long id, const char *filename)
 {
 HWND tmp;
-ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
+ColorInfo *cinfo;
 HBITMAP hbitmap = 0;
 HANDLE hicon = 0;
 int windowtype = 0;
-if (!cinfo)
-return 0;
 #ifdef GDIPLUS
 if((hicon = _dw_load_icon(filename)))
 windowtype = BS_ICON;
 else
 #endif
 #ifdef TOOLBAR
 if((tmp = _create_toolbar(text, id, hicon, hbitmap)))
 {
-cinfo->fore = cinfo->back = -1;
+if((cinfo = _dw_window_new_cinfo(tmp, FALSE)))
 cinfo->pOldProc = SubclassWindow(tmp, _simplewndproc);
-SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
 return tmp;
 }
 #endif
 tmp = CreateWindow( BUTTONCLASSNAME,
 NULL,
 DW_HWND_OBJECT,
 (HMENU)(uintptr_t)id,
 DWInstance,
 NULL);
-cinfo->fore = cinfo->back = -1;
+if((cinfo = _dw_window_new_cinfo(tmp, FALSE)))
 cinfo->pOldProc = SubclassWindow(tmp, _BtProc);
-SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
 _create_tooltip(tmp, text);
 if (hicon)
-{
+SendMessage(tmp, BM_SETIMAGE,(WPARAM)IMAGE_ICON,(LPARAM)hicon);
-SendMessage(tmp, BM_SETIMAGE,(WPARAM) IMAGE_ICON,(LPARAM) hicon);
-}
 else if (hbitmap)
-{
+SendMessage(tmp, BM_SETIMAGE,(WPARAM)IMAGE_BITMAP, (LPARAM)hbitmap);
-SendMessage(tmp, BM_SETIMAGE,(WPARAM) IMAGE_BITMAP, (LPARAM) hbitmap);
-}
 return tmp;
 }
 /*
 * Create a new bitmap button window (widget) to be packed from data.
 *       len: length of str
 */
 HWND API dw_bitmapbutton_new_from_data(const char *text, unsigned long id, const char *data, int len)
 {
 HWND tmp;
-ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
+ColorInfo *cinfo;
 HBITMAP hbitmap = 0;
 HANDLE hicon = 0;
 char *file;
 FILE *fp;
 int windowtype = BS_BITMAP;
-if (!cinfo)
-return 0;
 file = _tempnam( _dw_alternate_temp_dir, "dw" );
 if ( file != NULL )
 {
 fp = fopen( file, "wb" );
 }
 #ifdef TOOLBAR
 if((tmp = _create_toolbar(text, id, hicon, hbitmap)))
 {
-cinfo->fore = cinfo->back = -1;
+if((cinfo = _dw_window_new_cinfo(tmp, FALSE)))
 cinfo->pOldProc = SubclassWindow(tmp, _simplewndproc);
-SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
 return tmp;
 }
 #endif
 tmp = CreateWindow( BUTTONCLASSNAME,
 NULL,
 DW_HWND_OBJECT,
 (HMENU)(uintptr_t)id,
 DWInstance,
 NULL );
-cinfo->fore = cinfo->back = -1;
+if((cinfo = _dw_window_new_cinfo(tmp, FALSE)))
 cinfo->pOldProc = SubclassWindow( tmp, _BtProc );
-SetWindowLongPtr( tmp, GWLP_USERDATA, (LONG_PTR)cinfo );
 _create_tooltip(tmp, text);
-if ( hicon )
+if(hicon)
-{
+SendMessage(tmp, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hicon);
-SendMessage( tmp, BM_SETIMAGE, (WPARAM) IMAGE_ICON, (LPARAM) hicon);
+else if(hbitmap)
-}
+SendMessage(tmp, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbitmap);
-else if( hbitmap )
-{
-SendMessage( tmp, BM_SETIMAGE, (WPARAM) IMAGE_BITMAP, (LPARAM) hbitmap);
-}
 return tmp;
 }
 /*
 * Create a new spinbutton window (widget) to be packed.
 0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)(uintptr_t)id,
 DWInstance,
 NULL);
-ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
+ColorInfo *cinfo;
 SendMessage(tmp, UDM_SETRANGE32, (WPARAM)-65536,(LPARAM)65536);
 SendMessage(tmp, UDM_SETBUDDY, (WPARAM)buddy, 0);
-cinfo->back = cinfo->fore = -1;
-cinfo->buddy = tmp;
+if((cinfo = _dw_window_new_cinfo(buddy, TRUE)))
+cinfo->buddy = tmp;
-cinfo->pOldProc = SubclassWindow(buddy, _colorwndproc);
-SetWindowLongPtr(buddy, GWLP_USERDATA, (LONG_PTR)cinfo);
+if((cinfo = _dw_window_new_cinfo(tmp, FALSE)))
+{
-cinfo = calloc(1, sizeof(ColorInfo));
+cinfo->buddy = buddy;
-cinfo->buddy = buddy;
 /* The horrible spinbutton workaround isn't necessary
 * any more on Vista or 7... but still seems necessary
 * for XP, so only enable it if on XP or lower.
 */
 if(!IS_VISTAPLUS)
-{
+cinfo->pOldProc = SubclassWindow(tmp, _spinnerwndproc);
-cinfo->pOldProc = SubclassWindow(tmp, _spinnerwndproc);
+}
-}
-SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
 dw_window_set_font(buddy, DefaultFont);
 return tmp;
 }
 /*
 /* Disable visual styles by default */
 if(_SetWindowTheme)
 _SetWindowTheme(tmp, L"", L"");
-cinfo = calloc(1, sizeof(ColorInfo));
+if((cinfo = _dw_window_new_cinfo(tmp, FALSE)))
-cinfo->fore = cinfo->back = -1;
+cinfo->pOldProc = SubclassWindow(tmp, _BtProc);
-cinfo->pOldProc = SubclassWindow(tmp, _BtProc);
-SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
 dw_window_set_font(tmp, DefaultFont);
 dw_window_set_color(tmp, DW_CLR_DEFAULT, DW_RGB_TRANSPARENT);
 return tmp;
 }
 0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)(uintptr_t)id,
 DWInstance,
 NULL);
-ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
+_dw_window_new_cinfo(tmp, TRUE);
-cinfo->back = cinfo->fore = -1;
-cinfo->pOldProc = SubclassWindow(tmp, _colorwndproc);
-SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
 SendMessage(tmp, TBM_SETRANGE, (WPARAM)FALSE, MAKELPARAM(0, increments-1));
 return tmp;
 }
 /*
 0,0,0,0,
 DW_HWND_OBJECT,
 (HMENU)(uintptr_t)id,
 DWInstance,
 NULL);
-ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
+_dw_window_new_cinfo(tmp, TRUE);
-cinfo->back = cinfo->fore = -1;
-cinfo->pOldProc = SubclassWindow(tmp, _colorwndproc);
-SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
 dw_window_set_data(tmp, "_dw_scrollbar", (void *)1);
 return tmp;
 }
 /*
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_checkbox_new(const char *text, ULONG id)
 {
-ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
+ColorInfo *cinfo;
 HWND tmp = CreateWindow(BUTTONCLASSNAME,
 UTF8toWide(text),
 WS_CHILD | BS_AUTOCHECKBOX |
 BS_TEXT | WS_CLIPCHILDREN | WS_VISIBLE,
 0,0,0,0,
 /* Disable visual styles by default */
 if(_SetWindowTheme)
 _SetWindowTheme(tmp, L"", L"");
-cinfo->pOldProc = SubclassWindow(tmp, _BtProc);
+if((cinfo = _dw_window_new_cinfo(tmp, FALSE)))
-SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
+cinfo->pOldProc = SubclassWindow(tmp, _BtProc);
 dw_window_set_data(tmp, "_dw_checkbox", DW_INT_TO_POINTER(1));
 dw_window_set_font(tmp, DefaultFont);
 dw_window_set_color(tmp, DW_CLR_DEFAULT, DW_RGB_TRANSPARENT);
 return tmp;
 }
 GetClassName(handle, tmpbuf, 99);
 SetWindowText(handle, wtext);
 /* Combobox */
-if ( _tcsnicmp( tmpbuf, COMBOBOXCLASSNAME, _tcslen(COMBOBOXCLASSNAME)+1) == 0 )
+if(_tcsnicmp( tmpbuf, COMBOBOXCLASSNAME, _tcslen(COMBOBOXCLASSNAME)+1) == 0)
 SendMessage(handle, CB_SETEDITSEL, 0, MAKELPARAM(-1, 0));
-else if ( _tcsnicmp( tmpbuf, UPDOWN_CLASS, _tcslen(UPDOWN_CLASS)+1) == 0 )
+else if(_tcsnicmp( tmpbuf, UPDOWN_CLASS, _tcslen(UPDOWN_CLASS)+1) == 0)
 {
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(handle);
-if( cinfo && cinfo->buddy )
+if(cinfo && cinfo->buddy)
-SetWindowText( cinfo->buddy, wtext );
+SetWindowText(cinfo->buddy, wtext);
 }
-else if ( _tcsnicmp( tmpbuf, FRAMECLASSNAME, _tcslen(FRAMECLASSNAME)+1) == 0 )
+else if(_tcsnicmp( tmpbuf, FRAMECLASSNAME, _tcslen(FRAMECLASSNAME)+1) == 0)
 {
 /* groupbox */
-thisbox = (Box *)GetWindowLongPtr( handle, GWLP_USERDATA );
+thisbox = (Box *)GetWindowLongPtr(handle, GWLP_USERDATA);
-if ( thisbox && thisbox->grouphwnd != (HWND)NULL )
+if(thisbox && thisbox->grouphwnd != (HWND)NULL)
-SetWindowText( thisbox->grouphwnd, wtext );
+SetWindowText(thisbox->grouphwnd, wtext);
 }
 /* If we changed the text... */
 {
 Item *item = _box_item(handle);
 *       handle: Handle to the window (widget).
 *       bubbletext: The text in the floating bubble tooltip.
 */
 void API dw_window_set_tooltip(HWND handle, const char *bubbletext)
 {
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(handle);
 if(cinfo && cinfo->buddy)
 _create_tooltip(cinfo->buddy, bubbletext);
 _create_tooltip(handle, bubbletext);
 }
 TCHAR *tempbuf, tmpbuf[100] = { 0 };
 int len;
 GetClassName(handle, tmpbuf, 99);
-if ( _tcsnicmp( tmpbuf, UPDOWN_CLASS, _tcslen(UPDOWN_CLASS)+1) == 0 )
+if(_tcsnicmp( tmpbuf, UPDOWN_CLASS, _tcslen(UPDOWN_CLASS)+1) == 0)
 {
 ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
-if( cinfo && cinfo->buddy )
+if(cinfo && cinfo->buddy)
 handle = cinfo->buddy;
 else
 return NULL;
 }
 GetClassName(box, tmpbuf, 99);
 /* If we are in a scrolled box... extract the interal box */
 if(_tcsnicmp(tmpbuf, ScrollClassName, _tcslen(ScrollClassName)+1)==0)
 {
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(box, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(box);
 if(cinfo)
 {
 box = cinfo->buddy;
 thisbox = (Box *)GetWindowLongPtr(box, GWLP_USERDATA);
 }
 AllowDarkModeForWindow(item, _DW_DARK_MODE_ENABLED);
 #endif
 SetParent(item, box);
 if(_tcsnicmp(tmpbuf, UPDOWN_CLASS, _tcslen(UPDOWN_CLASS)+1)==0)
 {
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(item, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(item);
 if(cinfo)
 {
 SetParent(cinfo->buddy, box);
 ShowWindow(cinfo->buddy, SW_SHOW);
 }
 GetClassName(handle, tmpbuf, 99);
 currentstyle = GetWindowLong(handle, GWL_STYLE);
-cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
+cinfo = _dw_window_get_cinfo(handle);
 #ifdef TOOLBAR
 /* Bitmap Buttons */
 if(_tcsnicmp(tmpbuf, TOOLBARCLASSNAME, _tcslen(TOOLBARCLASSNAME)+1) == 0)
 {
 /* Need to filter out bits that shouldn't be set */
 tmp = currentstyle | thismask;
 tmp ^= thismask;
 tmp |= thisstyle & thismask;
-if(mask & DW_DT_VCENTER)
+if(mask & DW_DT_VCENTER && style & DW_DT_VCENTER && !cinfo)
-{
+cinfo = _dw_window_new_cinfo(handle, TRUE);
-if(style & DW_DT_VCENTER)
-{
-if(cinfo)
-cinfo->vcenter = 1;
-else
-{
-cinfo = calloc(1, sizeof(ColorInfo));
-cinfo->fore = cinfo->back = -1;
-cinfo->vcenter = 1;
-cinfo->pOldProc = SubclassWindow(handle, _colorwndproc);
-SetWindowLongPtr(handle, GWLP_USERDATA, (LONG_PTR)cinfo);
-}
-}
-else if(cinfo)
-cinfo->vcenter = 0;
-}
 /* Alignment style is 0 for word wrap */
 if((style & DW_DT_WORDBREAK) && (mask & DW_DT_WORDBREAK))
 tmp &= ~(0xFL);
 else if(type == SS_LEFTNOWORDWRAP)
 tmp = (tmp & ~(0xFL)) | SS_LEFTNOWORDWRAP;
 else if(type == SS_CENTER)
 tmp = (tmp & ~(0xFL)) | SS_CENTER;
 else if(type == SS_RIGHT)
 tmp = (tmp & ~(0xFL)) | SS_RIGHT;
+}
+/* If we have cinfo store the style there for later use */
+if(cinfo)
+{
+cinfo->style = cinfo->style | mask;
+cinfo->style ^= mask;
+cinfo->style |= style & mask;
 }
 SetWindowLong(handle, GWL_STYLE, tmp);
 }
 *          position: Current value of the spinbutton.
 */
 void API dw_spinbutton_set_pos(HWND handle, long position)
 {
 TCHAR tmpbuf[101] = {0};
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(handle);
 _sntprintf(tmpbuf, 100, TEXT("%ld"), position);
 if(cinfo && cinfo->buddy)
 SetWindowText(cinfo->buddy, tmpbuf);
 hdc = pixmap->hdc;
 else
 return;
 if(handle)
-cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
+cinfo = _dw_window_get_cinfo(handle);
 else if(pixmap->font)
 hFont = pixmap->font;
 else if(pixmap->handle)
-cinfo = (ColorInfo *)GetWindowLongPtr(pixmap->handle, GWLP_USERDATA);
+cinfo = _dw_window_get_cinfo(pixmap->handle);
 if(cinfo)
 {
 hFont = _acquire_font(handle, cinfo->fontname);
 mustdelete = 1;
 {
 hFont = pixmap->font;
 }
 else
 {
-ColorInfo *cinfo;
+ColorInfo *cinfo = NULL;
 if(handle)
-cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
+cinfo = _dw_window_get_cinfo(handle);
-else
+else if(pixmap && pixmap->handle)
-cinfo = (ColorInfo *)GetWindowLongPtr(pixmap->handle, GWLP_USERDATA);
+cinfo = _dw_window_get_cinfo(pixmap->handle);
 if(cinfo)
 {
 hFont = _acquire_font(handle, cinfo->fontname);
 mustdelete = 1;
 *         window: Window (widget) to look for the ENTER press.
 *         next: Window (widget) to move to next (or click)
 */
 void API dw_window_click_default(HWND window, HWND next)
 {
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(window, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(window);
-if (cinfo)
+if(cinfo)
-{
 cinfo->clickdefault = next;
-}
 }
 /*
 * Gets the contents of the default clipboard as text.
 * Parameters:
 *       dataname: A string pointer identifying which signal to be hooked.
 *       data: User data to be passed to the handler function.
 */
 void API dw_window_set_data(HWND window, const char *dataname, void *data)
 {
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(window, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(window);
 if(!cinfo)
 {
 if(!dataname)
 return;
-cinfo = calloc(1, sizeof(ColorInfo));
+cinfo = _dw_window_new_cinfo(window, FALSE);
-cinfo->fore = cinfo->back = -1;
-SetWindowLongPtr(window, GWLP_USERDATA, (LONG_PTR)cinfo);
 }
 if(cinfo)
 {
 if(data)
 *       dataname: A string pointer identifying which signal to be hooked.
 *       data: User data to be passed to the handler function.
 */
 void * API dw_window_get_data(HWND window, const char *dataname)
 {
-ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(window, GWLP_USERDATA);
+ColorInfo *cinfo = _dw_window_get_cinfo(window);
 if(cinfo && cinfo->root && dataname)
 {
 UserData *ud = _find_userdata(&(cinfo->root), dataname);
 if(ud)

Mercurial > dwindows

comparison win/dw.c @ 2135:d9720d48d61e