added common notebookbase source file

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 7579bcee53c46878e19aed5f89a9b11f17d1c9c8..c7dc1834fdb88877ebb7f8e5f2c46949e7538802 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -43,17 +43,26 @@
 #include "wx/msw/private.h"
 #include "wx/log.h"
 
 #include "wx/msw/private.h"
 #include "wx/log.h"
 

+#if !defined(__WXMICROWIN__)

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

+#endif
+

 #include "wx/image.h"
 #include "wx/image.h"

+#include "wx/xpmdecod.h"
+
+// missing from mingw32 header
+#ifndef CLR_INVALID
+    #define CLR_INVALID ((COLORREF)-1)
+#endif // no CLR_INVALID

 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARIES
-    IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
+
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -65,35 +74,34 @@
 
 wxBitmapRefData::wxBitmapRefData()
 {
 
 wxBitmapRefData::wxBitmapRefData()
 {

-  m_ok = FALSE;
-  m_width = 0;
-  m_height = 0;
-  m_depth = 0;
-  m_quality = 0;
-  m_hBitmap = 0 ;
-  m_selectedInto = NULL;
-  m_numColors = 0;
-  m_bitmapMask = NULL;
+    m_quality = 0;
+    m_selectedInto = NULL;
+    m_numColors = 0;
+    m_bitmapMask = NULL;
+    m_hBitmap = (WXHBITMAP) NULL;

 }
 
 }
 

-wxBitmapRefData::~wxBitmapRefData()
+void wxBitmapRefData::Free()

 {
     wxASSERT_MSG( !m_selectedInto,
                   wxT("deleting bitmap still selected into wxMemoryDC") );
 
     if ( m_hBitmap)
 {
     wxASSERT_MSG( !m_selectedInto,
                   wxT("deleting bitmap still selected into wxMemoryDC") );
 
     if ( m_hBitmap)

-        DeleteObject((HBITMAP) m_hBitmap);
+    {
+        if ( !::DeleteObject((HBITMAP)m_hBitmap) )
+        {
+            wxLogLastError(wxT("DeleteObject(hbitmap)"));
+        }
+    }

 
 

-    if ( m_bitmapMask )
-        delete m_bitmapMask;
+    delete m_bitmapMask;
+    m_bitmapMask = NULL;

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

-// wxBitmap
+// wxBitmap creation

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

-wxList wxBitmap::sm_handlers;
-

 // this function should be called from all wxBitmap ctors
 void wxBitmap::Init()
 {
 // this function should be called from all wxBitmap ctors
 void wxBitmap::Init()
 {


@@ -103,62 +111,109 @@ void wxBitmap::Init()
         wxTheBitmapList->AddBitmap(this);
 }
 
         wxTheBitmapList->AddBitmap(this);
 }
 

-bool wxBitmap::CopyFromIcon(const wxIcon& icon)
+#ifdef __WIN32__
+
+bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
+{
+#ifndef __WXMICROWIN__
+    // it may be either HICON or HCURSOR
+    HICON hicon = (HICON)icon.GetHandle();
+
+    ICONINFO iconInfo;
+    if ( !::GetIconInfo(hicon, &iconInfo) )
+    {
+        wxLogLastError(wxT("GetIconInfo"));
+
+        return FALSE;
+    }
+
+    wxBitmapRefData *refData = new wxBitmapRefData;
+    m_refData = refData;
+
+    int w = icon.GetWidth(),
+        h = icon.GetHeight();
+
+    refData->m_width = w;
+    refData->m_height = h;
+    refData->m_depth = wxDisplayDepth();
+
+    refData->m_hBitmap = (WXHBITMAP)iconInfo.hbmColor;
+
+    // the mask returned by GetIconInfo() is inversed compared to the usual
+    // wxWin convention
+    refData->m_bitmapMask = new wxMask((WXHBITMAP)
+                                        wxInvertMask(iconInfo.hbmMask, w, h));
+
+#if WXWIN_COMPATIBILITY_2
+    refData->m_ok = TRUE;
+#endif // WXWIN_COMPATIBILITY_2
+
+    return TRUE;
+#else
+    return FALSE;
+#endif
+}
+
+#endif // Win32
+
+bool wxBitmap::CopyFromCursor(const wxCursor& cursor)

 {
     UnRef();
 
 {
     UnRef();
 

-    if ( !icon.Ok() )
+    if ( !cursor.Ok() )

         return FALSE;
 
         return FALSE;
 

-    int width = icon.GetWidth(),
-        height = icon.GetHeight();
+#ifdef __WIN16__
+    wxFAIL_MSG( _T("don't know how to convert cursor to bitmap") );
+
+    return FALSE;
+#else
+    return CopyFromIconOrCursor(cursor);
+#endif // Win16
+}
+
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)
+{
+    UnRef();

 
 

-    HICON hicon = (HICON) icon.GetHICON();
+    if ( !icon.Ok() )
+        return FALSE;

 
     // GetIconInfo() doesn't exist under Win16 and I don't know any other way
     // to create a bitmap from icon there - but using this way we won't have
     // the mask (FIXME)
 #ifdef __WIN16__
 
     // GetIconInfo() doesn't exist under Win16 and I don't know any other way
     // to create a bitmap from icon there - but using this way we won't have
     // the mask (FIXME)
 #ifdef __WIN16__

+    int width = icon.GetWidth(),
+        height = icon.GetHeight();
+

     // copy the icon to the bitmap
     // copy the icon to the bitmap

-    HDC hdcScreen = ::GetDC((HWND)NULL);
+    ScreenHDC hdcScreen;

     HDC hdc = ::CreateCompatibleDC(hdcScreen);
     HBITMAP hbitmap = ::CreateCompatibleBitmap(hdcScreen, width, height);
     HBITMAP hbmpOld = (HBITMAP)::SelectObject(hdc, hbitmap);
 
     HDC hdc = ::CreateCompatibleDC(hdcScreen);
     HBITMAP hbitmap = ::CreateCompatibleBitmap(hdcScreen, width, height);
     HBITMAP hbmpOld = (HBITMAP)::SelectObject(hdc, hbitmap);
 

-    ::DrawIcon(hdc, 0, 0, hicon);
+    ::DrawIcon(hdc, 0, 0, GetHiconOf(icon));

 
     ::SelectObject(hdc, hbmpOld);
     ::DeleteDC(hdc);
 
     ::SelectObject(hdc, hbmpOld);
     ::DeleteDC(hdc);

-    ::ReleaseDC((HWND)NULL, hdcScreen);
-#else // Win32
-    ICONINFO iconInfo;
-    if ( !GetIconInfo(hicon, &iconInfo) )
-    {
-        wxLogLastError("GetIconInfo");
-
-        return FALSE;
-    }
-
-    HBITMAP hbitmap = iconInfo.hbmColor;

 
 

-    wxMask *mask = new wxMask;
-    mask->SetMaskBitmap((WXHBITMAP)iconInfo.hbmMask);
-#endif // Win16/32
+    wxBitmapRefData *refData = new wxBitmapRefData;
+    m_refData = refData;

 
 

-    m_refData = new wxBitmapRefData;
-
-    M_BITMAPDATA->m_width = width;
-    M_BITMAPDATA->m_height = height;
-    M_BITMAPDATA->m_depth = wxDisplayDepth();
+    refData->m_width = width;
+    refData->m_height = height;
+    refData->m_depth = wxDisplayDepth();

 
 

-    M_BITMAPDATA->m_hBitmap = (WXHBITMAP)hbitmap;
-    M_BITMAPDATA->m_ok = TRUE;
+    refData->m_hBitmap = (WXHBITMAP)hbitmap;

 
 

-#ifndef __WIN16__
-    SetMask(mask);
-#endif // !Win16
+#if WXWIN_COMPATIBILITY_2
+    refData->m_ok = TRUE;
+#endif // WXWIN_COMPATIBILITY_2

 
     return TRUE;
 
     return TRUE;

+#else // Win32
+    return CopyFromIconOrCursor(icon);
+#endif // Win16/Win32

 }
 
 wxBitmap::~wxBitmap()
 }
 
 wxBitmap::~wxBitmap()


@@ -167,58 +222,91 @@ wxBitmap::~wxBitmap()
         wxTheBitmapList->DeleteObject(this);
 }
 
         wxTheBitmapList->DeleteObject(this);
 }
 

-bool wxBitmap::FreeResource(bool WXUNUSED(force))
-{
-  if ( !M_BITMAPDATA )
-    return FALSE;
-
-  wxASSERT_MSG( !M_BITMAPDATA->m_selectedInto,
-                wxT("freeing bitmap still selected into wxMemoryDC") );
-
-  if (M_BITMAPDATA->m_hBitmap)
-  {
-    DeleteObject((HBITMAP) M_BITMAPDATA->m_hBitmap);
-  }
-  M_BITMAPDATA->m_hBitmap = 0 ;
-
-/*
-  if (M_BITMAPDATA->m_bitmapPalette)
-    delete M_BITMAPDATA->m_bitmapPalette;
-
-  M_BITMAPDATA->m_bitmapPalette = NULL ;
-*/
-
-  return TRUE;
-}
-
-
-wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
+wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)

 {
     Init();
 
 {
     Init();
 

-    m_refData = new wxBitmapRefData;
+#ifndef __WXMICROWIN__
+    wxBitmapRefData *refData = new wxBitmapRefData;
+    m_refData = refData;

 
 

-    M_BITMAPDATA->m_width = the_width ;
-    M_BITMAPDATA->m_height = the_height ;
-    M_BITMAPDATA->m_depth = no_bits ;
-    M_BITMAPDATA->m_numColors = 0;
+    refData->m_width = width;
+    refData->m_height = height;
+    refData->m_depth = depth;
+    refData->m_numColors = 0;
+    refData->m_selectedInto = NULL;

 
 

-    M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateBitmap(the_width, the_height, 1, no_bits, bits);
-
-    if (M_BITMAPDATA->m_hBitmap)
-        M_BITMAPDATA->m_ok = TRUE;
+    char *data;
+    if ( depth == 1 )
+    {
+        // we assume that it is in XBM format which is not quite the same as
+        // the format CreateBitmap() wants because the order of bytes in the
+        // line is inversed!
+        static const size_t bytesPerLine = (width + 7) / 8;
+        static const size_t padding = bytesPerLine % 2;
+        static const size_t len = height * ( padding + bytesPerLine );
+        data = (char *)malloc(len);
+        const char *src = bits;
+        char *dst = data;
+
+        for ( int rows = 0; rows < height; rows++ )
+        {
+            for ( size_t cols = 0; cols < bytesPerLine; cols++ )
+            {
+                unsigned char val = *src++;
+                unsigned char reversed = 0;
+
+                for ( int bits = 0; bits < 8; bits++)
+                {
+                    reversed <<= 1;
+                    reversed |= (val & 0x01);
+                    val >>= 1;
+                }
+                *dst++ = reversed;
+            }
+
+            if ( padding )
+                *dst++ = 0;
+        }
+    }

     else
     else

-        M_BITMAPDATA->m_ok = FALSE;
+    {
+        // bits should already be in Windows standard format
+        data = (char *)bits;    // const_cast is harmless
+    }
+
+    HBITMAP hbmp = ::CreateBitmap(width, height, 1, depth, data);
+    if ( !hbmp )
+    {
+        wxLogLastError(wxT("CreateBitmap"));
+    }

 
 

-    M_BITMAPDATA->m_selectedInto = NULL;
+    if ( data != bits )
+    {
+        free(data);
+    }
+
+    SetHBITMAP((WXHBITMAP)hbmp);
+#endif

 }
 
 // Create from XPM data
 }
 
 // Create from XPM data

-wxBitmap::wxBitmap(char **data, wxControl *WXUNUSED(anItem))
+bool wxBitmap::CreateFromXpm(const char **data)

 {
 {

+#if wxUSE_IMAGE && wxUSE_XPM

     Init();
 
     Init();
 

-    (void)Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+    wxCHECK_MSG( data != NULL, FALSE, wxT("invalid bitmap data") )
+    
+    wxXPMDecoder decoder;
+    wxImage img = decoder.ReadData(data);
+    wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )
+    
+    *this = wxBitmap(img);
+    return TRUE;
+#else
+       return FALSE;
+#endif

 }
 
 wxBitmap::wxBitmap(int w, int h, int d)
 }
 
 wxBitmap::wxBitmap(int w, int h, int d)


@@ -232,10 +320,10 @@ wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
 {
     Init();
 
 {
     Init();
 

-    (void) Create(data, type, width, height, depth);
+    (void)Create(data, type, width, height, depth);

 }
 
 }
 

-wxBitmap::wxBitmap(const wxString& filename, long type)
+wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)

 {
     Init();
 
 {
     Init();
 


@@ -244,224 +332,569 @@ wxBitmap::wxBitmap(const wxString& filename, long type)
 
 bool wxBitmap::Create(int w, int h, int d)
 {
 
 bool wxBitmap::Create(int w, int h, int d)
 {

-  UnRef();
+#ifndef __WXMICROWIN__
+    UnRef();

 
 

-  m_refData = new wxBitmapRefData;
+    m_refData = new wxBitmapRefData;

 
 

-  M_BITMAPDATA->m_width = w;
-  M_BITMAPDATA->m_height = h;
-  M_BITMAPDATA->m_depth = d;
+    GetBitmapData()->m_width = w;
+    GetBitmapData()->m_height = h;
+    GetBitmapData()->m_depth = d;

 
 

-  if (d > 0)
-  {
-    M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateBitmap(w, h, 1, d, NULL);
-  }
-  else
-  {
-    HDC dc = GetDC((HWND) NULL);
-    M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateCompatibleBitmap(dc, w, h);
-    ReleaseDC((HWND) NULL, dc);
-    M_BITMAPDATA->m_depth = wxDisplayDepth();
-  }
-  if (M_BITMAPDATA->m_hBitmap)
-    M_BITMAPDATA->m_ok = TRUE;
-  else
-    M_BITMAPDATA->m_ok = FALSE;
-  return M_BITMAPDATA->m_ok;
-}
+    HBITMAP hbmp;

 
 

-bool wxBitmap::LoadFile(const wxString& filename, long type)
-{
-  UnRef();
+    if ( d > 0 )
+    {
+        hbmp = ::CreateBitmap(w, h, 1, d, NULL);
+        if ( !hbmp )
+        {
+            wxLogLastError(wxT("CreateBitmap"));
+        }
+    }
+    else
+    {
+        ScreenHDC dc;
+        hbmp = ::CreateCompatibleBitmap(dc, w, h);
+        if ( !hbmp )
+        {
+            wxLogLastError(wxT("CreateCompatibleBitmap"));
+        }

 
 

-  m_refData = new wxBitmapRefData;
+        GetBitmapData()->m_depth = wxDisplayDepth();
+    }

 
 

-  wxBitmapHandler *handler = FindHandler(type);
+    SetHBITMAP((WXHBITMAP)hbmp);

 
 

-#if 0
-  if ( handler == NULL )
-    return FALSE;
+#if WXWIN_COMPATIBILITY_2
+    GetBitmapData()->m_ok = hbmp != 0;
+#endif // WXWIN_COMPATIBILITY_2
+    return Ok();

 #else
 #else

-  if ( handler == NULL ) {
-    wxImage image;
-    if (!image.LoadFile( filename, type )) return FALSE;
-    if (image.Ok()) 
-    {
-        *this = image.ConvertToBitmap();
-        return TRUE;
-    }
-    else return FALSE;
-  }
+    return FALSE;

 #endif
 #endif

-  return handler->LoadFile(this, filename, type, -1, -1);

 }
 
 }
 

-bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
+// ----------------------------------------------------------------------------
+// wxImage to/from conversions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_IMAGE
+
+bool wxBitmap::CreateFromImage( const wxImage& image, int depth )

 {
 {

-  UnRef();
+#ifdef __WXMICROWIN__
+    // TODO
+    return FALSE;
+#else
+    wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )

 
 

-  m_refData = new wxBitmapRefData;
+    m_refData = new wxBitmapRefData();

 
 

-  wxBitmapHandler *handler = FindHandler(type);
+    // sizeLimit is the MS upper limit for the DIB size
+#ifdef  WIN32
+    int sizeLimit = 1024*768*3;
+#else
+    int sizeLimit = 0x7fff ;
+#endif

 
 

-  if ( handler == NULL ) {
-    wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
+    // width and height of the device-dependent bitmap
+    int width = image.GetWidth();
+    int bmpHeight = image.GetHeight();

 
 

-    return FALSE;
-  }
+    // calc the number of bytes per scanline and padding
+    int bytePerLine = width*3;
+    int sizeDWORD = sizeof( DWORD );
+    int lineBoundary = bytePerLine % sizeDWORD;
+    int padding = 0;
+    if( lineBoundary > 0 )
+    {
+        padding = sizeDWORD - lineBoundary;
+        bytePerLine += padding;
+    }
+    // calc the number of DIBs and heights of DIBs
+    int numDIB = 1;
+    int hRemain = 0;
+    int height = sizeLimit/bytePerLine;
+    if( height >= bmpHeight )
+        height = bmpHeight;
+    else
+    {
+        numDIB =  bmpHeight / height;
+        hRemain = bmpHeight % height;
+        if( hRemain >0 )  numDIB++;
+    }

 
 

-  return handler->Create(this, data, type, width, height, depth);
-}
+    // set bitmap parameters
+    wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") );
+    SetWidth( width );
+    SetHeight( bmpHeight );
+    if (depth == -1) depth = wxDisplayDepth();
+    SetDepth( depth );
+
+    // create a DIB header
+    int headersize = sizeof(BITMAPINFOHEADER);
+    BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize );
+    wxCHECK_MSG( lpDIBh, FALSE, wxT("could not allocate memory for DIB header") );
+    // Fill in the DIB header
+    lpDIBh->bmiHeader.biSize = headersize;
+    lpDIBh->bmiHeader.biWidth = (DWORD)width;
+    lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
+    lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
+    //   the general formula for biSizeImage:
+    //      ( ( ( ((DWORD)width*24) +31 ) & ~31 ) >> 3 ) * height;
+    lpDIBh->bmiHeader.biPlanes = 1;
+    lpDIBh->bmiHeader.biBitCount = 24;
+    lpDIBh->bmiHeader.biCompression = BI_RGB;
+    lpDIBh->bmiHeader.biClrUsed = 0;
+    // These seem not really needed for our purpose here.
+    lpDIBh->bmiHeader.biClrImportant = 0;
+    lpDIBh->bmiHeader.biXPelsPerMeter = 0;
+    lpDIBh->bmiHeader.biYPelsPerMeter = 0;
+    // memory for DIB data
+    unsigned char *lpBits;
+    lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage );
+    if( !lpBits )
+    {
+        wxFAIL_MSG( wxT("could not allocate memory for DIB") );
+        free( lpDIBh );
+        return FALSE;
+    }

 
 

-bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette)
-{
-  wxBitmapHandler *handler = FindHandler(type);
+    // create and set the device-dependent bitmap
+    HDC hdc = ::GetDC(NULL);
+    HDC memdc = ::CreateCompatibleDC( hdc );
+    HBITMAP hbitmap;
+    hbitmap = ::CreateCompatibleBitmap( hdc, width, bmpHeight );
+    ::SelectObject( memdc, hbitmap);

 
 

-#if 0
-  if ( handler == NULL )
-    return FALSE;
-#else
-  if ( handler == NULL ) { // try wxImage
-    wxImage image( *this );
-    if (image.Ok()) return image.SaveFile( filename, type );
-    else return FALSE;
-  }
-#endif
+    HPALETTE hOldPalette = 0;
+    if (image.GetPalette().Ok())
+    {
+        hOldPalette = ::SelectPalette(memdc, (HPALETTE) image.GetPalette().GetHPALETTE(), FALSE);
+        ::RealizePalette(memdc);
+    }

 
 

-  return handler->SaveFile(this, filename, type, palette);
-}
+    // copy image data into DIB data and then into DDB (in a loop)
+    unsigned char *data = image.GetData();
+    int i, j, n;
+    int origin = 0;
+    unsigned char *ptdata = data;
+    unsigned char *ptbits;

 
 

-void wxBitmap::SetWidth(int w)
-{
-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
+    for( n=0; n<numDIB; n++ )
+    {
+        if( numDIB > 1 && n == numDIB-1 && hRemain > 0 )
+        {
+            // redefine height and size of the (possibly) last smaller DIB
+            // memory is not reallocated
+            height = hRemain;
+            lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
+            lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
+        }
+        ptbits = lpBits;

 
 

-  M_BITMAPDATA->m_width = w;
-}
+        for( j=0; j<height; j++ )
+        {
+            for( i=0; i<width; i++ )
+            {
+                *(ptbits++) = *(ptdata+2);
+                *(ptbits++) = *(ptdata+1);
+                *(ptbits++) = *(ptdata  );
+                ptdata += 3;
+            }
+            for( i=0; i< padding; i++ )   *(ptbits++) = 0;
+        }
+        ::StretchDIBits( memdc, 0, origin, width, height,\
+            0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
+        origin += height;
+        // if numDIB = 1,  lines below can also be used
+        //    hbitmap = CreateDIBitmap( hdc, &(lpDIBh->bmiHeader), CBM_INIT, lpBits, lpDIBh, DIB_RGB_COLORS );
+        // The above line is equivalent to the following two lines.
+        //    hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
+        //    ::SetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS);
+        // or the following lines
+        //    hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
+        //    HDC memdc = ::CreateCompatibleDC( hdc );
+        //    ::SelectObject( memdc, hbitmap);
+        //    ::SetDIBitsToDevice( memdc, 0, 0, width, height,
+        //            0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS);
+        //    ::SelectObject( memdc, 0 );
+        //    ::DeleteDC( memdc );
+    }
+    SetHBITMAP( (WXHBITMAP) hbitmap );

 
 

-void wxBitmap::SetHeight(int h)
-{
-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
+    if (hOldPalette)
+        SelectPalette(memdc, hOldPalette, FALSE);

 
 

-  M_BITMAPDATA->m_height = h;
-}
+    // similarly, created an mono-bitmap for the possible mask
+    if( image.HasMask() )
+    {
+        hbitmap = ::CreateBitmap( (WORD)width, (WORD)bmpHeight, 1, 1, NULL );
+        HGDIOBJ hbmpOld = ::SelectObject( memdc, hbitmap);
+        if( numDIB == 1 )   height = bmpHeight;
+        else                height = sizeLimit/bytePerLine;
+        lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
+        lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
+        origin = 0;
+        unsigned char r = image.GetMaskRed();
+        unsigned char g = image.GetMaskGreen();
+        unsigned char b = image.GetMaskBlue();
+        unsigned char zero = 0, one = 255;
+        ptdata = data;
+        for( n=0; n<numDIB; n++ )
+        {
+            if( numDIB > 1 && n == numDIB - 1 && hRemain > 0 )
+            {
+                // redefine height and size of the (possibly) last smaller DIB
+                // memory is not reallocated
+                height = hRemain;
+                lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
+                lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
+            }
+            ptbits = lpBits;
+            for( int j=0; j<height; j++ )
+            {
+                for(i=0; i<width; i++ )
+                {
+                    // was causing a code gen bug in cw : if( ( cr !=r) || (cg!=g) || (cb!=b) )
+                    unsigned char cr = (*(ptdata++)) ;
+                    unsigned char cg = (*(ptdata++)) ;
+                    unsigned char cb = (*(ptdata++)) ;
+
+                    if( ( cr !=r) || (cg!=g) || (cb!=b) )
+                    {
+                        *(ptbits++) = one;
+                        *(ptbits++) = one;
+                        *(ptbits++) = one;
+                    }
+                    else
+                    {
+                        *(ptbits++) = zero;
+                        *(ptbits++) = zero;
+                        *(ptbits++) = zero;
+                    }
+                }
+                for( i=0; i< padding; i++ )   *(ptbits++) = zero;
+            }
+            ::StretchDIBits( memdc, 0, origin, width, height,\
+                0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
+            origin += height;
+        }
+        // create a wxMask object
+        wxMask *mask = new wxMask();
+        mask->SetMaskBitmap( (WXHBITMAP) hbitmap );
+        SetMask( mask );
+        // It will be deleted when the wxBitmap object is deleted (as of 01/1999)
+        /* The following can also be used but is slow to run
+        wxColour colour( GetMaskRed(), GetMaskGreen(), GetMaskBlue());
+        wxMask *mask = new wxMask( *this, colour );
+        SetMask( mask );
+        */
+
+        ::SelectObject( memdc, hbmpOld );
+    }

 
 

-void wxBitmap::SetDepth(int d)
-{
-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
+    // free allocated resources
+    ::DeleteDC( memdc );
+    ::ReleaseDC(NULL, hdc);
+    free(lpDIBh);
+    free(lpBits);

 
 

-  M_BITMAPDATA->m_depth = d;
-}
+#if WXWIN_COMPATIBILITY_2
+    // check the wxBitmap object
+    GetBitmapData()->SetOk();
+#endif // WXWIN_COMPATIBILITY_2

 
 

-void wxBitmap::SetQuality(int q)
-{
-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

 
 

-  M_BITMAPDATA->m_quality = q;
+    return TRUE;
+#endif

 }
 
 }
 

-void wxBitmap::SetOk(bool isOk)
+wxImage wxBitmap::ConvertToImage() const

 {
 {

-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
+#ifdef __WXMICROWIN__
+    // TODO
+    return wxImage();
+#else
+    wxImage image;

 
 

-  M_BITMAPDATA->m_ok = isOk;
-}
+    wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );

 
 

-void wxBitmap::SetPalette(const wxPalette& palette)
-{
-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
+    // create an wxImage object
+    int width = GetWidth();
+    int height = GetHeight();
+    image.Create( width, height );
+    unsigned char *data = image.GetData();
+    if( !data )
+    {
+        wxFAIL_MSG( wxT("could not allocate data for image") );
+        return wxNullImage;
+    }

 
 

-  M_BITMAPDATA->m_bitmapPalette = palette ;
+    // calc the number of bytes per scanline and padding in the DIB
+    int bytePerLine = width*3;
+    int sizeDWORD = sizeof( DWORD );
+    int lineBoundary =  bytePerLine % sizeDWORD;
+    int padding = 0;
+    if( lineBoundary > 0 )
+    {
+        padding = sizeDWORD - lineBoundary;
+        bytePerLine += padding;
+    }
+
+    // create a DIB header
+    int headersize = sizeof(BITMAPINFOHEADER);
+    BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize );
+    if( !lpDIBh )
+    {
+        wxFAIL_MSG( wxT("could not allocate data for DIB header") );
+        free( data );
+        return wxNullImage;
+    }
+    // Fill in the DIB header
+    lpDIBh->bmiHeader.biSize = headersize;
+    lpDIBh->bmiHeader.biWidth = width;
+    lpDIBh->bmiHeader.biHeight = -height;
+    lpDIBh->bmiHeader.biSizeImage = bytePerLine * height;
+    lpDIBh->bmiHeader.biPlanes = 1;
+    lpDIBh->bmiHeader.biBitCount = 24;
+    lpDIBh->bmiHeader.biCompression = BI_RGB;
+    lpDIBh->bmiHeader.biClrUsed = 0;
+    // These seem not really needed for our purpose here.
+    lpDIBh->bmiHeader.biClrImportant = 0;
+    lpDIBh->bmiHeader.biXPelsPerMeter = 0;
+    lpDIBh->bmiHeader.biYPelsPerMeter = 0;
+    // memory for DIB data
+    unsigned char *lpBits;
+    lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
+    if( !lpBits )
+    {
+        wxFAIL_MSG( wxT("could not allocate data for DIB") );
+        free( data );
+        free( lpDIBh );
+        return wxNullImage;
+    }
+
+    // copy data from the device-dependent bitmap to the DIB
+    HDC hdc = ::GetDC(NULL);
+    HBITMAP hbitmap;
+    hbitmap = (HBITMAP) GetHBITMAP();
+    ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
+
+    // copy DIB data into the wxImage object
+    int i, j;
+    unsigned char *ptdata = data;
+    unsigned char *ptbits = lpBits;
+    for( i=0; i<height; i++ )
+    {
+        for( j=0; j<width; j++ )
+        {
+            *(ptdata++) = *(ptbits+2);
+            *(ptdata++) = *(ptbits+1);
+            *(ptdata++) = *(ptbits  );
+            ptbits += 3;
+        }
+        ptbits += padding;
+    }
+
+    // similarly, set data according to the possible mask bitmap
+    if( GetMask() && GetMask()->GetMaskBitmap() )
+    {
+        hbitmap = (HBITMAP) GetMask()->GetMaskBitmap();
+        // memory DC created, color set, data copied, and memory DC deleted
+        HDC memdc = ::CreateCompatibleDC( hdc );
+        ::SetTextColor( memdc, RGB( 0, 0, 0 ) );
+        ::SetBkColor( memdc, RGB( 255, 255, 255 ) );
+        ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
+        ::DeleteDC( memdc );
+        // background color set to RGB(16,16,16) in consistent with wxGTK
+        unsigned char r=16, g=16, b=16;
+        ptdata = data;
+        ptbits = lpBits;
+        for( i=0; i<height; i++ )
+        {
+            for( j=0; j<width; j++ )
+            {
+                if( *ptbits != 0 )
+                    ptdata += 3;
+                else
+                {
+                    *(ptdata++)  = r;
+                    *(ptdata++)  = g;
+                    *(ptdata++)  = b;
+                }
+                ptbits += 3;
+            }
+            ptbits += padding;
+        }
+        image.SetMaskColour( r, g, b );
+        image.SetMask( TRUE );
+    }
+    else
+    {
+        image.SetMask( FALSE );
+    }
+    // free allocated resources
+    ::ReleaseDC(NULL, hdc);
+    free(lpDIBh);
+    free(lpBits);
+
+    return image;
+#endif

 }
 
 }
 

-void wxBitmap::SetMask(wxMask *mask)
+#endif // wxUSE_IMAGE
+
+bool wxBitmap::LoadFile(const wxString& filename, long type)

 {
 {

-  if (!M_BITMAPDATA)
-  m_refData = new wxBitmapRefData;
+    UnRef();
+
+    wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
+
+    if ( handler )
+    {
+        m_refData = new wxBitmapRefData;
+
+        return handler->LoadFile(this, filename, type, -1, -1);
+    }
+#if wxUSE_IMAGE
+    else
+    {
+        wxImage image;
+        if ( image.LoadFile( filename, type ) && image.Ok() )
+        {
+            *this = image.ConvertToBitmap();
+
+            return TRUE;
+        }
+    }
+#endif // wxUSE_IMAGE

 
 

-  M_BITMAPDATA->m_bitmapMask = mask ;
+    return FALSE;

 }
 
 }
 

-void wxBitmap::SetHBITMAP(WXHBITMAP bmp)
+bool wxBitmap::Create(void *data, long type, int width, int height, int depth)

 {
 {

-  if (!M_BITMAPDATA)
+    UnRef();
+
+    wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
+
+    if ( !handler )
+    {
+        wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %d defined."), type);
+
+        return FALSE;
+    }
+

     m_refData = new wxBitmapRefData;
 
     m_refData = new wxBitmapRefData;
 

-  M_BITMAPDATA->m_hBitmap = bmp;
-  M_BITMAPDATA->m_ok = bmp != 0;
+    return handler->Create(this, data, type, width, height, depth);

 }
 
 }
 

-void wxBitmap::AddHandler(wxBitmapHandler *handler)
+bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette)

 {
 {

-  sm_handlers.Append(handler);
+    wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
+
+    if ( handler )
+    {
+        return handler->SaveFile(this, filename, type, palette);
+    }
+#if wxUSE_IMAGE
+    else
+    {
+        // FIXME what about palette? shouldn't we use it?
+        wxImage image( *this );
+        if ( image.Ok() )
+        {
+            return image.SaveFile(filename, type);
+        }
+    }
+#endif // wxUSE_IMAGE
+
+    return FALSE;

 }
 
 }
 

-void wxBitmap::InsertHandler(wxBitmapHandler *handler)
+// ----------------------------------------------------------------------------
+// sub bitmap extraction
+// ----------------------------------------------------------------------------
+
+wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const

 {
 {

-  sm_handlers.Insert(handler);
+#ifndef __WXMICROWIN__
+    wxCHECK_MSG( Ok() &&
+                 (rect.x >= 0) && (rect.y >= 0) &&
+                 (rect.x+rect.width <= GetWidth()) &&
+                 (rect.y+rect.height <= GetHeight()),
+                 wxNullBitmap, wxT("Invalid bitmap or bitmap region") );
+
+    wxBitmap ret( rect.width, rect.height, GetDepth() );
+    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+
+    // copy bitmap data
+    HDC dcSrc = ::CreateCompatibleDC(NULL);
+    HDC dcDst = ::CreateCompatibleDC(NULL);
+    SelectObject(dcSrc, (HBITMAP) GetHBITMAP());
+    SelectObject(dcDst, (HBITMAP) ret.GetHBITMAP());
+    BitBlt(dcDst, 0, 0, rect.width, rect.height, dcSrc, rect.x, rect.y, SRCCOPY);
+
+    // copy mask if there is one
+    if (GetMask())
+    {
+        HBITMAP hbmpMask = ::CreateBitmap(rect.width, rect.height, 1, 1, 0);
+
+        SelectObject(dcSrc, (HBITMAP) GetMask()->GetMaskBitmap());
+        SelectObject(dcDst, (HBITMAP) hbmpMask);
+        BitBlt(dcDst, 0, 0, rect.width, rect.height, dcSrc, rect.x, rect.y, SRCCOPY);
+
+        wxMask *mask = new wxMask((WXHBITMAP) hbmpMask);
+        ret.SetMask(mask);
+    }
+
+    SelectObject(dcDst, NULL);
+    SelectObject(dcSrc, NULL);
+    DeleteDC(dcDst);
+    DeleteDC(dcSrc);
+
+    return ret;
+#else
+    return wxBitmap();
+#endif

 }
 
 }
 

-bool wxBitmap::RemoveHandler(const wxString& name)
+// ----------------------------------------------------------------------------
+// wxBitmap accessors
+// ----------------------------------------------------------------------------
+
+void wxBitmap::SetQuality(int q)

 {
 {

-  wxBitmapHandler *handler = FindHandler(name);
-  if ( handler )
-  {
-    sm_handlers.DeleteObject(handler);
-    return TRUE;
-  }
-  else
-    return FALSE;
+    EnsureHasData();
+
+    GetBitmapData()->m_quality = q;

 }
 
 }
 

-wxBitmapHandler *wxBitmap::FindHandler(const wxString& name)
+#if WXWIN_COMPATIBILITY_2
+void wxBitmap::SetOk(bool isOk)

 {
 {

-  wxNode *node = sm_handlers.First();
-  while ( node )
-  {
-    wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-    if ( (handler->GetName().Cmp(name) == 0) )
-      return handler;
-    node = node->Next();
-  }
-  return NULL;
+    EnsureHasData();
+
+    GetBitmapData()->m_ok = isOk;

 }
 }

+#endif // WXWIN_COMPATIBILITY_2

 
 

-wxBitmapHandler *wxBitmap::FindHandler(const wxString& extension, long bitmapType)
+void wxBitmap::SetPalette(const wxPalette& palette)

 {
 {

-  wxNode *node = sm_handlers.First();
-  while ( node )
-  {
-    wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-    if ( (handler->GetExtension().Cmp(extension) == 0) &&
-          (bitmapType == -1 || (handler->GetType() == bitmapType)) )
-      return handler;
-    node = node->Next();
-  }
-  return NULL;
+    EnsureHasData();
+
+    GetBitmapData()->m_bitmapPalette = palette;

 }
 
 }
 

-wxBitmapHandler *wxBitmap::FindHandler(long bitmapType)
+void wxBitmap::SetMask(wxMask *mask)

 {
 {

-  wxNode *node = sm_handlers.First();
-  while ( node )
-  {
-    wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-    if (handler->GetType() == bitmapType)
-      return handler;
-    node = node->Next();
-  }
-  return NULL;
-}
+    EnsureHasData();

 
 

-// New Create/FreeDIB functions since ones in dibutils.cpp are confusing
-static long createDIB(long xSize, long ySize, long bitsPerPixel,
-                       HPALETTE hPal, LPBITMAPINFO* lpDIBHeader);
-static long freeDIB(LPBITMAPINFO lpDIBHeader);
+    GetBitmapData()->m_bitmapMask = mask;
+}

 
 // Creates a bitmap that matches the device context, from
 // an arbitray bitmap. At present, the original bitmap must have an
 
 // Creates a bitmap that matches the device context, from
 // an arbitray bitmap. At present, the original bitmap must have an


@@ -469,27 +902,21 @@ static long freeDIB(LPBITMAPINFO lpDIBHeader);
 // Contributed by Frederic Villeneuve <frederic.villeneuve@natinst.com>
 wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const
 {
 // Contributed by Frederic Villeneuve <frederic.villeneuve@natinst.com>
 wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const
 {

+#ifdef __WXMICROWIN__
+    return wxBitmap();
+#else

     wxMemoryDC      memDC;
     wxMemoryDC      memDC;

-    wxBitmap        tmpBitmap(this->GetWidth(), this->GetHeight(), dc.GetDepth());
+    wxBitmap        tmpBitmap(GetWidth(), GetHeight(), dc.GetDepth());

     HPALETTE        hPal = (HPALETTE) NULL;
     LPBITMAPINFO    lpDib;
     void            *lpBits = (void*) NULL;
 
     HPALETTE        hPal = (HPALETTE) NULL;
     LPBITMAPINFO    lpDib;
     void            *lpBits = (void*) NULL;
 

-/*
-    wxASSERT( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != 0) );
-
-    tmpBitmap.SetPalette(this->GetPalette());
-    memDC.SelectObject(tmpBitmap);
-    memDC.SetPalette(this->GetPalette());
-
-    hPal = (HPALETTE) this->GetPalette()->GetHPALETTE();
-*/
-    if( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != 0) )
+    if( GetPalette() && GetPalette()->Ok() )

     {
     {

-        tmpBitmap.SetPalette(* this->GetPalette());
+        tmpBitmap.SetPalette(*GetPalette());

         memDC.SelectObject(tmpBitmap);
         memDC.SelectObject(tmpBitmap);

-        memDC.SetPalette(* this->GetPalette());
-        hPal = (HPALETTE) this->GetPalette()->GetHPALETTE();
+        memDC.SetPalette(*GetPalette());
+        hPal = (HPALETTE)GetPalette()->GetHPALETTE();

     }
     else
     {
     }
     else
     {


@@ -501,25 +928,33 @@ wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const
         memDC.SetPalette( palette );
     }
 
         memDC.SetPalette( palette );
     }
 

-    // set the height negative because in a DIB the order of the lines is reversed
-    createDIB(this->GetWidth(), -this->GetHeight(), this->GetDepth(), hPal, &lpDib);
+    // set the height negative because in a DIB the order of the lines is
+    // reversed
+    if ( !wxCreateDIB(GetWidth(), -GetHeight(), GetDepth(), hPal, &lpDib) )
+    {
+        return wxNullBitmap;
+    }

 
     lpBits = malloc(lpDib->bmiHeader.biSizeImage);
 
 
     lpBits = malloc(lpDib->bmiHeader.biSizeImage);
 

-    ::GetBitmapBits((HBITMAP)GetHBITMAP(), lpDib->bmiHeader.biSizeImage, lpBits);
+    ::GetBitmapBits(GetHbitmap(), lpDib->bmiHeader.biSizeImage, lpBits);

 
 

-    ::SetDIBitsToDevice((HDC) memDC.GetHDC(), 0, 0, this->GetWidth(), this->GetHeight(),
-                        0, 0, 0, this->GetHeight(), lpBits, lpDib, DIB_RGB_COLORS);
+    ::SetDIBitsToDevice(GetHdcOf(memDC), 0, 0,
+                        GetWidth(), GetHeight(),
+                        0, 0, 0, GetHeight(),
+                        lpBits, lpDib, DIB_RGB_COLORS);

 
     free(lpBits);
 
 
     free(lpBits);
 

-    freeDIB(lpDib);
-    return (tmpBitmap);
+    wxFreeDIB(lpDib);
+
+    return tmpBitmap;
+#endif

 }
 
 }
 

-/*
- * wxMask
- */
+// ----------------------------------------------------------------------------
+// wxMask
+// ----------------------------------------------------------------------------

 
 wxMask::wxMask()
 {
 
 wxMask::wxMask()
 {


@@ -531,7 +966,7 @@ wxMask::wxMask()
 wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)
 {
     m_maskBitmap = 0;
 wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)
 {
     m_maskBitmap = 0;

-  Create(bitmap, colour);
+    Create(bitmap, colour);

 }
 
 // Construct a mask from a bitmap and a palette index indicating
 }
 
 // Construct a mask from a bitmap and a palette index indicating


@@ -539,14 +974,14 @@ wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)
 wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex)
 {
     m_maskBitmap = 0;
 wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex)
 {
     m_maskBitmap = 0;

-  Create(bitmap, paletteIndex);
+    Create(bitmap, paletteIndex);

 }
 
 // Construct a mask from a mono bitmap (copies the bitmap).
 wxMask::wxMask(const wxBitmap& bitmap)
 {
     m_maskBitmap = 0;
 }
 
 // Construct a mask from a mono bitmap (copies the bitmap).
 wxMask::wxMask(const wxBitmap& bitmap)
 {
     m_maskBitmap = 0;

-  Create(bitmap);
+    Create(bitmap);

 }
 
 wxMask::~wxMask()
 }
 
 wxMask::~wxMask()


@@ -558,30 +993,34 @@ wxMask::~wxMask()
 // Create a mask from a mono bitmap (copies the bitmap).
 bool wxMask::Create(const wxBitmap& bitmap)
 {
 // Create a mask from a mono bitmap (copies the bitmap).
 bool wxMask::Create(const wxBitmap& bitmap)
 {

+#ifndef __WXMICROWIN__
+    wxCHECK_MSG( bitmap.Ok() && bitmap.GetDepth() == 1, FALSE,
+                 _T("can't create mask from invalid or not monochrome bitmap") );
+

     if ( m_maskBitmap )
     if ( m_maskBitmap )

-  {
-    ::DeleteObject((HBITMAP) m_maskBitmap);
-    m_maskBitmap = 0;
-  }
-  if (!bitmap.Ok() || bitmap.GetDepth() != 1)
-  {
+    {
+        ::DeleteObject((HBITMAP) m_maskBitmap);
+        m_maskBitmap = 0;
+    }
+
+    m_maskBitmap = (WXHBITMAP) CreateBitmap(
+                                            bitmap.GetWidth(),
+                                            bitmap.GetHeight(),
+                                            1, 1, 0
+                                           );
+    HDC srcDC = CreateCompatibleDC(0);
+    SelectObject(srcDC, (HBITMAP) bitmap.GetHBITMAP());
+    HDC destDC = CreateCompatibleDC(0);
+    SelectObject(destDC, (HBITMAP) m_maskBitmap);
+    BitBlt(destDC, 0, 0, bitmap.GetWidth(), bitmap.GetHeight(), srcDC, 0, 0, SRCCOPY);
+    SelectObject(srcDC, 0);
+    DeleteDC(srcDC);
+    SelectObject(destDC, 0);
+    DeleteDC(destDC);
+    return TRUE;
+#else

     return FALSE;
     return FALSE;

-  }
-  m_maskBitmap = (WXHBITMAP) CreateBitmap(
-          bitmap.GetWidth(),
-          bitmap.GetHeight(),
-          1, 1, 0
-          );
-  HDC srcDC = CreateCompatibleDC(0);
-  SelectObject(srcDC, (HBITMAP) bitmap.GetHBITMAP());
-  HDC destDC = CreateCompatibleDC(0);
-  SelectObject(destDC, (HBITMAP) m_maskBitmap);
-  BitBlt(destDC, 0, 0, bitmap.GetWidth(), bitmap.GetHeight(), srcDC, 0, 0, SRCCOPY);
-  SelectObject(srcDC, 0);
-  DeleteDC(srcDC);
-  SelectObject(destDC, 0);
-  DeleteDC(destDC);
-  return TRUE;
+#endif

 }
 
 // Create a mask from a bitmap and a palette index indicating
 }
 
 // Create a mask from a bitmap and a palette index indicating


@@ -589,229 +1028,178 @@ bool wxMask::Create(const wxBitmap& bitmap)
 bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
 {
     if ( m_maskBitmap )
 bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
 {
     if ( m_maskBitmap )

-  {
-    ::DeleteObject((HBITMAP) m_maskBitmap);
-    m_maskBitmap = 0;
-  }
-  if (bitmap.Ok() && bitmap.GetPalette()->Ok())
-  {
-    unsigned char red, green, blue;
-    if (bitmap.GetPalette()->GetRGB(paletteIndex, &red, &green, &blue))

     {
     {

-      wxColour transparentColour(red, green, blue);
-      return Create(bitmap, transparentColour);
+        ::DeleteObject((HBITMAP) m_maskBitmap);
+        m_maskBitmap = 0;

     }
     }

-  }
-  return FALSE;
+    if (bitmap.Ok() && bitmap.GetPalette()->Ok())
+    {
+        unsigned char red, green, blue;
+        if (bitmap.GetPalette()->GetRGB(paletteIndex, &red, &green, &blue))
+        {
+            wxColour transparentColour(red, green, blue);
+            return Create(bitmap, transparentColour);
+        }
+    }
+    return FALSE;

 }
 
 // Create a mask from a bitmap and a colour indicating
 // the transparent area
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
 }
 
 // Create a mask from a bitmap and a colour indicating
 // the transparent area
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {

+#ifndef __WXMICROWIN__
+    wxCHECK_MSG( bitmap.Ok(), FALSE, _T("invalid bitmap in wxMask::Create") );
+

     if ( m_maskBitmap )
     if ( m_maskBitmap )

-  {
-    ::DeleteObject((HBITMAP) m_maskBitmap);
-    m_maskBitmap = 0;
-  }
-  if (!bitmap.Ok())
-  {
-    return FALSE;
-  }
-
-  // scan the bitmap for the transparent colour and set
-  // the corresponding pixels in the mask to BLACK and
-  // the rest to WHITE
-  COLORREF maskColour = RGB(colour.Red(), colour.Green(), colour.Blue());
-  m_maskBitmap = (WXHBITMAP) ::CreateBitmap(
-          bitmap.GetWidth(),
-          bitmap.GetHeight(),
-          1, 1, 0
-          );
-  HDC srcDC = ::CreateCompatibleDC(0);
-  ::SelectObject(srcDC, (HBITMAP) bitmap.GetHBITMAP());
-  HDC destDC = ::CreateCompatibleDC(0);
-  ::SelectObject(destDC, (HBITMAP) m_maskBitmap);
-
-  // this is not very efficient, but I can't think
-  // of a better way of doing it
-  for (int w = 0; w < bitmap.GetWidth(); w++)
-  {
-    for (int h = 0; h < bitmap.GetHeight(); h++)
-    {
-      COLORREF col = GetPixel(srcDC, w, h);
-      if (col == maskColour)
-      {
-        ::SetPixel(destDC, w, h, RGB(0, 0, 0));
-      }
-      else
-      {
-        ::SetPixel(destDC, w, h, RGB(255, 255, 255));
-      }
-    }
-  }
-  ::SelectObject(srcDC, 0);
-  ::DeleteDC(srcDC);
-  ::SelectObject(destDC, 0);
-  ::DeleteDC(destDC);
-  return TRUE;
-}
-
-/*
- * wxBitmapHandler
- */
+    {
+        ::DeleteObject((HBITMAP) m_maskBitmap);
+        m_maskBitmap = 0;
+    }

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
+    int width = bitmap.GetWidth(),
+        height = bitmap.GetHeight();

 
 

-bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap), void *WXUNUSED(data), long WXUNUSED(type), int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth))
-{
-  return FALSE;
-}
+    // scan the bitmap for the transparent colour and set the corresponding
+    // pixels in the mask to BLACK and the rest to WHITE
+    COLORREF maskColour = wxColourToRGB(colour);
+    m_maskBitmap = (WXHBITMAP)::CreateBitmap(width, height, 1, 1, 0);

 
 

-bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), long WXUNUSED(type),
-    int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
-{
-  return FALSE;
-}
+    HDC srcDC = ::CreateCompatibleDC(NULL);
+    HDC destDC = ::CreateCompatibleDC(NULL);
+    if ( !srcDC || !destDC )
+    {
+        wxLogLastError(wxT("CreateCompatibleDC"));
+    }

 
 

-bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), int WXUNUSED(type), const wxPalette *WXUNUSED(palette))
-{
-  return FALSE;
-}
+    bool ok = TRUE;

 
 

-/*
- * Standard handlers
- */
+    // SelectObject() will fail
+    wxASSERT_MSG( !bitmap.GetSelectedInto(),
+                  _T("bitmap can't be selected in another DC") );

 
 

-class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler)
-public:
-  inline wxBMPResourceHandler()
-  {
-  m_name = "Windows bitmap resource";
-  m_extension = "";
-  m_type = wxBITMAP_TYPE_BMP_RESOURCE;
-  };
+    HGDIOBJ hbmpSrcOld = ::SelectObject(srcDC, GetHbitmapOf(bitmap));
+    if ( !hbmpSrcOld )
+    {
+        wxLogLastError(wxT("SelectObject"));

 
 

-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-      int desiredWidth, int desiredHeight);
-};
-IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
+        ok = FALSE;
+    }

 
 

-bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
-    int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
-{
-    // TODO: load colourmap.
-    M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ::LoadBitmap(wxGetInstance(), name);
-    if (M_BITMAPHANDLERDATA->m_hBitmap)
+    HGDIOBJ hbmpDstOld = ::SelectObject(destDC, (HBITMAP)m_maskBitmap);
+    if ( !hbmpDstOld )

     {
     {

-        M_BITMAPHANDLERDATA->m_ok = TRUE;
-        BITMAP bm;
-        GetObject((HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap, sizeof(BITMAP), (LPSTR) &bm);
-        M_BITMAPHANDLERDATA->m_width = bm.bmWidth;
-        M_BITMAPHANDLERDATA->m_height = bm.bmHeight;
-        M_BITMAPHANDLERDATA->m_depth = bm.bmBitsPixel;
+        wxLogLastError(wxT("SelectObject"));
+
+        ok = FALSE;
+    }

 
 

-        if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) )
+    // this is not very efficient, but I can't think of a better way of doing
+    // it
+    for ( int w = 0; ok && (w < width); w++ )
+    {
+        for ( int h = 0; ok && (h < height); h++ )

         {
         {

+            COLORREF col = GetPixel(srcDC, w, h);
+            if ( col == CLR_INVALID )
+            {
+                wxLogLastError(wxT("GetPixel"));
+
+                // doesn't make sense to continue
+                ok = FALSE;
+
+                break;
+            }
+
+            if ( col == maskColour )
+            {
+                ::SetPixel(destDC, w, h, RGB(0, 0, 0));
+            }
+            else
+            {
+                ::SetPixel(destDC, w, h, RGB(255, 255, 255));
+            }

         }
         }

-
-        return TRUE;

     }
 
     }
 

-  // it's probably not found
-  wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."), name.c_str());
+    ::SelectObject(srcDC, hbmpSrcOld);
+    ::DeleteDC(srcDC);
+    ::SelectObject(destDC, hbmpDstOld);
+    ::DeleteDC(destDC);

 
 

-  return FALSE;
+    return ok;
+#else
+    return FALSE;
+#endif

 }
 
 }
 

-class WXDLLEXPORT wxBMPFileHandler: public wxBitmapHandler
+// ----------------------------------------------------------------------------
+// wxBitmapHandler
+// ----------------------------------------------------------------------------
+
+bool wxBitmapHandler::Create(wxGDIImage *image,
+                             void *data,
+                             long flags,
+                             int width, int height, int depth)

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)
-public:
-  inline wxBMPFileHandler()
-  {
-  m_name = "Windows bitmap file";
-  m_extension = "bmp";
-  m_type = wxBITMAP_TYPE_BMP;
-  };
+    wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);

 
 

-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-      int desiredWidth, int desiredHeight);
-  virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
-};
-IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
+    return bitmap ? Create(bitmap, data, flags, width, height, depth) : FALSE;
+}

 
 

-bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
-    int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
+bool wxBitmapHandler::Load(wxGDIImage *image,
+                           const wxString& name,
+                           long flags,
+                           int width, int height)

 {
 {

-#if wxUSE_IMAGE_LOADING_IN_MSW
-    wxPalette *palette = NULL;
-    bool success = FALSE;
-/*
-    if (type & wxBITMAP_DISCARD_COLOURMAP)
-      success = wxLoadIntoBitmap(WXSTRINGCAST name, bitmap);
-    else
-*/
-    success = (wxLoadIntoBitmap(WXSTRINGCAST name, bitmap, &palette) != 0);
-    if (!success && palette)
-    {
-      delete palette;
-      palette = NULL;
-    }
-    if (palette)
-    {
-        M_BITMAPHANDLERDATA->m_bitmapPalette = *palette;
-        delete palette;
-    }
-    return success;
-#else
-  return FALSE;
-#endif
+    wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
+
+    return bitmap ? LoadFile(bitmap, name, flags, width, height) : FALSE;

 }
 
 }
 

-bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int WXUNUSED(type), const wxPalette *pal)
+bool wxBitmapHandler::Save(wxGDIImage *image,
+                           const wxString& name,
+                           int type)

 {
 {

-#if wxUSE_IMAGE_LOADING_IN_MSW
-    wxPalette *actualPalette = (wxPalette *)pal;
-    if (!actualPalette && (!M_BITMAPHANDLERDATA->m_bitmapPalette.IsNull()))
-      actualPalette = & (M_BITMAPHANDLERDATA->m_bitmapPalette);
-    return (wxSaveBitmap(WXSTRINGCAST name, bitmap, actualPalette) != 0);
-#else
-  return FALSE;
-#endif
+    wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
+
+    return bitmap ? SaveFile(bitmap, name, type) : FALSE;

 }
 
 }
 

-void wxBitmap::CleanUpHandlers()
+bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap),
+                             void *WXUNUSED(data),
+                             long WXUNUSED(type),
+                             int WXUNUSED(width),
+                             int WXUNUSED(height),
+                             int WXUNUSED(depth))

 {
 {

-  wxNode *node = sm_handlers.First();
-  while ( node )
-  {
-    wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-    wxNode *next = node->Next();
-    delete handler;
-    delete node;
-    node = next;
-  }
+    return FALSE;

 }
 
 }
 

-void wxBitmap::InitStandardHandlers()
+bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap),
+                               const wxString& WXUNUSED(name),
+                               long WXUNUSED(type),
+                               int WXUNUSED(desiredWidth),
+                               int WXUNUSED(desiredHeight))

 {
 {

-  AddHandler(new wxBMPResourceHandler);
-  AddHandler(new wxBMPFileHandler);
-
-  // Not added by default: include xpmhand.h in your app
-  // and call these in your wxApp::OnInit.
-//  AddHandler(new wxXPMFileHandler);
-//  AddHandler(new wxXPMDataHandler);
+    return FALSE;
+}

 
 

-  AddHandler(new wxICOResourceHandler);
-  AddHandler(new wxICOFileHandler);
+bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap),
+                               const wxString& WXUNUSED(name),
+                               int WXUNUSED(type),
+                               const wxPalette *WXUNUSED(palette))
+{
+    return FALSE;

 }
 
 }
 

-static long createDIB(long xSize, long ySize, long bitsPerPixel,
-                       HPALETTE hPal, LPBITMAPINFO* lpDIBHeader)
+// ----------------------------------------------------------------------------
+// DIB functions
+// ----------------------------------------------------------------------------
+
+#ifndef __WXMICROWIN__
+bool wxCreateDIB(long xSize, long ySize, long bitsPerPixel,
+                 HPALETTE hPal, LPBITMAPINFO* lpDIBHeader)

 {
    unsigned long   i, headerSize;
    LPBITMAPINFO    lpDIBheader = NULL;
 {
    unsigned long   i, headerSize;
    LPBITMAPINFO    lpDIBheader = NULL;


@@ -825,10 +1213,8 @@ static long createDIB(long xSize, long ySize, long bitsPerPixel,
 
    GetPaletteEntries(hPal, 0, 256, lpPe);
 
 
    GetPaletteEntries(hPal, 0, 256, lpPe);
 

-

    memset(lpDIBheader, 0x00, sizeof(BITMAPINFOHEADER));
 
    memset(lpDIBheader, 0x00, sizeof(BITMAPINFOHEADER));
 

-

    // Fill in the static parts of the DIB header
    lpDIBheader->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
    lpDIBheader->bmiHeader.biWidth = xSize;
    // Fill in the static parts of the DIB header
    lpDIBheader->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
    lpDIBheader->bmiHeader.biWidth = xSize;


@@ -838,8 +1224,7 @@ static long createDIB(long xSize, long ySize, long bitsPerPixel,
    // this value must be 1, 4, 8 or 24 so PixelDepth can only be
    lpDIBheader->bmiHeader.biBitCount = (WORD)(bitsPerPixel);
    lpDIBheader->bmiHeader.biCompression = BI_RGB;
    // this value must be 1, 4, 8 or 24 so PixelDepth can only be
    lpDIBheader->bmiHeader.biBitCount = (WORD)(bitsPerPixel);
    lpDIBheader->bmiHeader.biCompression = BI_RGB;

-   lpDIBheader->bmiHeader.biSizeImage = xSize * abs(ySize) * bitsPerPixel >>
-3;
+   lpDIBheader->bmiHeader.biSizeImage = xSize * abs(ySize) * bitsPerPixel >> 3;

    lpDIBheader->bmiHeader.biClrUsed = 256;
 
 
    lpDIBheader->bmiHeader.biClrUsed = 256;
 
 


@@ -853,21 +1238,60 @@ static long createDIB(long xSize, long ySize, long bitsPerPixel,
 
    *lpDIBHeader = lpDIBheader;
 
 
    *lpDIBHeader = lpDIBheader;
 

-
-   return (0);
-
+   return TRUE;

 }
 
 }
 

+void wxFreeDIB(LPBITMAPINFO lpDIBHeader)
+{
+    free(lpDIBHeader);
+}
+#endif

 
 

+// ----------------------------------------------------------------------------
+// other helper functions
+// ----------------------------------------------------------------------------

 
 

-static long freeDIB(LPBITMAPINFO lpDIBHeader)
+extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)

 {
 {

+#ifndef __WXMICROWIN__
+    wxCHECK_MSG( hbmpMask, 0, _T("invalid bitmap in wxInvertMask") );

 
 

-   if (lpDIBHeader != NULL) {
-      free(lpDIBHeader);
-   }
+    // get width/height from the bitmap if not given
+    if ( !w || !h )
+    {
+        BITMAP bm;
+        ::GetObject(hbmpMask, sizeof(BITMAP), (LPVOID)&bm);
+        w = bm.bmWidth;
+        h = bm.bmHeight;
+    }

 
 

-   return (0);
-}
+    HDC hdcSrc = ::CreateCompatibleDC(NULL);
+    HDC hdcDst = ::CreateCompatibleDC(NULL);
+    if ( !hdcSrc || !hdcDst )
+    {
+        wxLogLastError(wxT("CreateCompatibleDC"));
+    }
+
+    HBITMAP hbmpInvMask = ::CreateBitmap(w, h, 1, 1, 0);
+    if ( !hbmpInvMask )
+    {
+        wxLogLastError(wxT("CreateBitmap"));
+    }
+
+    ::SelectObject(hdcSrc, hbmpMask);
+    ::SelectObject(hdcDst, hbmpInvMask);
+    if ( !::BitBlt(hdcDst, 0, 0, w, h,
+                   hdcSrc, 0, 0,
+                   NOTSRCCOPY) )
+    {
+        wxLogLastError(wxT("BitBlt"));
+    }

 
 

+    ::DeleteDC(hdcSrc);
+    ::DeleteDC(hdcDst);

 
 

+    return hbmpInvMask;
+#else
+    return 0;
+#endif
+}