Mercurial > dwindows

comparison os2/dw.c @ 1645:69386c5a8e3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed render widgets being incorrectly identified as boxes on OS/2 in the layout engine due to them internally being the same class.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 06 Apr 2012 23:34:00 +0000
parents e21c70d75cb1
children 8493f8888893
comparison
equal deleted inserted replaced
1644:2b55465887e1 1645:69386c5a8e3e
7115 if(vsize && !height) 7115 if(vsize && !height)
7116 height = 1; 7116 height = 1;
7117 if(hsize && !width) 7117 if(hsize && !width)
7118 width = 1; 7118 width = 1;
7119 7119
7120 if(strncmp(tmpbuf, "#1", 3)==0) 7120 if(strncmp(tmpbuf, "#1", 3)==0 && !dw_window_get_data(item, "_dw_render"))
7121 tmpitem[index].type = TYPEBOX; 7121 tmpitem[index].type = TYPEBOX;
7122 else 7122 else
7123 { 7123 {
7124 if ( width == 0 && hsize == FALSE ) 7124 if ( width == 0 && hsize == FALSE )
7125 dw_messagebox(funcname, DW_MB_OK|DW_MB_ERROR, "Width and expand Horizonal both unset for box: %x item: %x",box,item); 7125 dw_messagebox(funcname, DW_MB_OK|DW_MB_ERROR, "Width and expand Horizonal both unset for box: %x item: %x",box,item);
9427 HWND_TOP, 9427 HWND_TOP,
9428 id, 9428 id,
9429 NULL, 9429 NULL,
9430 NULL); 9430 NULL);
9431 WinSubclassWindow(hwndframe, _RendProc); 9431 WinSubclassWindow(hwndframe, _RendProc);
9432 dw_window_set_data(hwndframe, "_dw_render", DW_INT_TO_POINTER(1));
9432 return hwndframe; 9433 return hwndframe;
9433 } 9434 }
9434 9435
9435 /* Sets the current foreground drawing color. 9436 /* Sets the current foreground drawing color.
9436 * Parameters: 9437 * Parameters: