1. wxIcon/wxCursor change, wxGDIImage class added
2. wxCriticalSection doesn't alloc memory any more 3. many minor fixes in bitmap/icon code git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,22 +1,41 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: dib.h
|
||||
// Name: wx/msw/dib.h
|
||||
// Purpose: Routines for loading and saving DIBs
|
||||
// Author: Various
|
||||
// Modified by:
|
||||
// Created: 01/02/97
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_DIB_H_
|
||||
#define _WX_DIB_H_
|
||||
|
||||
class WXDLLEXPORT wxBitmap;
|
||||
class WXDLLEXPORT wxColourMap;
|
||||
class WXDLLEXPORT wxPalette;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Functions for working with DIBs
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// VZ: we have 3 different sets of functions: from bitmap.cpp (wxCreateDIB and
|
||||
// wxFreeDIB), from dib.cpp and from dataobj.cpp - surely there is some
|
||||
// redundancy between them? (FIXME)
|
||||
|
||||
// defined in bitmap.cpp
|
||||
extern bool wxCreateDIB(long xSize, long ySize, long bitsPerPixel,
|
||||
HPALETTE hPal, LPBITMAPINFO* lpDIBHeader);
|
||||
extern void wxFreeDIB(LPBITMAPINFO lpDIBHeader);
|
||||
|
||||
// defined in ole/dataobj.cpp
|
||||
extern size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap);
|
||||
extern wxBitmap wxConvertDIBToBitmap(const LPBITMAPINFO pbi);
|
||||
|
||||
// the rest is defined in dib.cpp
|
||||
|
||||
// Save (device dependent) wxBitmap as a DIB
|
||||
bool wxSaveBitmap(wxChar *filename, wxBitmap *bitmap, wxColourMap *colourmap = NULL);
|
||||
bool wxSaveBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette *colourmap = NULL);
|
||||
|
||||
// Load device independent bitmap into device dependent bitmap
|
||||
wxBitmap *wxLoadBitmap(wxChar *filename, wxColourMap **colourmap = NULL);
|
||||
@@ -30,5 +49,5 @@ HANDLE wxReadDIB2(LPTSTR lpFileName);
|
||||
LPSTR wxFindDIBBits (LPSTR lpbi);
|
||||
HPALETTE wxMakeDIBPalette(LPBITMAPINFOHEADER lpInfo);
|
||||
|
||||
#endif
|
||||
#endif // _WX_DIB_H_
|
||||
|
||||
|
Reference in New Issue
Block a user