X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..520e470fdd0daef09c77938db642e4583933c90d:/src/msw/bitmap.cpp

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index e535b7c0b3..44099f7598 100644
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -32,11 +32,13 @@
 #endif
 
 #include "wx/msw/private.h"
+#include "wx/log.h"
+
 #include "assert.h"
 
-#if USE_XPM_IN_MSW
+#if wxUSE_XPM_IN_MSW
 #define FOR_MSW 1
-#include "..\..\contrib\wxxpm\libxpm.34b\lib\xpm34.h"
+#include "../../contrib/wxxpm/libxpm.34b/lib/xpm34.h"
 #endif
 
 #include "wx/msw/dib.h"
@@ -82,8 +84,6 @@ wxList wxBitmap::sm_handlers;
 
 wxBitmap::wxBitmap(void)
 {
-  m_refData = NULL; // new wxBitmapRefData;
-
   if ( wxTheBitmapList )
     wxTheBitmapList->AddBitmap(this);
 }
@@ -97,7 +97,7 @@ wxBitmap::~wxBitmap(void)
 bool wxBitmap::FreeResource(bool force)
 {
   if ( !M_BITMAPDATA )
-	return FALSE;
+  return FALSE;
 
   if (M_BITMAPDATA->m_selectedInto)
   {
@@ -122,7 +122,7 @@ bool wxBitmap::FreeResource(bool force)
 }
 
 
-wxBitmap::wxBitmap(const char bits[], const int the_width, const int the_height, const int no_bits)
+wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
 {
   m_refData = new wxBitmapRefData;
 
@@ -131,7 +131,7 @@ wxBitmap::wxBitmap(const char bits[], const int the_width, const int the_height,
   M_BITMAPDATA->m_depth = no_bits ;
   M_BITMAPDATA->m_numColors = 0;
 
-  M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateBitmap(the_width, the_height, no_bits, 1, bits);
+  M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateBitmap(the_width, the_height, 1, no_bits, bits);
 
   if (M_BITMAPDATA->m_hBitmap)
     M_BITMAPDATA->m_ok = TRUE;
@@ -144,7 +144,7 @@ wxBitmap::wxBitmap(const char bits[], const int the_width, const int the_height,
     wxTheBitmapList->AddBitmap(this);
 }
 
-wxBitmap::wxBitmap(const int w, const int h, const int d)
+wxBitmap::wxBitmap(int w, int h, int d)
 {
   (void)Create(w, h, d);
 
@@ -152,7 +152,7 @@ wxBitmap::wxBitmap(const int w, const int h, const int d)
     wxTheBitmapList->AddBitmap(this);
 }
 
-wxBitmap::wxBitmap(void *data, const long type, const int width, const int height, const int depth)
+wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
 {
   (void) Create(data, type, width, height, depth);
 
@@ -160,7 +160,7 @@ wxBitmap::wxBitmap(void *data, const long type, const int width, const int heigh
     wxTheBitmapList->AddBitmap(this);
 }
 
-wxBitmap::wxBitmap(const wxString& filename, const long type)
+wxBitmap::wxBitmap(const wxString& filename, long type)
 {
   LoadFile(filename, (int)type);
 
@@ -168,15 +168,15 @@ wxBitmap::wxBitmap(const wxString& filename, const long type)
     wxTheBitmapList->AddBitmap(this);
 }
 
-#if USE_XPM_IN_MSW
+#if wxUSE_XPM_IN_MSW
 // Create from data
 wxBitmap::wxBitmap(const char **data, wxItem *WXUNUSED(anItem))
 {
-	(void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+  (void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
 #endif
 
-bool wxBitmap::Create(const int w, const int h, const int d)
+bool wxBitmap::Create(int w, int h, int d)
 {
   UnRef();
 
@@ -188,7 +188,7 @@ bool wxBitmap::Create(const int w, const int h, const int d)
 
   if (d > 0)
   {
-    M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateBitmap(w, h, d, 1, NULL);
+    M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateBitmap(w, h, 1, d, NULL);
   }
   else
   {
@@ -204,7 +204,7 @@ bool wxBitmap::Create(const int w, const int h, const int d)
   return M_BITMAPDATA->m_ok;
 }
 
-bool wxBitmap::LoadFile(const wxString& filename, const long type)
+bool wxBitmap::LoadFile(const wxString& filename, long type)
 {
   UnRef();
 
@@ -212,13 +212,16 @@ bool wxBitmap::LoadFile(const wxString& filename, const long type)
 
   wxBitmapHandler *handler = FindHandler(type);
 
-  if ( handler )
-	return handler->LoadFile(this, filename, type, -1, -1);
-  else
-	return FALSE;
+  if ( handler == NULL ) {
+    wxLogWarning("no bitmap handler for type %d defined.", type);
+
+    return FALSE;
+  }
+
+  return handler->LoadFile(this, filename, type, -1, -1);
 }
 
-bool wxBitmap::Create(void *data, const long type, const int width, const int height, const int depth)
+bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
 {
   UnRef();
 
@@ -226,26 +229,32 @@ bool wxBitmap::Create(void *data, const long type, const int width, const int he
 
   wxBitmapHandler *handler = FindHandler(type);
 
-  if ( handler )
-	return handler->Create(this, data, type, width, height, depth);
-  else
-	return FALSE;
+  if ( handler == NULL ) {
+    wxLogWarning("no bitmap handler for type %d defined.", type);
+
+    return FALSE;
+  }
+
+  return handler->Create(this, data, type, width, height, depth);
 }
 
-bool wxBitmap::SaveFile(const wxString& filename, const int type, const wxPalette *palette)
+bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette)
 {
   wxBitmapHandler *handler = FindHandler(type);
 
-  if ( handler )
-	return handler->SaveFile(this, filename, type, palette);
-  else
-	return FALSE;
+  if ( handler == NULL ) {
+    wxLogWarning("no bitmap handler for type %d defined.", type);
+
+    return FALSE;
+  }
+
+  return handler->SaveFile(this, filename, type, palette);
 }
 
 void wxBitmap::SetWidth(int w)
 {
   if (!M_BITMAPDATA)
-	m_refData = new wxBitmapRefData;
+  m_refData = new wxBitmapRefData;
 
   M_BITMAPDATA->m_width = w;
 }
@@ -253,7 +262,7 @@ void wxBitmap::SetWidth(int w)
 void wxBitmap::SetHeight(int h)
 {
   if (!M_BITMAPDATA)
-	m_refData = new wxBitmapRefData;
+  m_refData = new wxBitmapRefData;
 
   M_BITMAPDATA->m_height = h;
 }
@@ -261,7 +270,7 @@ void wxBitmap::SetHeight(int h)
 void wxBitmap::SetDepth(int d)
 {
   if (!M_BITMAPDATA)
-	m_refData = new wxBitmapRefData;
+  m_refData = new wxBitmapRefData;
 
   M_BITMAPDATA->m_depth = d;
 }
@@ -269,7 +278,7 @@ void wxBitmap::SetDepth(int d)
 void wxBitmap::SetQuality(int q)
 {
   if (!M_BITMAPDATA)
-	m_refData = new wxBitmapRefData;
+  m_refData = new wxBitmapRefData;
 
   M_BITMAPDATA->m_quality = q;
 }
@@ -277,7 +286,7 @@ void wxBitmap::SetQuality(int q)
 void wxBitmap::SetOk(bool isOk)
 {
   if (!M_BITMAPDATA)
-	m_refData = new wxBitmapRefData;
+  m_refData = new wxBitmapRefData;
 
   M_BITMAPDATA->m_ok = isOk;
 }
@@ -285,7 +294,7 @@ void wxBitmap::SetOk(bool isOk)
 void wxBitmap::SetPalette(const wxPalette& palette)
 {
   if (!M_BITMAPDATA)
-	m_refData = new wxBitmapRefData;
+  m_refData = new wxBitmapRefData;
 
   M_BITMAPDATA->m_bitmapPalette = palette ;
 }
@@ -293,7 +302,7 @@ void wxBitmap::SetPalette(const wxPalette& palette)
 void wxBitmap::SetMask(wxMask *mask)
 {
   if (!M_BITMAPDATA)
-	m_refData = new wxBitmapRefData;
+  m_refData = new wxBitmapRefData;
 
   M_BITMAPDATA->m_bitmapMask = mask ;
 }
@@ -301,71 +310,112 @@ void wxBitmap::SetMask(wxMask *mask)
 void wxBitmap::SetHBITMAP(WXHBITMAP bmp)
 {
   if (!M_BITMAPDATA)
-	m_refData = new wxBitmapRefData;
+  m_refData = new wxBitmapRefData;
 
   M_BITMAPDATA->m_hBitmap = bmp;
 }
 
 void wxBitmap::AddHandler(wxBitmapHandler *handler)
 {
-	sm_handlers.Append(handler);
+  sm_handlers.Append(handler);
 }
 
 void wxBitmap::InsertHandler(wxBitmapHandler *handler)
 {
-	sm_handlers.Insert(handler);
+  sm_handlers.Insert(handler);
 }
 
 bool wxBitmap::RemoveHandler(const wxString& name)
 {
-	wxBitmapHandler *handler = FindHandler(name);
-	if ( handler )
-	{
-		sm_handlers.DeleteObject(handler);
-		return TRUE;
-	}
-	else
-		return FALSE;
+  wxBitmapHandler *handler = FindHandler(name);
+  if ( handler )
+  {
+    sm_handlers.DeleteObject(handler);
+    return TRUE;
+  }
+  else
+    return FALSE;
 }
 
 wxBitmapHandler *wxBitmap::FindHandler(const wxString& name)
 {
-	wxNode *node = sm_handlers.First();
-	while ( node )
-	{
-		wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-		if ( handler->GetName() == name )
-			return handler;
-		node = node->Next();
-	}
-	return NULL;
+  wxNode *node = sm_handlers.First();
+  while ( node )
+  {
+    wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+    if ( handler->GetName() == name )
+      return handler;
+    node = node->Next();
+  }
+  return NULL;
 }
 
 wxBitmapHandler *wxBitmap::FindHandler(const wxString& extension, long bitmapType)
 {
-	wxNode *node = sm_handlers.First();
-	while ( node )
-	{
-		wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-		if ( handler->GetExtension() == extension &&
-		      (bitmapType == -1 || handler->GetType() == bitmapType) )
-			return handler;
-		node = node->Next();
-	}
-	return NULL;
+  wxNode *node = sm_handlers.First();
+  while ( node )
+  {
+    wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+    if ( handler->GetExtension() == extension &&
+          (bitmapType == -1 || handler->GetType() == bitmapType) )
+      return handler;
+    node = node->Next();
+  }
+  return NULL;
 }
 
 wxBitmapHandler *wxBitmap::FindHandler(long bitmapType)
 {
-	wxNode *node = sm_handlers.First();
-	while ( node )
-	{
-		wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-		if (handler->GetType() == bitmapType)
-			return handler;
-		node = node->Next();
-	}
-	return NULL;
+  wxNode *node = sm_handlers.First();
+  while ( node )
+  {
+    wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+    if (handler->GetType() == bitmapType)
+      return handler;
+    node = node->Next();
+  }
+  return NULL;
+}
+
+// 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);
+
+// Creates a bitmap that matches the device context, from
+// an arbitray bitmap. At present, the original bitmap must have an
+// associated palette. TODO: use a default palette if no palette exists.
+// Contributed by Frederic Villeneuve <frederic.villeneuve@natinst.com>
+wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const
+{
+    wxMemoryDC      memDC;
+    wxBitmap        tmpBitmap(this->GetWidth(), this->GetHeight(), dc.GetDepth());
+    HPALETTE        hPal = NULL;
+    LPBITMAPINFO    lpDib;
+    void            *lpBits = 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();
+
+    // set the height negative because in a DIB the order of the lines is reversed
+    createDIB(this->GetWidth(), -this->GetHeight(), this->GetDepth(), hPal, &lpDib);
+
+    lpBits = malloc(lpDib->bmiHeader.biSizeImage);
+
+    ::GetBitmapBits((HBITMAP)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);
+
+    free(lpBits);
+
+    freeDIB(lpDib);
+    return (tmpBitmap);
 }
 
 /*
@@ -382,22 +432,22 @@ wxMask::wxMask(void)
 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
 // the transparent area
-wxMask::wxMask(const wxBitmap& bitmap, const int paletteIndex)
+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;
-	Create(bitmap);
+  Create(bitmap);
 }
 
 wxMask::~wxMask(void)
@@ -410,50 +460,50 @@ wxMask::~wxMask(void)
 bool wxMask::Create(const wxBitmap& bitmap)
 {
     if ( m_maskBitmap )
-	{
-		::DeleteObject((HBITMAP) m_maskBitmap);
-		m_maskBitmap = 0;
-	}
-	if (!bitmap.Ok() || bitmap.GetDepth() != 1)
-	{
-		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;
+  {
+    ::DeleteObject((HBITMAP) m_maskBitmap);
+    m_maskBitmap = 0;
+  }
+  if (!bitmap.Ok() || bitmap.GetDepth() != 1)
+  {
+    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;
 }
 
 // Create a mask from a bitmap and a palette index indicating
 // the transparent area
-bool wxMask::Create(const wxBitmap& bitmap, const int paletteIndex)
+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);
-		}
-	}
-	return FALSE;
+  {
+    ::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);
+    }
+  }
+  return FALSE;
 }
 
 // Create a mask from a bitmap and a colour indicating
@@ -461,51 +511,51 @@ bool wxMask::Create(const wxBitmap& bitmap, const int paletteIndex)
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
     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;
+  {
+    ::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;
 }
 
 /*
@@ -514,20 +564,20 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 
-bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, const long type, const int width, const int height, const int depth)
+bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth)
 {
-	return FALSE;
+  return FALSE;
 }
 
-bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const long type,
+bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long type,
     int desiredWidth, int desiredHeight)
 {
-	return FALSE;
+  return FALSE;
 }
 
-bool wxBitmapHandler::SaveFile(wxBitmap *bitmap, const wxString& name, const int type, const wxPalette *palette)
+bool wxBitmapHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
 {
-	return FALSE;
+  return FALSE;
 }
 
 /*
@@ -540,17 +590,17 @@ class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
 public:
   inline wxBMPResourceHandler(void)
   {
-	m_name = "Windows bitmap resource";
-	m_extension = "";
-	m_type = wxBITMAP_TYPE_BMP_RESOURCE;
+  m_name = "Windows bitmap resource";
+  m_extension = "";
+  m_type = wxBITMAP_TYPE_BMP_RESOURCE;
   };
 
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
       int desiredWidth, int desiredHeight);
 };
 IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
 
-bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
     int desiredWidth, int desiredHeight)
 {
     // TODO: load colourmap.
@@ -562,10 +612,14 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, cons
       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.bmPlanes;
+      M_BITMAPHANDLERDATA->m_depth = bm.bmBitsPixel;
       return TRUE;
     }
-	return FALSE;
+
+  // it's probably not found
+  wxLogError("Can't load bitmap '%s' from resources! Check .rc file.", name.c_str());
+
+  return FALSE;
 }
 
 class WXDLLEXPORT wxBMPFileHandler: public wxBitmapHandler
@@ -574,21 +628,21 @@ class WXDLLEXPORT wxBMPFileHandler: public wxBitmapHandler
 public:
   inline wxBMPFileHandler(void)
   {
-	m_name = "Windows bitmap file";
-	m_extension = "bmp";
-	m_type = wxBITMAP_TYPE_BMP;
+  m_name = "Windows bitmap file";
+  m_extension = "bmp";
+  m_type = wxBITMAP_TYPE_BMP;
   };
 
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
       int desiredWidth, int desiredHeight);
-  virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, const int type, const wxPalette *palette = NULL);
+  virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
 };
 IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
 
-bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
     int desiredWidth, int desiredHeight)
 {
-#if USE_IMAGE_LOADING_IN_MSW
+#if wxUSE_IMAGE_LOADING_IN_MSW
     wxPalette *palette = NULL;
     bool success = FALSE;
 /*
@@ -606,19 +660,19 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const lo
       M_BITMAPHANDLERDATA->m_bitmapPalette = *palette;
     return success;
 #else
-	return FALSE;
+  return FALSE;
 #endif
 }
 
-bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, const int type, const wxPalette *pal)
+bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *pal)
 {
-#if USE_IMAGE_LOADING_IN_MSW
+#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;
+  return FALSE;
 #endif
 }
 
@@ -628,21 +682,21 @@ class WXDLLEXPORT wxXPMFileHandler: public wxBitmapHandler
 public:
   inline wxXPMFileHandler(void)
   {
-	m_name = "XPM bitmap file";
-	m_extension = "xpm";
-	m_type = wxBITMAP_TYPE_XPM;
+  m_name = "XPM bitmap file";
+  m_extension = "xpm";
+  m_type = wxBITMAP_TYPE_XPM;
   };
 
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
     int desiredWidth = -1, int desiredHeight = -1);
-  virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, const int type, const wxPalette *palette = NULL);
+  virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
 };
 IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
 
-bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
     int desiredWidth, int desiredHeight)
 {
-#if USE_XPM_IN_MSW
+#if wxUSE_XPM_IN_MSW
     XImage *ximage;
     XpmAttributes xpmAttr;
     HDC     dc;
@@ -656,20 +710,20 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const lo
       DeleteDC(dc);
       if (errorStatus == XpmSuccess)
       {
-	M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ximage->bitmap;
+        M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ximage->bitmap;
 
-	BITMAP  bm;
-	GetObject((HBITMAP) m_hBitmap, sizeof(bm), (LPSTR) & bm);
+        BITMAP  bm;
+        GetObject((HBITMAP)M_BITMAPHANDLERDATA->m_hBitmap, sizeof(bm), (LPSTR) & bm);
 
-	M_BITMAPHANDLERDATA->m_width = (bm.bmWidth);
-	M_BITMAPHANDLERDATA->m_height = (bm.bmHeight);
-	M_BITMAPHANDLERDATA->m_depth = (bm.bmPlanes * bm.bmBitsPixel);
-	M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
+        M_BITMAPHANDLERDATA->m_width = (bm.bmWidth);
+        M_BITMAPHANDLERDATA->m_height = (bm.bmHeight);
+        M_BITMAPHANDLERDATA->m_depth = (bm.bmPlanes * bm.bmBitsPixel);
+        M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
         XpmFreeAttributes(&xpmAttr);
-	XImageFree(ximage);
-	
-	M_BITMAPHANDLERDATA->m_ok = TRUE;
-	return TRUE;
+        XImageFree(ximage);
+
+        M_BITMAPHANDLERDATA->m_ok = TRUE;
+        return TRUE;
       }
       else
       {
@@ -677,14 +731,14 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const lo
         return FALSE;
       }
     }
-#else
-	return FALSE;
 #endif
+
+    return FALSE;
 }
 
-bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, const int type, const wxPalette *palette)
+bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
 {
-#if USE_XPM_IN_MSW
+#if wxUSE_XPM_IN_MSW
       HDC     dc = NULL;
 
       Visual *visual = NULL;
@@ -696,22 +750,24 @@ bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, const in
         if (SelectObject(dc, (HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap))
         { /* for following SetPixel */
           /* fill the XImage struct 'by hand' */
-	  ximage.width = M_BITMAPHANDLERDATA->m_width; ximage.height = M_BITMAPHANDLERDATA->m_height;
-	  ximage.depth = M_BITMAPHANDLERDATA->m_depth; ximage.bitmap = M_BITMAPHANDLERDATA->m_hBitmap;
-	  int errorStatus = XpmWriteFileFromImage(&dc, WXSTRINGCAST name,
-						  &ximage, (XImage *) NULL, (XpmAttributes *) NULL);
+    ximage.width = M_BITMAPHANDLERDATA->m_width; 
+     ximage.height = M_BITMAPHANDLERDATA->m_height;
+    ximage.depth = M_BITMAPHANDLERDATA->m_depth; 
+     ximage.bitmap = (void *)M_BITMAPHANDLERDATA->m_hBitmap;
+    int errorStatus = XpmWriteFileFromImage(&dc, WXSTRINGCAST name,
+              &ximage, (XImage *) NULL, (XpmAttributes *) NULL);
 
           if (dc)
-	    DeleteDC(dc);
+      DeleteDC(dc);
 
-	  if (errorStatus == XpmSuccess)
-	    return TRUE;		/* no error */
-	  else
-	    return FALSE;
+    if (errorStatus == XpmSuccess)
+      return TRUE;    /* no error */
+    else
+      return FALSE;
         } else return FALSE;
       } else return FALSE;
 #else
-	return FALSE;
+  return FALSE;
 #endif
 }
 
@@ -721,18 +777,18 @@ class WXDLLEXPORT wxXPMDataHandler: public wxBitmapHandler
 public:
   inline wxXPMDataHandler(void)
   {
-	m_name = "XPM bitmap data";
-	m_extension = "xpm";
-	m_type = wxBITMAP_TYPE_XPM_DATA;
+  m_name = "XPM bitmap data";
+  m_extension = "xpm";
+  m_type = wxBITMAP_TYPE_XPM_DATA;
   };
 
-  virtual bool Create(wxBitmap *bitmap, void *data, const long flags, const int width, const int height, const int depth = 1);
+  virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
 };
 IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
 
-bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, const long flags, const int width, const int height, const int depth)
+bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth)
 {
-#if USE_XPM_IN_MSW
+#if wxUSE_XPM_IN_MSW
   XImage *ximage;
   int     ErrorStatus;
   XpmAttributes xpmAttr;
@@ -741,11 +797,11 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, const long flags, co
   M_BITMAPHANDLERDATA->m_ok = FALSE;
   M_BITMAPHANDLERDATA->m_numColors = 0;
 
-  dc = CreateCompatibleDC(NULL);	/* memory DC */
+  dc = CreateCompatibleDC(NULL);  /* memory DC */
 
   if (dc)
   {
-    xpmAttr.valuemask = XpmReturnInfos;	/* get infos back */
+    xpmAttr.valuemask = XpmReturnInfos; /* get infos back */
     ErrorStatus = XpmCreateImageFromData(&dc, (char **)data,
          &ximage, (XImage **) NULL, &xpmAttr);
 
@@ -763,46 +819,107 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, const long flags, co
       M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
       XpmFreeAttributes(&xpmAttr);
 
-      XImageFree(ximage);	// releases the malloc, but does not detroy
-			// the bitmap
+      XImageFree(ximage); // releases the malloc, but does not detroy
+                          // the bitmap
       M_BITMAPHANDLERDATA->m_ok = TRUE;
       DeleteDC(dc);
 
-    } else
+      return TRUE;
+    } 
+    else
     {
       M_BITMAPHANDLERDATA->m_ok = FALSE;
 //    XpmDebugError(ErrorStatus, NULL);
       DeleteDC(dc);
-	  return FALSE;
+      return FALSE;
     }
   }
-#else
-  return FALSE;
 #endif
+
+  return FALSE;
 }
 
 void wxBitmap::CleanUpHandlers(void)
 {
-	wxNode *node = sm_handlers.First();
-	while ( node )
-	{
-		wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-		wxNode *next = node->Next();
-		delete handler;
-		delete node;
-		node = next;
-	}
+  wxNode *node = sm_handlers.First();
+  while ( node )
+  {
+    wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+    wxNode *next = node->Next();
+    delete handler;
+    delete node;
+    node = next;
+  }
 }
 
 void wxBitmap::InitStandardHandlers(void)
 {
-	AddHandler(new wxBMPResourceHandler);
-	AddHandler(new wxBMPFileHandler);
-	AddHandler(new wxXPMFileHandler);
-	AddHandler(new wxXPMDataHandler);
-	AddHandler(new wxICOResourceHandler);
-	AddHandler(new wxICOFileHandler);
+  AddHandler(new wxBMPResourceHandler);
+  AddHandler(new wxBMPFileHandler);
+  AddHandler(new wxXPMFileHandler);
+  AddHandler(new wxXPMDataHandler);
+  AddHandler(new wxICOResourceHandler);
+  AddHandler(new wxICOFileHandler);
 }
 
+static long createDIB(long xSize, long ySize, long bitsPerPixel,
+                       HPALETTE hPal, LPBITMAPINFO* lpDIBHeader)
+{
+   unsigned long   i, headerSize;
+   LPBITMAPINFO    lpDIBheader = NULL;
+   LPPALETTEENTRY  lpPe = NULL;
+
+
+   // Allocate space for a DIB header
+   headerSize = (sizeof(BITMAPINFOHEADER) + (256 * sizeof(PALETTEENTRY)));
+   lpDIBheader = (BITMAPINFO *) malloc(headerSize);
+   lpPe = (PALETTEENTRY *)((BYTE*)lpDIBheader + sizeof(BITMAPINFOHEADER));
+
+   GetPaletteEntries(hPal, 0, 256, lpPe);
+
+
+   memset(lpDIBheader, 0x00, sizeof(BITMAPINFOHEADER));
+
+
+   // Fill in the static parts of the DIB header
+   lpDIBheader->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+   lpDIBheader->bmiHeader.biWidth = xSize;
+   lpDIBheader->bmiHeader.biHeight = ySize;
+   lpDIBheader->bmiHeader.biPlanes = 1;
+
+   // 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.biClrUsed = 256;
+
+
+   // Initialize the DIB palette
+   for (i = 0; i < 256; i++) {
+      lpDIBheader->bmiColors[i].rgbReserved = lpPe[i].peFlags;
+      lpDIBheader->bmiColors[i].rgbRed = lpPe[i].peRed;
+      lpDIBheader->bmiColors[i].rgbGreen = lpPe[i].peGreen;
+      lpDIBheader->bmiColors[i].rgbBlue = lpPe[i].peBlue;
+   }
+
+   *lpDIBHeader = lpDIBheader;
+
+
+   return (0);
+
+}
+
+
+
+static long freeDIB(LPBITMAPINFO lpDIBHeader)
+{
+
+   if (lpDIBHeader != NULL) {
+      free(lpDIBHeader);
+   }
+
+   return (0);
+}