mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 12:19:49 +00:00
comctl32: Merge imagelist definitions into the C file.
This commit is contained in:
parent
d0b1b4c7b0
commit
e6cf9fbcc2
2 changed files with 50 additions and 82 deletions
|
@ -52,15 +52,63 @@
|
|||
#include "commctrl.h"
|
||||
#include "comctl32.h"
|
||||
#include "commoncontrols.h"
|
||||
#include "imagelist.h"
|
||||
#include "wine/debug.h"
|
||||
#include "wine/exception.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(imagelist);
|
||||
|
||||
|
||||
#define MAX_OVERLAYIMAGE 15
|
||||
|
||||
struct _IMAGELIST
|
||||
{
|
||||
const struct IImageListVtbl *lpVtbl; /* 00: IImageList vtable */
|
||||
|
||||
INT cCurImage; /* 04: ImageCount */
|
||||
INT cMaxImage; /* 08: maximages */
|
||||
INT cGrow; /* 0C: cGrow */
|
||||
INT cx; /* 10: cx */
|
||||
INT cy; /* 14: cy */
|
||||
DWORD x4;
|
||||
UINT flags; /* 1C: flags */
|
||||
COLORREF clrFg; /* 20: foreground color */
|
||||
COLORREF clrBk; /* 24: background color */
|
||||
|
||||
|
||||
HBITMAP hbmImage; /* 28: images Bitmap */
|
||||
HBITMAP hbmMask; /* 2C: masks Bitmap */
|
||||
HDC hdcImage; /* 30: images MemDC */
|
||||
HDC hdcMask; /* 34: masks MemDC */
|
||||
INT nOvlIdx[MAX_OVERLAYIMAGE]; /* 38: overlay images index */
|
||||
|
||||
/* not yet found out */
|
||||
HBRUSH hbrBlend25;
|
||||
HBRUSH hbrBlend50;
|
||||
INT cInitial;
|
||||
UINT uBitsPixel;
|
||||
char *has_alpha;
|
||||
|
||||
LONG ref; /* reference count */
|
||||
};
|
||||
|
||||
#define IMAGELIST_MAGIC 0x53414D58
|
||||
|
||||
/* Header used by ImageList_Read() and ImageList_Write() */
|
||||
#include "pshpack2.h"
|
||||
typedef struct _ILHEAD
|
||||
{
|
||||
USHORT usMagic;
|
||||
USHORT usVersion;
|
||||
WORD cCurImage;
|
||||
WORD cMaxImage;
|
||||
WORD cGrow;
|
||||
WORD cx;
|
||||
WORD cy;
|
||||
COLORREF bkcolor;
|
||||
WORD flags;
|
||||
SHORT ovls[4];
|
||||
} ILHEAD;
|
||||
#include "poppack.h"
|
||||
|
||||
/* internal image list data used for Drag & Drop operations */
|
||||
typedef struct
|
||||
{
|
||||
|
|
|
@ -1,80 +0,0 @@
|
|||
/*
|
||||
* ImageList definitions
|
||||
*
|
||||
* Copyright 1998 Eric Kohl
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#ifndef __WINE_IMAGELIST_H
|
||||
#define __WINE_IMAGELIST_H
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
|
||||
struct _IMAGELIST
|
||||
{
|
||||
const struct IImageListVtbl *lpVtbl; /* 00: IImageList vtable */
|
||||
|
||||
INT cCurImage; /* 04: ImageCount */
|
||||
INT cMaxImage; /* 08: maximages */
|
||||
INT cGrow; /* 0C: cGrow */
|
||||
INT cx; /* 10: cx */
|
||||
INT cy; /* 14: cy */
|
||||
DWORD x4;
|
||||
UINT flags; /* 1C: flags */
|
||||
COLORREF clrFg; /* 20: foreground color */
|
||||
COLORREF clrBk; /* 24: background color */
|
||||
|
||||
|
||||
HBITMAP hbmImage; /* 28: images Bitmap */
|
||||
HBITMAP hbmMask; /* 2C: masks Bitmap */
|
||||
HDC hdcImage; /* 30: images MemDC */
|
||||
HDC hdcMask; /* 34: masks MemDC */
|
||||
INT nOvlIdx[15]; /* 38: overlay images index */
|
||||
|
||||
/* not yet found out */
|
||||
HBRUSH hbrBlend25;
|
||||
HBRUSH hbrBlend50;
|
||||
INT cInitial;
|
||||
UINT uBitsPixel;
|
||||
char *has_alpha;
|
||||
|
||||
LONG ref; /* reference count */
|
||||
};
|
||||
|
||||
#define IMAGELIST_MAGIC 0x53414D58
|
||||
|
||||
/* Header used by ImageList_Read() and ImageList_Write() */
|
||||
#include "pshpack2.h"
|
||||
typedef struct _ILHEAD
|
||||
{
|
||||
USHORT usMagic;
|
||||
USHORT usVersion;
|
||||
WORD cCurImage;
|
||||
WORD cMaxImage;
|
||||
WORD cGrow;
|
||||
WORD cx;
|
||||
WORD cy;
|
||||
COLORREF bkcolor;
|
||||
WORD flags;
|
||||
SHORT ovls[4];
|
||||
} ILHEAD;
|
||||
#include "poppack.h"
|
||||
|
||||
#endif /* __WINE_IMAGELIST_H */
|
Loading…
Reference in a new issue