changeset 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 7a236fdcf4ba
children 90d242bacd87
files win/dw.c
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/win/dw.c	Fri Mar 18 04:48:22 2011 +0000
+++ b/win/dw.c	Fri Mar 18 05:53:41 2011 +0000
@@ -5057,7 +5057,7 @@
                      (HMENU)id,
                      DWInstance,
                      NULL);
-
+   bubble->cinfo.fore = bubble->cinfo.back = -1;
    bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
 
    SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
@@ -5089,6 +5089,7 @@
                   DWInstance,
                   NULL);
 
+   bubble->cinfo.fore = bubble->cinfo.back = -1;
    bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
    
    SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
@@ -5137,6 +5138,7 @@
                        DWInstance,
                        NULL);
 
+   bubble->cinfo.fore = bubble->cinfo.back = -1;
    bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
 
    SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
@@ -5213,6 +5215,7 @@
                        DWInstance,
                        NULL );
 
+   bubble->cinfo.fore = bubble->cinfo.back = -1;
    bubble->pOldProc = (WNDPROC)SubclassWindow( tmp, _BtProc );
 
    SetWindowLongPtr( tmp, GWLP_USERDATA, (LONG_PTR)bubble );
@@ -5295,6 +5298,7 @@
                      DWInstance,
                      NULL);
    BubbleButton *bubble = calloc(1, sizeof(BubbleButton));
+   bubble->cinfo.fore = bubble->cinfo.back = -1;
    bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
    bubble->cinfo.fore = -1;
    bubble->cinfo.back = -1;
@@ -5396,9 +5400,8 @@
                      DWInstance,
                      NULL);
    bubble->checkbox = 1;
+   bubble->cinfo.fore = bubble->cinfo.back = -1;
    bubble->pOldProc = (WNDPROC)SubclassWindow(tmp, _BtProc);
-   bubble->cinfo.fore = -1;
-   bubble->cinfo.back = -1;
    SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
    dw_window_set_font(tmp, DefaultFont);
    return tmp;