fixed build

[wxWidgets.git] / src / msw / dib.cpp

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index b1dc71542ffc7ca428840163a7845ffe3e8b26fd..9aa457995aa5eed14c0754a7a2e28ad6dc2c2ef0 100644 (file)
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -1,36 +1,44 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dib.cpp
-// Purpose:     Routines for dealing with Device Independent Bitmaps.
-// Author:
-// Modified by: Jason Quijano 06/06/2001
-// Created:     01/02/97
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/msw/dib.cpp
+// Purpose:     implements wxDIB class
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     03.03.03 (replaces the old file with the same name)

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart
-/////////////////////////////////////////////////////////////////////////////
-// FUNCTIONS :
-//      wxReadDIB()         - Reads a DIB
-//      WriteDIB()          - Writes a global handle in CF_DIB format to a file.
-//      wxPaletteSize()     - Calculates the palette size in bytes of given DIB                                                                               *
-//      DibNumColors()      - Determines the number of colors in DIB
-//      DibFromBitmap()     - Creates a DIB repr. the DDB passed in.
-//      lread()             - Private routine to read more than 64k
-//      lwrite()            - Private routine to write more than 64k
-/////////////////////////////////////////////////////////////////////////////
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// License:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+/*
+    TODO: support for palettes is very incomplete, several functions simply
+          ignore them (we should select and realize the palette, if any, before
+          caling GetDIBits() in the DC we use with it.
+ */
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#if defined(__BORLANDC__)
-#pragma hdrstop
+#ifdef __BORLANDC__
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/string.h"
+    #include "wx/log.h"
+#endif //WX_PRECOMP
+

 #include "wx/bitmap.h"
 #include "wx/bitmap.h"

-#include "wx/log.h"

 #include "wx/intl.h"
 #include "wx/intl.h"

-#endif
+#include "wx/file.h"

 
 

-#include <windows.h>

 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 


@@ -38,846 +46,563 @@
 #include <memory.h>
 #endif
 
 #include <memory.h>
 #endif
 

-#include "wx/msw/dib.h"
-#include "wx/filesys.h"
-

 #ifdef __GNUWIN32_OLD__
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 
 #ifdef __GNUWIN32_OLD__
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 

-#ifndef SEEK_CUR
-// flags for _lseek
-#define        SEEK_CUR 1
-#define        SEEK_END 2
-#define        SEEK_SET 0
-#endif
-
-// Number of bytes to be read during each read operation.
-#define MAXREAD  32768
-
-// Header signatutes for various resources
-#define BFT_ICON 0x4349                 // 'IC'
-#define BFT_BITMAP 0x4d42               // 'BM'
-#define BFT_CURSOR 0x5450               // 'PT('
-
-// macro to determine if resource is a DIB
-#define ISDIB(bft)      ((bft) == BFT_BITMAP)
-
-// Macro to align given value to the closest DWORD (unsigned long )
-#define ALIGNULONG(i)   ((i+3)/4*4)
-
-//  Macro to determine to round off the given value to the closest byte
-#define WIDTHBYTES(i)   ((i+31)/32*4)
-
-#define PALVERSION 0x300
-#define MAXPALETTE 256                  // max. # supported palette entries
-
-static DWORD PASCAL lwrite(int fh, VOID FAR *pv, DWORD ul);
-
-static BOOL WriteDIB (LPTSTR szFile,HANDLE hdib);
-WORD wxPaletteSize (VOID FAR * pv);     // This is non-static as some apps use it externally
-static WORD DibNumColors (VOID FAR * pv);
-// HANDLE DibFromBitmap (HBITMAP hbm, DWORD biStyle, WORD biBits, HPALETTE hpal);
-static BOOL PASCAL MakeBitmapAndPalette(HDC,HANDLE,HPALETTE *,HBITMAP *);
+#include "wx/image.h"
+#include "wx/msw/dib.h"

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// FUNCTION : WriteDIB(LPSTR szFile,HANDLE hdib)
-// PURPOSE  : Write a global handle in CF_DIB format to a file.
-// RETURNS  : TRUE  - if successful. FALSE - otherwise
+// private functions

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-static BOOL WriteDIB(
-    LPTSTR szFile,
-    HANDLE hdib )
-{
-    BITMAPFILEHEADER hdr;
-    LPBITMAPINFOHEADER lpbi;
-    int fh;
-    OFSTRUCT of;
-
-    if (!hdib)
-        return FALSE;
-    fh = OpenFile(wxConvertWX2MB(szFile), &of, OF_CREATE | OF_READWRITE);
-    if (fh == -1)
-        return FALSE;
-
-#ifdef __WINDOWS_386__
-    lpbi = (LPBITMAPINFOHEADER) MK_FP32(GlobalLock(hdib));
-#else
-    lpbi = (LPBITMAPINFOHEADER) GlobalLock(hdib);
-#endif
-    // Fill in the fields of the file header
-    hdr.bfType = BFT_BITMAP;
-    hdr.bfSize = GlobalSize(hdib) + sizeof(BITMAPFILEHEADER);
-    hdr.bfReserved1 = 0;
-    hdr.bfReserved2 = 0;
-    hdr.bfOffBits = (DWORD) sizeof(BITMAPFILEHEADER) + lpbi->biSize + wxPaletteSize(lpbi);
-
-    // Write the file header
-    _lwrite(fh, (LPSTR) &hdr, sizeof(BITMAPFILEHEADER));
-
-    //Write the DIB header and the bits
-    lwrite(fh, (LPSTR) lpbi, GlobalSize(hdib));
-
-    GlobalUnlock(hdib);
-    _lclose(fh);
-    return TRUE;
-}

 
 

-// ----------------------------------------------------------------------------
-// FUNCTION : wxPaletteSize(VOID FAR * pv)
-// PURPOSE  : Calculates the palette size in bytes. If the info. block
-//            is of the BITMAPCOREHEADER type, the number of colors is
-//            multiplied by 3 to give the palette size, otherwise the
-//            number of colors is multiplied by 4.
-// RETURNS  : Palette size in number of bytes.
-// ----------------------------------------------------------------------------
-WORD wxPaletteSize(
-    VOID FAR * pv )
+// calculate the number of palette entries needed for the bitmap with this
+// number of bits per pixel
+static inline WORD wxGetNumOfBitmapColors(WORD bitsPerPixel)

 {
 {

-    LPBITMAPINFOHEADER lpbi;
-    WORD NumColors;
-
-    lpbi = (LPBITMAPINFOHEADER) pv;
-    NumColors = DibNumColors(lpbi);
-
-    if (lpbi->biSize == sizeof(BITMAPCOREHEADER))
-        return (WORD)(NumColors * sizeof(RGBTRIPLE));
-    else
-        return (WORD)(NumColors * sizeof(RGBQUAD));
+    // only 1, 4 and 8bpp bitmaps use palettes (well, they could be used with
+    // 24bpp ones too but we don't support this as I think it's quite uncommon)
+    return bitsPerPixel <= 8 ? 1 << bitsPerPixel : 0;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// FUNCTION : DibNumColors(VOID FAR * pv)
-// PURPOSE  : Determines the number of colors in the DIB by looking at
-//            the BitCount filed in the info block.
-// RETURNS  : The number of colors in the DIB.
-// ----------------------------------------------------------------------------
-static WORD DibNumColors(
-    VOID FAR *pv )
+// wrapper around ::GetObject() for DIB sections
+static inline bool GetDIBSection(HBITMAP hbmp, DIBSECTION *ds)

 {
 {

-    int bits;
-    BITMAPINFOHEADER *lpbi;
-    BITMAPCOREHEADER *lpbc;
-    lpbi = ((BITMAPINFOHEADER*) pv);
-    lpbc = ((BITMAPCOREHEADER*) pv);
-
-    // With the BITMAPINFO format headers, the size of the palette
-    // is in biClrUsed, whereas in the BITMAPCORE - style headers, it
-    // is dependent on the bits per pixel ( = 2 raised to the power of
-    // bits/pixel).
-
-    if (lpbi->biSize != sizeof(BITMAPCOREHEADER)) {
-        if (lpbi->biClrUsed != 0)
-            return (WORD) lpbi->biClrUsed;
-        bits = lpbi->biBitCount;
-        }
-    else
-        bits = lpbc->bcBitCount;
-
-    switch (bits) {
-        case 1:
-            return 2;
-        case 4:
-            return 16;
-        case 8:
-            return 256;
-        default:
-            // A 24 bitcount DIB has no color table
-            return 0;
-        }
+    // note that at least under Win9x (this doesn't seem to happen under Win2K
+    // but this doesn't mean anything, of course), GetObject() may return
+    // sizeof(DIBSECTION) for a bitmap which is *not* a DIB section and the way
+    // to check for it is by looking at the bits pointer
+    return ::GetObject(hbmp, sizeof(DIBSECTION), ds) == sizeof(DIBSECTION) &&
+                ds->dsBm.bmBits;

 }
 
 }
 

+// ============================================================================
+// implementation
+// ============================================================================
+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// FUNCTION : DibFromBitmap()
-// PURPOSE  : Will create a global memory block in DIB format that
-//            represents the Device-dependent bitmap (DDB) passed in.
-// RETURNS  : A handle to the DIB
+// wxDIB creation

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-#if NOTHING
-static HANDLE DibFromBitmap(
-    HBITMAP hbm,
-    DWORD biStyle,
-    WORD biBits,
-    HPALETTE hpal)
-{
-    BITMAP bm;
-    BITMAPINFOHEADER bi;
-    BITMAPINFOHEADER FAR *lpbi;
-    DWORD dwLen;
-    HANDLE hdib;
-    HANDLE h;
-    HDC hdc;
-
-    if (!hbm)
-        return NULL;
-    if (hpal == NULL)
-        hpal = GetStockObject(DEFAULT_PALETTE);
-
-    GetObject(hbm, sizeof (bm), (LPSTR) &bm);

 
 

-    if (biBits == 0)
-        biBits = bm.bmPlanes * bm.bmBitsPixel;
-
-    bi.biSize = sizeof(BITMAPINFOHEADER);
-    bi.biWidth = bm.bmWidth;
-    bi.biHeight = bm.bmHeight;
-    bi.biPlanes = 1;
-    bi.biBitCount = biBits;
-    bi.biCompression = biStyle;
-    bi.biSizeImage = 0;
-    bi.biXPelsPerMeter = 0;
-    bi.biYPelsPerMeter = 0;
-    bi.biClrUsed = 0;
-    bi.biClrImportant = 0;
-
-    dwLen = bi.biSize + wxPaletteSize(&bi);
+bool wxDIB::Create(int width, int height, int depth)
+{
+    // we don't handle the palette yet
+    wxASSERT_MSG( depth == 24 || depth == 32,
+                    _T("unsupported image depth in wxDIB::Create()") );

 
 

-    hdc = GetDC((HWND) NULL);
-    hpal = SelectPalette(hdc, hpal, FALSE);
-    RealizePalette(hdc);
+    static const int infosize = sizeof(BITMAPINFOHEADER);

 
 

-    hdib = GlobalAlloc(GHND, dwLen);
+    BITMAPINFO *info = (BITMAPINFO *)malloc(infosize);
+    wxCHECK_MSG( info, false, _T("malloc(BITMAPINFO) failed") );

 
 

-    if (!hdib) {
-        SelectPalette(hdc, hpal, FALSE);
-        ReleaseDC(NULL, hdc);
-        return NULL;
-        }
+    memset(info, 0, infosize);

 
 

-#ifdef __WINDOWS_386__
-    lpbi = (BITMAPINFOHEADER FAR *) MK_FP32(GlobalLock(hdib));
-#else
-    lpbi = (BITMAPINFOHEADER FAR *) GlobalLock(hdib);
-#endif
+    info->bmiHeader.biSize = infosize;
+    info->bmiHeader.biWidth = width;

 
 

-    *lpbi = bi;
+    // we use positive height here which corresponds to a DIB with normal, i.e.
+    // bottom to top, order -- normally using negative height (which means
+    // reversed for MS and hence natural for all the normal people top to
+    // bottom line scan order) could be used to avoid the need for the image
+    // reversal in Create(image) but this doesn't work under NT, only Win9x!
+    info->bmiHeader.biHeight = height;

 
 

-    // call GetDIBits with a NULL lpBits param, so it will calculate the
-    // biSizeImage field for us
-    GetDIBits(hdc, hbm, 0, (WORD) bi.biHeight, NULL, (LPBITMAPINFO) lpbi, DIB_RGB_COLORS);
-    bi = *lpbi;
-    GlobalUnlock(hdib);
+    info->bmiHeader.biPlanes = 1;
+    info->bmiHeader.biBitCount = depth;
+    info->bmiHeader.biSizeImage = GetLineSize(width, depth)*height;

 
 

-    // If the driver did not fill in the biSizeImage field, make one up
-    if (bi.biSizeImage == 0) {
-        bi.biSizeImage = WIDTHBYTES((DWORD)bm.bmWidth * biBits) * bm.bmHeight;
-        if (biStyle != BI_RGB)
-            bi.biSizeImage = (bi.biSizeImage * 3) / 2;
-        }
+    m_handle = ::CreateDIBSection
+                 (
+                    0,              // hdc (unused with DIB_RGB_COLORS)
+                    info,           // bitmap description
+                    DIB_RGB_COLORS, // use RGB, not palette
+                    &m_data,        // [out] DIB bits
+                    NULL,           // don't use file mapping
+                    0               // file mapping offset (not used here)
+                 );

 
 

-    // realloc the buffer big enough to hold all the bits
-    dwLen = bi.biSize + wxPaletteSize(&bi) + bi.biSizeImage;
-    if (h = GlobalReAlloc(hdib, dwLen, 0))
-        hdib = h;
-    else {
-        GlobalFree(hdib);
-        hdib = NULL;
-        SelectPalette(hdc, hpal, FALSE);
-        ReleaseDC(NULL, hdc);
-        return hdib;
-        }
+    free(info);

 
 

-    // call GetDIBits with a NON-NULL lpBits param, and actualy get the
-    // bits this time
+    if ( !m_handle )
+    {
+        wxLogLastError(wxT("CreateDIBSection"));

 
 

-#ifdef __WINDOWS_386__
-        lpbi = (BITMAPINFOHEADER FAR *) MK_FP32(GlobalLock(hdib));
-#else
-        lpbi = (BITMAPINFOHEADER FAR *) GlobalLock(hdib);
-#endif
+        return false;
+    }

 
 

-    if (GetDIBits(hdc,
-            hbm,
-            0,
-            (WORD) bi.biHeight,
-            (LPSTR) lpbi + (WORD) lpbi->biSize + wxPaletteSize(lpbi),
-            (LPBITMAPINFO) lpbi, DIB_RGB_COLORS) == 0) {
-        GlobalUnlock(hdib);
-        hdib = NULL;
-        SelectPalette(hdc, hpal, FALSE);
-        ReleaseDC((HWND) NULL, hdc);
-        return NULL;
-        }
+    m_width = width;
+    m_height = height;
+    m_depth = depth;

 
 

-        bi = *lpbi;
-        GlobalUnlock(hdib);
-        SelectPalette(hdc, hpal, FALSE);
-        ReleaseDC(NULL, hdc);
-        return hdib;
+    return true;

 }
 }

-#endif

 
 

-
-//************* PRIVATE ROUTINES TO WRITE MORE THAN 64K ******************
-// ----------------------------------------------------------------------------
-// FUNCTION   : lwrite(int fh, VOID FAR *pv, DWORD ul)
-// PURPOSE    : Writes data in steps of 32k till all the data is written.
-// RETURNS    : 0 - If write did not proceed correctly. number of bytes written otherwise.
-// ----------------------------------------------------------------------------
-static DWORD PASCAL lwrite(
-    int fh,
-    VOID FAR *pv,
-    DWORD ul)
+bool wxDIB::Create(const wxBitmap& bmp)

 {
 {

-    DWORD ulT = ul;
-#if defined(WINNT) || defined(__WIN32__) || defined(__WIN32__) || defined(__WXWINE__)
-    BYTE *hp = (BYTE *) pv;
-#else
-    BYTE huge *hp = (BYTE huge *) pv;
-#endif
-    while (ul > MAXREAD) {
-        if (_lwrite(fh, (LPSTR) hp, (WORD) MAXREAD) != MAXREAD)
-            return 0;
-        ul -= MAXREAD;
-        hp += MAXREAD;
-        }
-    if (_lwrite(fh, (LPSTR) hp, (WXUINT) ul) != (WXUINT) ul)
-        return 0;
-    return ulT;
-}
+    wxCHECK_MSG( bmp.Ok(), false, _T("wxDIB::Create(): invalid bitmap") );

 
 

-// ----------------------------------------------------------------------------
-// FUNCTION : ReadDIB(hWnd)
-// PURPOSE  : Reads a DIB from a file, obtains a handle to its
-//            BITMAPINFO struct. and loads the DIB.  Once the DIB
-//            is loaded, the function also creates a bitmap and
-//            palette out of the DIB for a device-dependent form.
-// RETURNS  : TRUE  - DIB loaded and bitmap/palette created
-//            The DIBINIT structure pointed to by pInfo is
-//            filled with the appropriate handles.
-//            FALSE - otherwise
-// ----------------------------------------------------------------------------
-BOOL wxReadDIB(
-    LPTSTR lpFileName,
-    HBITMAP *bitmap,
-    HPALETTE *palette)
-{
-    LPBITMAPINFOHEADER lpbi;
-    BITMAPFILEHEADER bf;
-    WORD nNumColors;
-    BOOL result = FALSE;
-    WORD offBits;
-    HDC hDC;
-    BOOL bCoreHead = FALSE;
-    HANDLE hDIB = 0;
-
-    // JQ: We want to use wxFileSystem here in stead of Openfile so
-    // that we can use other FS types like a zip files.
-    wxFileSystem fsys;
-    wxFSFile *file = fsys.OpenFile(lpFileName);
-    wxInputStream *dibs = file->GetStream();
-    if (!dibs) {
-        wxLogError(_("Can't open file '%s'"), lpFileName);
-        return (0);
-        }
+    // this bitmap could already be a DIB section in which case we don't need
+    // to convert it to DIB
+    HBITMAP hbmp = GetHbitmapOf(bmp);

 
 

-    hDIB = GlobalAlloc(GHND, (DWORD)(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)));
-    if (!hDIB)
-        return(0);
+    DIBSECTION ds;
+    if ( GetDIBSection(hbmp, &ds) )
+    {
+        m_handle = hbmp;

 
 

-#ifdef __WINDOWS_386__
-    lpbi = (LPBITMAPINFOHEADER)MK_FP32(GlobalLock(hDIB));
-#else
-    lpbi = (LPBITMAPINFOHEADER)GlobalLock(hDIB);
-#endif
+        // wxBitmap will free it, not we
+        m_ownsHandle = false;

 
 

-    // JQ: read from the wxInputStream dibs instead of fh so
-    // that we can use other FS types like zip files.
-    dibs->Read((LPSTR)&bf,sizeof(bf));
-    if (sizeof(bf) != dibs->LastRead())
-        goto ErrExit;
-
-    if (bf.bfType != 0x4d42)                        // 'BM'
-        goto ErrExit;
-
-    // JQ: read from the wxInputStream dibs instead of fh so
-    // that we can use other FS types like zip files.
-    dibs->Read((LPSTR)lpbi,sizeof(BITMAPCOREHEADER));
-    if (sizeof(BITMAPCOREHEADER) != dibs->LastRead())
-        goto ErrExit;
-
-    if (lpbi->biSize == sizeof(BITMAPCOREHEADER)){
-        lpbi->biSize = sizeof(BITMAPINFOHEADER);
-        lpbi->biBitCount = ((LPBITMAPCOREHEADER)lpbi)->bcBitCount;
-        lpbi->biPlanes = ((LPBITMAPCOREHEADER)lpbi)->bcPlanes;
-        lpbi->biHeight = ((LPBITMAPCOREHEADER)lpbi)->bcHeight;
-        lpbi->biWidth = ((LPBITMAPCOREHEADER)lpbi)->bcWidth;
-        bCoreHead = TRUE;
-        }
-    else {
+        // copy all the bitmap parameters too as we have them now anyhow
+        m_width = ds.dsBm.bmWidth;
+        m_height = ds.dsBm.bmHeight;
+        m_depth = ds.dsBm.bmBitsPixel;

 
 

-        // JQ: Get to the start of the header and read INFOHEADER
-        // using dibs wxInputStream
-        dibs->SeekI(sizeof(BITMAPFILEHEADER),wxFromStart);
-        if (dibs->LastError() != wxSTREAM_NO_ERROR)
-            goto ErrExit;
+        m_data = ds.dsBm.bmBits;
+    }
+    else // no, it's a DDB -- convert it to DIB
+    {
+        const int w = bmp.GetWidth();
+        const int h = bmp.GetHeight();
+        int d = bmp.GetDepth();
+        if ( d == -1 )
+            d = wxDisplayDepth();

 
 

-        // JQ: read from the wxInputStream dibs instead of fh so
-        // that we can use other FS types like zip files.
-        // Can I do error checking with this?
-        dibs->Read((LPSTR)lpbi,sizeof(BITMAPINFOHEADER));
-        if (sizeof(BITMAPINFOHEADER) != dibs->LastRead())
-            goto ErrExit;
+        if ( !Create(w, h, d) )
+            return false;

 
 

-        }
+        if ( !GetDIBSection(m_handle, &ds) )
+        {
+            // we've just created a new DIB section, why should this fail?
+            wxFAIL_MSG( _T("GetObject(DIBSECTION) unexpectedly failed") );

 
 

-    nNumColors = (WORD)lpbi->biClrUsed;
-    if ( nNumColors == 0 ) {
-        // no color table for 24-bit, default size otherwise
-        if (lpbi->biBitCount != 24)
-            nNumColors = 1 << lpbi->biBitCount;     // standard size table
+            return false;

         }
 
         }
 

-    // fill in some default values if they are zero
-    if (lpbi->biClrUsed == 0)
-        lpbi->biClrUsed = nNumColors;
+        if ( !::GetDIBits
+                (
+                    ScreenHDC(),                // the DC to use
+                    hbmp,                       // the source DDB
+                    0,                          // first scan line
+                    h,                          // number of lines to copy
+                    ds.dsBm.bmBits,             // pointer to the buffer
+                    (BITMAPINFO *)&ds.dsBmih,   // bitmap header
+                    DIB_RGB_COLORS              // and not DIB_PAL_COLORS
+                ) )
+        {
+            wxLogLastError(wxT("GetDIBits()"));

 
 

-    if (lpbi->biSizeImage == 0){
-        lpbi->biSizeImage = ((((lpbi->biWidth * (DWORD)lpbi->biBitCount) + 31) & ~31) >> 3)
-                        * lpbi->biHeight;
+            return 0;

         }
         }

+    }

 
 

-    // get a proper-sized buffer for header, color table and bits
-    GlobalUnlock(hDIB);
-    hDIB = GlobalReAlloc(hDIB, lpbi->biSize + nNumColors * sizeof(RGBQUAD) +
-                        lpbi->biSizeImage, 0);
+    return true;
+}

 
 

-    // can't resize buffer for loading
-    if (!hDIB)
-        goto ErrExit2;
+// ----------------------------------------------------------------------------
+// Loading/saving the DIBs
+// ----------------------------------------------------------------------------

 
 

-#ifdef __WINDOWS_386__
-    lpbi = (LPBITMAPINFOHEADER)MK_FP32(GlobalLock(hDIB));
-#else
-    lpbi = (LPBITMAPINFOHEADER)GlobalLock(hDIB);
-#endif
+bool wxDIB::Load(const wxString& filename)
+{
+    m_handle = (HBITMAP)::LoadImage
+                         (
+                            wxGetInstance(),
+                            filename,
+                            IMAGE_BITMAP,
+                            0, 0, // don't specify the size
+                            LR_CREATEDIBSECTION | LR_LOADFROMFILE
+                         );
+    if ( !m_handle )
+    {
+        wxLogLastError(_T("LoadImage(LR_CREATEDIBSECTION | LR_LOADFROMFILE)"));

 
 

-    // read the color table
-    if (!bCoreHead)
-        dibs->Read((LPSTR)lpbi + lpbi->biSize, nNumColors * sizeof(RGBQUAD));
-    else {
-        signed int i;
-        RGBQUAD FAR *pQuad;
-        RGBTRIPLE FAR *pTriple;
-        dibs->Read((LPSTR)lpbi + lpbi->biSize, nNumColors * sizeof(RGBTRIPLE));
-        pQuad = (RGBQUAD FAR *)((LPSTR)lpbi + lpbi->biSize);
-        pTriple = (RGBTRIPLE FAR *) pQuad;
-        for (i = nNumColors - 1; i >= 0; i--){
-            pQuad[i].rgbRed = pTriple[i].rgbtRed;
-            pQuad[i].rgbBlue = pTriple[i].rgbtBlue;
-            pQuad[i].rgbGreen = pTriple[i].rgbtGreen;
-            pQuad[i].rgbReserved = 0;
-            }
-        }
+        return false;
+    }

 
 

-    // offset to the bits from start of DIB header
-    offBits = (WORD)(lpbi->biSize + nNumColors * sizeof(RGBQUAD));
+    return true;
+}

 
 

-    if (bf.bfOffBits != 0L)
-        dibs->SeekI(bf.bfOffBits, wxFromStart);
+bool wxDIB::Save(const wxString& filename)
+{
+    wxCHECK_MSG( m_handle, false, _T("wxDIB::Save(): invalid object") );

 
 

-    dibs->Read((LPSTR)lpbi + offBits,lpbi->biSizeImage);
-    if (lpbi->biSizeImage == dibs->LastRead())
+    wxFile file(filename, wxFile::write);
+    bool ok = file.IsOpened();
+    if ( ok )

     {
     {

-        GlobalUnlock(hDIB);
-        hDC = GetDC(NULL);
-        if (!MakeBitmapAndPalette(hDC, hDIB, palette, bitmap))
+        DIBSECTION ds;
+        if ( !GetDIBSection(m_handle, &ds) )

         {
         {

-            ReleaseDC(NULL,hDC);
-            goto ErrExit2;
+            wxLogLastError(_T("GetObject(hDIB)"));

         }
         else
         {
         }
         else
         {

-            ReleaseDC(NULL,hDC);
-            GlobalFree(hDIB);
-            result = TRUE;
+            BITMAPFILEHEADER bmpHdr;
+            wxZeroMemory(bmpHdr);
+
+            const size_t sizeHdr = ds.dsBmih.biSize;
+            const size_t sizeImage = ds.dsBmih.biSizeImage;
+
+            bmpHdr.bfType = 0x4d42;    // 'BM' in little endian
+            bmpHdr.bfOffBits = sizeof(BITMAPFILEHEADER) + ds.dsBmih.biSize;
+            bmpHdr.bfSize = bmpHdr.bfOffBits + sizeImage;
+
+            // first write the file header, then the bitmap header and finally the
+            // bitmap data itself
+            ok = file.Write(&bmpHdr, sizeof(bmpHdr)) == sizeof(bmpHdr) &&
+                    file.Write(&ds.dsBmih, sizeHdr) == sizeHdr &&
+                        file.Write(ds.dsBm.bmBits, sizeImage) == sizeImage;

         }
     }
         }
     }

-    else
+
+    if ( !ok )

     {
     {

-ErrExit:
-        GlobalUnlock(hDIB);
-ErrExit2:
-        GlobalFree(hDIB);
+        wxLogError(_("Failed to save the bitmap image to file \"%s\"."),
+                   filename.c_str());

     }
     }

-    return(result);
+
+    return ok;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// FUNCTION : MakeBitmapAndPalette
-// PURPOSE  : Given a DIB, creates a bitmap and corresponding palette
-//            to be used for a device-dependent representation of
-//            of the image.
-// RETURNS  : TRUE  --> success. phPal and phBitmap are filled with
-//            appropriate handles.  Caller is responsible for freeing objects.
-//            FALSE --> unable to create objects.  both pointer are not valid
+// wxDIB accessors

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-static BOOL PASCAL MakeBitmapAndPalette(
-    HDC hDC,
-    HANDLE hDIB,
-    HPALETTE * phPal,
-    HBITMAP * phBitmap)
-{
-    LPBITMAPINFOHEADER lpInfo;
-    BOOL result = FALSE;
-    HBITMAP hBitmap;
-    HPALETTE hPalette, hOldPal;
-    LPSTR lpBits;
-
-#ifdef __WINDOWS_386__
-    lpInfo = (LPBITMAPINFOHEADER) MK_FP32(GlobalLock(hDIB));
-#else
-    lpInfo = (LPBITMAPINFOHEADER) GlobalLock(hDIB);
-#endif

 
 

-    hPalette = wxMakeDIBPalette(lpInfo);
-    if ( hPalette )
+void wxDIB::DoGetObject() const
+{
+    // only do something if we have a valid DIB but we don't [yet] have valid
+    // data
+    if ( m_handle && !m_data )

     {
     {

-        // Need to realize palette for converting DIB to bitmap.
-        hOldPal = SelectPalette(hDC, hPalette, TRUE);
-        RealizePalette(hDC);
-
-        lpBits = (LPSTR)lpInfo + (WORD)lpInfo->biSize +
-                (WORD)lpInfo->biClrUsed * sizeof(RGBQUAD);
-        hBitmap = CreateDIBitmap(hDC, lpInfo, CBM_INIT, lpBits,
-                                (LPBITMAPINFO)lpInfo, DIB_RGB_COLORS);
-
-        SelectPalette(hDC, hOldPal, TRUE);
-        RealizePalette(hDC);
-
-        if (!hBitmap)
-            DeleteObject(hPalette);
-        else
+        // although all the info we need is in BITMAP and so we don't really
+        // need DIBSECTION we still ask for it as modifying the bit values only
+        // works for the real DIBs and not for the bitmaps and it's better to
+        // check for this now rather than trying to find out why it doesn't
+        // work later
+        DIBSECTION ds;
+        if ( !GetDIBSection(m_handle, &ds) )

         {
         {

-            *phBitmap = hBitmap;
-            *phPal = hPalette;
-            result = TRUE;
+            wxLogLastError(_T("GetObject(hDIB)"));
+            return;

         }
         }

-    }

 
 

-       GlobalUnlock (hDIB);  // glt
-    return(result);
+        wxDIB *self = wxConstCast(this, wxDIB);
+
+        self->m_width = ds.dsBm.bmWidth;
+        self->m_height = ds.dsBm.bmHeight;
+        self->m_depth = ds.dsBm.bmBitsPixel;
+        self->m_data = ds.dsBm.bmBits;
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// FUNCTION : wxMakeDIBPalette(lpInfo)
-// PURPOSE  : Given a BITMAPINFOHEADER, create a palette based on
-//            the color table.
-// RETURNS  : non-zero - handle of a corresponding palette
-//            zero - unable to create palette
+// DDB <-> DIB conversions

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-HPALETTE wxMakeDIBPalette(
-    LPBITMAPINFOHEADER lpInfo )
+
+HBITMAP wxDIB::CreateDDB(HDC hdc) const

 {
 {

-#ifdef __WXWINE__
-    return (FALSE);
-#else
-    LPLOGPALETTE npPal;
-    RGBQUAD far *lpRGB;
-    HPALETTE hLogPal;
-    WORD i;
-
-    // since biClrUsed field was filled during the loading of the DIB,
-    // we know it contains the number of colors in the color table.
-    if (lpInfo->biClrUsed)
+    wxCHECK_MSG( m_handle, 0, _T("wxDIB::CreateDDB(): invalid object") );
+
+    DIBSECTION ds;
+    if ( !GetDIBSection(m_handle, &ds) )

     {
     {

-/*
-        npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) +
-                                (WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY));
-*/
-        npPal = (LPLOGPALETTE)malloc(sizeof(LOGPALETTE) +
-                                (WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY));
-        if (!npPal)
-            return(FALSE);
-
-        npPal->palVersion = 0x300;
-        npPal->palNumEntries = (WORD)lpInfo->biClrUsed;
-
-        // get pointer to the color table
-        lpRGB = (RGBQUAD FAR *)((LPSTR)lpInfo + lpInfo->biSize);
-
-        // copy colors from the color table to the LogPalette structure
-        for (i = 0; (DWORD)i < lpInfo->biClrUsed; i++, lpRGB++)
-        {
-            npPal->palPalEntry[i].peRed = lpRGB->rgbRed;
-            npPal->palPalEntry[i].peGreen = lpRGB->rgbGreen;
-            npPal->palPalEntry[i].peBlue = lpRGB->rgbBlue;
-            npPal->palPalEntry[i].peFlags = 0;
-        }
+        wxLogLastError(_T("GetObject(hDIB)"));

 
 

-        hLogPal = CreatePalette((LPLOGPALETTE)npPal);
-//        LocalFree((HANDLE)npPal);
-        free(npPal);
-        return(hLogPal);
+        return 0;

     }
 
     }
 

-    // 24-bit DIB with no color table.  return default palette.  Another
-    // option would be to create a 256 color "rainbow" palette to provide
-    // some good color choices.
-    else
-        return((HPALETTE) GetStockObject(DEFAULT_PALETTE));
-#endif
+    return ConvertToBitmap((BITMAPINFO *)&ds.dsBmih, hdc, ds.dsBm.bmBits);

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// FUNCTION :
-// PURPOSE  :
-// RETURNS  :
-// ----------------------------------------------------------------------------
-bool wxLoadIntoBitmap(
-    wxChar *filename,
-    wxBitmap *bitmap,
-    wxPalette **pal)
+/* static */
+HBITMAP wxDIB::ConvertToBitmap(const BITMAPINFO *pbmi, HDC hdc, void *bits)

 {
 {

-    HBITMAP hBitmap;
-    HPALETTE hPalette;
+    wxCHECK_MSG( pbmi, 0, _T("invalid DIB in ConvertToBitmap") );

 
 

-    bool success = (wxReadDIB(filename, &hBitmap, &hPalette) != 0);
-    if (!success)
-    {
-        DeleteObject(hPalette);
-        return FALSE;
-    }
+    // here we get BITMAPINFO struct followed by the actual bitmap bits and
+    // BITMAPINFO starts with BITMAPINFOHEADER followed by colour info
+    const BITMAPINFOHEADER *pbmih = &pbmi->bmiHeader;

 
 

-    if (hPalette)
+    // get the pointer to the start of the real image data if we have a plain
+    // DIB and not a DIB section (in the latter case the pointer must be passed
+    // to us by the caller)
+    if ( !bits )

     {
     {

-        if (pal)
+        // we must skip over the colour table to get to the image data
+        //
+        // colour table either has the real colour data in which case its
+        // number of entries is given by biClrUsed or is used for masks to be
+        // used for extracting colour information from true colour bitmaps in
+        // which case it always have exactly 3 DWORDs
+        int numColors;
+        switch ( pbmih->biCompression )

         {
         {

-            *pal = new wxPalette;
-            (*pal)->SetHPALETTE((WXHPALETTE) hPalette);
+            case BI_BITFIELDS:
+                numColors = 3;
+                break;
+
+            case BI_RGB:
+                // biClrUsed has the number of colors but it may be not initialized at
+                // all
+                numColors = pbmih->biClrUsed;
+                if ( !numColors )
+                {
+                    numColors = wxGetNumOfBitmapColors(pbmih->biBitCount);
+                }
+                break;
+
+            default:
+                // no idea how it should be calculated for the other cases
+                numColors = 0;

         }
         }

-        else
-            DeleteObject(hPalette);
+
+        bits = (char *)pbmih + sizeof(*pbmih) + numColors*sizeof(RGBQUAD);

     }
     }

-    else if (pal)
-        *pal = NULL;

 
 

-    if (hBitmap)
+    HBITMAP hbmp = ::CreateDIBitmap
+                     (
+                        hdc ? hdc           // create bitmap compatible
+                            : (HDC) ScreenHDC(),  //  with this DC
+                        pbmih,              // used to get size &c
+                        CBM_INIT,           // initialize bitmap bits too
+                        bits,               // ... using this data
+                        pbmi,               // this is used for palette only
+                        DIB_RGB_COLORS      // direct or indexed palette?
+                     );
+
+    if ( !hbmp )

     {
     {

-        BITMAP bm;
-        GetObject(hBitmap, sizeof(bm), (LPSTR)&bm);
-
-        bitmap->SetHBITMAP((WXHBITMAP) hBitmap);
-        bitmap->SetWidth(bm.bmWidth);
-        bitmap->SetHeight(bm.bmHeight);
-        bitmap->SetDepth(bm.bmPlanes * bm.bmBitsPixel);
-#if WXWIN_COMPATIBILITY_2
-        bitmap->SetOk(TRUE);
-#endif // WXWIN_COMPATIBILITY_2
-        return TRUE;
+        wxLogLastError(wxT("CreateDIBitmap"));

     }
     }

-    else return FALSE;
+
+    return hbmp;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// FUNCTION :
-// PURPOSE  :
-// RETURNS  :
-// ----------------------------------------------------------------------------
-wxBitmap *wxLoadBitmap(
-    wxChar *filename,
-    wxPalette **pal)
+/* static */
+size_t wxDIB::ConvertFromBitmap(BITMAPINFO *pbi, HBITMAP hbmp)

 {
 {

-    wxBitmap *bitmap = new wxBitmap;
-    if (wxLoadIntoBitmap(filename, bitmap, pal))
-        return bitmap;
-    else
+    wxASSERT_MSG( hbmp, wxT("invalid bmp can't be converted to DIB") );
+
+    // prepare all the info we need
+    BITMAP bm;
+    if ( !::GetObject(hbmp, sizeof(bm), &bm) )

     {
     {

-        delete bitmap;
-        return NULL;
+        wxLogLastError(wxT("GetObject(bitmap)"));
+
+        return 0;

     }
     }

-}

 
 

-//---------------------------------------------------------------------
-// FUNCTION : InitBitmapInfoHeader
-// PURPOSE  : Does a "standard" initialization of a BITMAPINFOHEADER,
-//            given the Width, Height, and Bits per Pixel for the DIB.
-//
-//            By standard, I mean that all the relevant fields are set
-//            to the specified values.  biSizeImage is computed, the
-//            biCompression field is set to "no compression," and all
-//            other fields are 0.
-//
-//            Note that DIBs only allow BitsPixel values of 1, 4, 8, or
-//            24.  This routine makes sure that one of these values is
-//            used (whichever is most appropriate for the specified
-//            nBPP).
-//
-// PARMS    : lpBmInfoHdr == Far pointer to a BITMAPINFOHEADER structure
-//                            to be filled in.
-//            dwWidth     == Width of DIB (not in Win 3.0 & 3.1, high
-//                            word MUST be 0).
-//            dwHeight    == Height of DIB (not in Win 3.0 & 3.1, high
-//                            word MUST be 0).
-//            nBPP        == Bits per Pixel for the DIB.
-//
-// History:   Date      Reason
-//            11/07/91  Created
-//
-//---------------------------------------------------------------------
-static void InitBitmapInfoHeader (
-    LPBITMAPINFOHEADER lpBmInfoHdr,
-    DWORD dwWidth,
-    DWORD dwHeight,
-    int nBPP )
-{
-//   _fmemset (lpBmInfoHdr, 0, sizeof (BITMAPINFOHEADER));
-   memset (lpBmInfoHdr, 0, sizeof (BITMAPINFOHEADER));
-
-   lpBmInfoHdr->biSize      = sizeof (BITMAPINFOHEADER);
-   lpBmInfoHdr->biWidth     = dwWidth;
-   lpBmInfoHdr->biHeight    = dwHeight;
-   lpBmInfoHdr->biPlanes    = 1;
-
-   if (nBPP <= 1)
-      nBPP = 1;
-   else if (nBPP <= 4)
-      nBPP = 4;
-   else if (nBPP <= 8)
-      nBPP = 8;
-/* Doesn't work
-   else if (nBPP <= 16)
-      nBPP = 16;
-*/
-   else
-      nBPP = 24;
-
-   lpBmInfoHdr->biBitCount  = nBPP;
-   lpBmInfoHdr->biSizeImage = WIDTHBYTES (dwWidth * nBPP) * dwHeight;
-}
+    // we need a BITMAPINFO anyhow and if we're not given a pointer to it we
+    // use this one
+    BITMAPINFO bi2;

 
 

-// ----------------------------------------------------------------------------
-// FUNCTION :
-// PURPOSE  :
-// RETURNS  :
-// ----------------------------------------------------------------------------
-LPSTR wxFindDIBBits (LPSTR lpbi)
-{
-   return (lpbi + *(LPDWORD)lpbi + wxPaletteSize (lpbi));
+    const bool wantSizeOnly = pbi == NULL;
+    if ( wantSizeOnly )
+        pbi = &bi2;
+
+    // just for convenience
+    const int h = bm.bmHeight;
+
+    // init the header
+    BITMAPINFOHEADER& bi = pbi->bmiHeader;
+    wxZeroMemory(bi);
+    bi.biSize = sizeof(BITMAPINFOHEADER);
+    bi.biWidth = bm.bmWidth;
+    bi.biHeight = h;
+    bi.biPlanes = 1;
+    bi.biBitCount = bm.bmBitsPixel;
+
+    // memory we need for BITMAPINFO only
+    DWORD dwLen = bi.biSize + wxGetNumOfBitmapColors(bm.bmBitsPixel) * sizeof(RGBQUAD);
+
+    // get either just the image size or the image bits
+    if ( !::GetDIBits
+            (
+                ScreenHDC(),                        // the DC to use
+                hbmp,                               // the source DDB
+                0,                                  // first scan line
+                h,                                  // number of lines to copy
+                wantSizeOnly ? NULL                 // pointer to the buffer or
+                             : (char *)pbi + dwLen, // NULL if we don't have it
+                pbi,                                // bitmap header
+                DIB_RGB_COLORS                      // or DIB_PAL_COLORS
+            ) )
+    {
+        wxLogLastError(wxT("GetDIBits()"));
+
+        return 0;
+    }
+
+    // return the total size
+    return dwLen + bi.biSizeImage;

 }
 
 }
 

-//---------------------------------------------------------------------
-// Function:   BitmapToDIB
-//
-// Purpose:    Given a device dependent bitmap and a palette, returns
-//             a handle to global memory with a DIB spec in it.  The
-//             DIB is rendered using the colors of the palette passed in.
-//
-//             Stolen almost verbatim from ShowDIB.
-//
-// Parms:      hBitmap == Handle to device dependent bitmap compatible
-//                        with default screen display device.
-//             hPal    == Palette to render the DDB with.  If it's NULL,
-//                        use the default palette.
-//
-// History:   Date      Reason
-//             6/01/91  Created
-//
-//---------------------------------------------------------------------
-HANDLE wxBitmapToDIB (
-    HBITMAP hBitmap,
-    HPALETTE hPal)
+/* static */
+HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)

 {
 {

-    BITMAP             Bitmap;
-    BITMAPINFOHEADER   bmInfoHdr;
-    LPBITMAPINFOHEADER lpbmInfoHdr;
-    LPSTR              lpBits;
-    HDC                hMemDC;
-    HANDLE             hDIB;
-    HPALETTE           hOldPal = NULL;
+    // first calculate the size needed
+    const size_t size = ConvertFromBitmap(NULL, hbmp);
+    if ( !size )
+    {
+        // conversion to DDB failed?
+        return NULL;
+    }

 
 

-    // Do some setup -- make sure the Bitmap passed in is valid,
-    // get info on the bitmap (like its height, width, etc.),
-    // then setup a BITMAPINFOHEADER.
+    HGLOBAL hDIB = ::GlobalAlloc(GMEM_MOVEABLE, size);
+    if ( !hDIB )
+    {
+        // this is an error which does risk to happen especially under Win9x
+        // and which the user may understand so let him know about it
+        wxLogError(_("Failed to allocated %luKb of memory for bitmap data."),
+                   (unsigned long)(size / 1024));

 
 

-   if (!hBitmap)
-      return NULL;
+        return NULL;
+    }
+
+    if ( !ConvertFromBitmap((BITMAPINFO *)(void *)GlobalPtr(hDIB), hbmp) )
+    {
+        // this really shouldn't happen... it worked the first time, why not
+        // now?
+        wxFAIL_MSG( _T("wxDIB::ConvertFromBitmap() unexpectedly failed") );

 
 

-   if (!GetObject (hBitmap, sizeof (Bitmap), (LPSTR) &Bitmap))
-      return NULL;
+        return NULL;
+    }

 
 

-   InitBitmapInfoHeader (&bmInfoHdr,
-                         Bitmap.bmWidth,
-                         Bitmap.bmHeight,
-                         Bitmap.bmPlanes * Bitmap.bmBitsPixel);
+    return hDIB;
+}

 
 

+// ----------------------------------------------------------------------------
+// palette support
+// ----------------------------------------------------------------------------

 
 

-    // Now allocate memory for the DIB.  Then, set the BITMAPINFOHEADER
-    //  into this memory, and find out where the bitmap bits go.
+#if wxUSE_PALETTE

 
 

-    hDIB = GlobalAlloc (GHND, sizeof (BITMAPINFOHEADER) +
-                        wxPaletteSize ((LPSTR) &bmInfoHdr) + bmInfoHdr.biSizeImage);
+wxPalette *wxDIB::CreatePalette() const
+{
+    wxCHECK_MSG( m_handle, NULL, _T("wxDIB::CreatePalette(): invalid object") );

 
 

-    if (!hDIB)
-        return NULL;
+    DIBSECTION ds;
+    if ( !GetDIBSection(m_handle, &ds) )
+    {
+        wxLogLastError(_T("GetObject(hDIB)"));

 
 

-#ifdef __WINDOWS_386__
-    lpbmInfoHdr  = (LPBITMAPINFOHEADER) MK_FP32(GlobalLock (hDIB));
-#else
-    lpbmInfoHdr  = (LPBITMAPINFOHEADER) GlobalLock (hDIB);
-#endif
+        return 0;
+    }

 
 

-    *lpbmInfoHdr = bmInfoHdr;
-    lpBits       = wxFindDIBBits ((LPSTR) lpbmInfoHdr);
+    // how many colours are we going to have in the palette?
+    DWORD biClrUsed = ds.dsBmih.biClrUsed;
+    if ( !biClrUsed )
+    {
+        // biClrUsed field might not be set
+        biClrUsed = wxGetNumOfBitmapColors(ds.dsBmih.biBitCount);
+    }
+
+    if ( !biClrUsed )
+    {
+        // bitmaps of this depth don't have palettes at all
+        //
+        // NB: another possibility would be to return
+        //     GetStockObject(DEFAULT_PALETTE) or even CreateHalftonePalette()?
+        return NULL;
+    }

 
 

-    // Now, we need a DC to hold our bitmap.  If the app passed us
-    //  a palette, it should be selected into the DC.
-    hMemDC       = GetDC (NULL);
+    // LOGPALETTE struct has only 1 element in palPalEntry array, we're
+    // going to have biClrUsed of them so add necessary space
+    LOGPALETTE *pPalette = (LOGPALETTE *)
+        malloc(sizeof(LOGPALETTE) + (biClrUsed - 1)*sizeof(PALETTEENTRY));
+    wxCHECK_MSG( pPalette, NULL, _T("out of memory") );

 
 

-    if (hPal)
+    // initialize the palette header
+    pPalette->palVersion = 0x300;  // magic number, not in docs but works
+    pPalette->palNumEntries = biClrUsed;
+
+    // and the colour table (it starts right after the end of the header)
+    const RGBQUAD *pRGB = (RGBQUAD *)((char *)&ds.dsBmih + ds.dsBmih.biSize);
+    for ( DWORD i = 0; i < biClrUsed; i++, pRGB++ )

     {
     {

-        hOldPal = SelectPalette (hMemDC, hPal, FALSE);
-        RealizePalette (hMemDC);
+        pPalette->palPalEntry[i].peRed = pRGB->rgbRed;
+        pPalette->palPalEntry[i].peGreen = pRGB->rgbGreen;
+        pPalette->palPalEntry[i].peBlue = pRGB->rgbBlue;
+        pPalette->palPalEntry[i].peFlags = 0;

     }
 
     }
 

-    // We're finally ready to get the DIB.  Call the driver and let
-    //  it party on our bitmap.  It will fill in the color table,
-    //  and bitmap bits of our global memory block.
-    if (!GetDIBits (hMemDC,
-                   hBitmap,
-                   0,
-                   Bitmap.bmHeight,
-                   lpBits,
-                   (LPBITMAPINFO) lpbmInfoHdr,
-                   DIB_RGB_COLORS))
+    HPALETTE hPalette = ::CreatePalette(pPalette);
+
+    free(pPalette);
+
+    if ( !hPalette )

     {
     {

-        GlobalUnlock (hDIB);
-        GlobalFree (hDIB);
-        hDIB = NULL;
+        wxLogLastError(_T("CreatePalette"));
+
+        return NULL;

     }
     }

-    else
-        GlobalUnlock (hDIB);

 
 

-   // Finally, clean up and return.
-   if (hOldPal)
-        SelectPalette (hMemDC, hOldPal, FALSE);
+    wxPalette *palette = new wxPalette;
+    palette->SetHPALETTE((WXHPALETTE)hPalette);

 
 

-   ReleaseDC (NULL, hMemDC);
-   return hDIB;
+    return palette;

 }
 
 }
 

+#endif // wxUSE_PALETTE
+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// FUNCTION :
-// PURPOSE  :
-// RETURNS  :
+// wxImage support

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-bool wxSaveBitmap(
-    wxChar *filename,
-    wxBitmap *bitmap,
-    wxPalette *colourmap)
-{
-    HPALETTE hPalette = 0;
-    if (colourmap)
-        hPalette = (HPALETTE) colourmap->GetHPALETTE();

 
 

-    HANDLE dibHandle = wxBitmapToDIB((HBITMAP) bitmap->GetHBITMAP(), hPalette);
-    if (dibHandle)
+#if wxUSE_IMAGE
+
+bool wxDIB::Create(const wxImage& image)
+{
+    wxCHECK_MSG( image.Ok(), false, _T("invalid wxImage in wxDIB ctor") );
+
+    const int h = image.GetHeight();
+    const int w = image.GetWidth();
+
+    // if we have alpha channel, we need to create a 32bpp RGBA DIB, otherwise
+    // a 24bpp RGB is sufficient
+    const bool hasAlpha = image.HasAlpha();
+    const int bpp = hasAlpha ? 32 : 24;
+
+    if ( !Create(w, h, bpp) )
+        return false;
+
+    // DIBs are stored in bottom to top order (see also the comment above in
+    // Create()) so we need to copy bits line by line and starting from the end
+    const int srcBytesPerLine = w * 3;
+    const int dstBytesPerLine = GetLineSize(w, bpp);
+    const unsigned char *src = image.GetData() + ((h - 1) * srcBytesPerLine);
+    const unsigned char *alpha = hasAlpha ? image.GetAlpha() + (h - 1)*w : NULL;
+    unsigned char *dstLineStart = (unsigned char *)m_data;
+    for ( int y = 0; y < h; y++ )

     {
     {

-        bool success = (WriteDIB(filename, dibHandle) != 0);
-        GlobalFree(dibHandle);
-        return success;
+        // copy one DIB line
+        unsigned char *dst = dstLineStart;
+        for ( int x = 0; x < w; x++ )
+        {
+            // also, the order of RGB is inversed for DIBs
+            *dst++ = src[2];
+            *dst++ = src[1];
+            *dst++ = src[0];
+
+            src += 3;
+
+            if ( alpha )
+                *dst++ = *alpha++;
+        }
+
+        // pass to the previous line in the image
+        src -= 2*srcBytesPerLine;
+        if ( alpha )
+            alpha -= 2*w;
+
+        // and to the next one in the DIB
+        dstLineStart += dstBytesPerLine;

     }
     }

-        else return FALSE;
+
+    return true;

 }
 
 }
 

+#endif // wxUSE_IMAGE