comparison win/dw.c @ 769:3afbdb036817

Fixed problem with thick black border being drawn around buttons. The ColorInfo struct was not being initialized for any buttons except checkboxes.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 18 Mar 2011 05:53:41 +0000
parents acbc44e6e11a
children 90d242bacd87
comparison
equal deleted inserted replaced
768:7a236fdcf4ba 769:3afbdb036817
5055 0,0,2000,1000, 5055 0,0,2000,1000,
5056 DW_HWND_OBJECT, 5056 DW_HWND_OBJECT,
5057 (HMENU)id, 5057 (HMENU)id,
5058 DWInstance, 5058 DWInstance,
5059 NULL); 5059 NULL);
5060 5060 bubble->cinfo.fore = bubble->cinfo.back = -1;
5061 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc); 5061 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
5062 5062
5063 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble); 5063 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
5064 dw_window_set_font(tmp, DefaultFont); 5064 dw_window_set_font(tmp, DefaultFont);
5065 return tmp; 5065 return tmp;
5087 DW_HWND_OBJECT, 5087 DW_HWND_OBJECT,
5088 (HMENU)id, 5088 (HMENU)id,
5089 DWInstance, 5089 DWInstance,
5090 NULL); 5090 NULL);
5091 5091
5092 bubble->cinfo.fore = bubble->cinfo.back = -1;
5092 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc); 5093 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
5093 5094
5094 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble); 5095 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
5095 5096
5096 _create_tooltip(tmp, text); 5097 _create_tooltip(tmp, text);
5135 DW_HWND_OBJECT, 5136 DW_HWND_OBJECT,
5136 (HMENU)id, 5137 (HMENU)id,
5137 DWInstance, 5138 DWInstance,
5138 NULL); 5139 NULL);
5139 5140
5141 bubble->cinfo.fore = bubble->cinfo.back = -1;
5140 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc); 5142 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
5141 5143
5142 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble); 5144 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
5143 5145
5144 _create_tooltip(tmp, text); 5146 _create_tooltip(tmp, text);
5211 DW_HWND_OBJECT, 5213 DW_HWND_OBJECT,
5212 (HMENU)id, 5214 (HMENU)id,
5213 DWInstance, 5215 DWInstance,
5214 NULL ); 5216 NULL );
5215 5217
5218 bubble->cinfo.fore = bubble->cinfo.back = -1;
5216 bubble->pOldProc = (WNDPROC)SubclassWindow( tmp, _BtProc ); 5219 bubble->pOldProc = (WNDPROC)SubclassWindow( tmp, _BtProc );
5217 5220
5218 SetWindowLongPtr( tmp, GWLP_USERDATA, (LONG_PTR)bubble ); 5221 SetWindowLongPtr( tmp, GWLP_USERDATA, (LONG_PTR)bubble );
5219 5222
5220 _create_tooltip(tmp, text); 5223 _create_tooltip(tmp, text);
5293 DW_HWND_OBJECT, 5296 DW_HWND_OBJECT,
5294 (HMENU)id, 5297 (HMENU)id,
5295 DWInstance, 5298 DWInstance,
5296 NULL); 5299 NULL);
5297 BubbleButton *bubble = calloc(1, sizeof(BubbleButton)); 5300 BubbleButton *bubble = calloc(1, sizeof(BubbleButton));
5301 bubble->cinfo.fore = bubble->cinfo.back = -1;
5298 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc); 5302 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
5299 bubble->cinfo.fore = -1; 5303 bubble->cinfo.fore = -1;
5300 bubble->cinfo.back = -1; 5304 bubble->cinfo.back = -1;
5301 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble); 5305 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
5302 dw_window_set_font(tmp, DefaultFont); 5306 dw_window_set_font(tmp, DefaultFont);
5394 DW_HWND_OBJECT, 5398 DW_HWND_OBJECT,
5395 (HMENU)id, 5399 (HMENU)id,
5396 DWInstance, 5400 DWInstance,
5397 NULL); 5401 NULL);
5398 bubble->checkbox = 1; 5402 bubble->checkbox = 1;
5403 bubble->cinfo.fore = bubble->cinfo.back = -1;
5399 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc); 5404 bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
5400 bubble->cinfo.fore = -1;
5401 bubble->cinfo.back = -1;
5402 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble); 5405 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
5403 dw_window_set_font(tmp, DefaultFont); 5406 dw_window_set_font(tmp, DefaultFont);
5404 return tmp; 5407 return tmp;
5405 } 5408 }
5406 5409