Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/user32/winicon.cpp

    r21356 r21916  
    4747#include <string.h>
    4848#include <winicon.h>
    49 #include <win\cursoricon.h>
     49#include <win/cursoricon.h>
    5050#include <objhandle.h>
    5151#include "dib.h"
    5252#include <heapstring.h>
    53 #include <win\virtual.h>
     53#include <win/virtual.h>
    5454#include "initterm.h"
    5555#include "oslibres.h"
    … …  
    200200
    201201        /* Transfer the bitmap bits to the CURSORICONINFO structure */
    202         if(bmpAnd.bmBitsPixel > 1) 
     202        if(bmpAnd.bmBitsPixel > 1)
    203203        {//Our code expects b&w masks, so convert it first
    204204         //We could also use GetDIBits to do the conversion for us, but it returns
    … …  
    216216
    217217            //blit to the destination HDC & convert to 1bpp
    218             BitBlt(hdcDest, 0, 0, bmpAnd.bmWidth, bmpAnd.bmHeight, 
     218            BitBlt(hdcDest, 0, 0, bmpAnd.bmWidth, bmpAnd.bmHeight,
    219219                   hdcSrc, 0, 0, SRCCOPY);
    220220
    … …  
    442442    if(hActiveCursorPM && hActiveCursorPM != OSLibWinQueryPointer()) {
    443443       dprintf(("Another app changed mouse cursor"));
    444        hActiveCursorPM = hActiveCursor = 0; 
     444       hActiveCursorPM = hActiveCursor = 0;
    445445    }
    446446    return hActiveCursor;
    … …  
    593593    bmpXor.bmBitsPixel  = info->bBitsPerPixel;
    594594    bmpXor.bmBits       = NULL;
    595     ((CURSORICONINFO *)ptr)->hColorBmp = 
     595    ((CURSORICONINFO *)ptr)->hColorBmp =
    596596          OSLibWinCreatePointer(info, (char *)lpANDbits, (LPBITMAP_W)&bmpAnd, (char *)lpXORbits, (LPBITMAP_W)&bmpXor, fIcon == FALSE);
    597597#endif
    … …  
    10851085//SvL: Must use CreateBitmap here as CreateDIBitmap converts data to 8bpp (GetObjectA info -> 8 bpp)
    10861086#if 1
    1087                     int linewidth; 
     1087                    int linewidth;
    10881088                    int orglinewidth;
    10891089
Note: See TracChangeset for help on using the changeset viewer.