Mercurial > dwindows

diff win/dw.c @ 1857:417176df4755

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add TOOLBAR define with MinGW by default... fix warnings...generated by gcc in both the newly enabled browser and toolbar sections.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 28 Feb 2013 13:30:58 +0000
parents 285bf986e4fd
children 952a41463240
line wrap: on
line diff
--- a/win/dw.c	Thu Feb 28 13:02:25 2013 +0000
+++ b/win/dw.c	Thu Feb 28 13:30:58 2013 +0000
@@ -6126,7 +6126,7 @@
    HIMAGELIST imlist, dimlist;
    BITMAP bmi = { 0 };
    TBBUTTON tbButtons[] = {    
-   { MAKELONG(0, 0), id, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0L, 0}
+   { MAKELONG(0, 0), id, TBSTATE_ENABLED, TBSTYLE_BUTTON}
    };
    
    /* Get the bitmap from either the icon or bitmap itself */
@@ -6192,7 +6192,7 @@
    HICON icon = LoadImage(DWInstance, MAKEINTRESOURCE(id), IMAGE_ICON, 0, 0, 0);
    HBITMAP hbitmap = icon ? 0 : LoadBitmap(DWInstance, MAKEINTRESOURCE(id));
 #ifdef TOOLBAR
-   if(tmp = _create_toolbar(text, id, icon, hbitmap))
+   if((tmp = _create_toolbar(text, id, icon, hbitmap)))
    {
       cinfo->fore = cinfo->back = -1;
       cinfo->pOldProc = SubclassWindow(tmp, _simplewndproc);
@@ -6263,7 +6263,7 @@
 #endif
 
 #ifdef TOOLBAR
-   if(tmp = _create_toolbar(text, id, hicon, hbitmap))
+   if((tmp = _create_toolbar(text, id, hicon, hbitmap)))
    {
       cinfo->fore = cinfo->back = -1;
       cinfo->pOldProc = SubclassWindow(tmp, _simplewndproc);
@@ -6354,7 +6354,7 @@
    }
 
 #ifdef TOOLBAR
-   if(tmp = _create_toolbar(text, id, hicon, hbitmap))
+   if((tmp = _create_toolbar(text, id, hicon, hbitmap)))
    {
       cinfo->fore = cinfo->back = -1;
       cinfo->pOldProc = SubclassWindow(tmp, _simplewndproc);