Updated makefiles for VisualAge C++ V3.0

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 67d698f32b182c34b06d7bf358b8b965212f2a60..40b199abce3577814410460199039cfc1db26ddb 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -9,46 +9,60 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "bitmap.h"
+    #pragma implementation "bitmap.h"

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/palette.h"
-#include "wx/bitmap.h"
-#include "wx/icon.h"
+    #include <stdio.h>
+
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/palette.h"
+    #include "wx/dcmemory.h"
+    #include "wx/bitmap.h"
+    #include "wx/icon.h"

 #endif
 
 #include "wx/msw/private.h"
 #include "wx/log.h"
 
 #endif
 
 #include "wx/msw/private.h"
 #include "wx/log.h"
 

-#include "assert.h"
-
-#if wxUSE_XPM_IN_MSW
-#define FOR_MSW 1
-#include "../../contrib/wxxpm/libxpm.34b/lib/xpm34.h"
-#endif
-

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

+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+

 #if !USE_SHARED_LIBRARIES
 #if !USE_SHARED_LIBRARIES

-IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)

 #endif
 
 #endif
 

-wxBitmapRefData::wxBitmapRefData(void)
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxBitmapRefData
+// ----------------------------------------------------------------------------
+
+wxBitmapRefData::wxBitmapRefData()

 {
   m_ok = FALSE;
   m_width = 0;
 {
   m_ok = FALSE;
   m_width = 0;


@@ -61,12 +75,12 @@ wxBitmapRefData::wxBitmapRefData(void)
   m_bitmapMask = NULL;
 }
 
   m_bitmapMask = NULL;
 }
 

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

 {
   if (m_selectedInto)
   {
 {
   if (m_selectedInto)
   {

-    char buf[200];
-    sprintf(buf, "Bitmap was deleted without selecting out of wxMemoryDC %X.", (unsigned int) m_selectedInto);
+    wxChar buf[200];
+    wxSprintf(buf, _T("Bitmap was deleted without selecting out of wxMemoryDC %lX."), (unsigned long) m_selectedInto);

     wxFatalError(buf);
   }
   if (m_hBitmap)
     wxFatalError(buf);
   }
   if (m_hBitmap)


@@ -78,31 +92,61 @@ wxBitmapRefData::~wxBitmapRefData(void)
   if (m_bitmapMask)
     delete m_bitmapMask;
   m_bitmapMask = NULL;
   if (m_bitmapMask)
     delete m_bitmapMask;
   m_bitmapMask = NULL;

+

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// wxBitmap
+// ----------------------------------------------------------------------------
+

 wxList wxBitmap::sm_handlers;
 
 wxList wxBitmap::sm_handlers;
 

-wxBitmap::wxBitmap(void)
+wxBitmap::wxBitmap()

 {
   if ( wxTheBitmapList )
     wxTheBitmapList->AddBitmap(this);
 }
 
 {
   if ( wxTheBitmapList )
     wxTheBitmapList->AddBitmap(this);
 }
 

-wxBitmap::~wxBitmap(void)
+wxBitmap::wxBitmap(const wxBitmap& bitmap)
+{
+    wxIcon *icon = wxDynamicCast(&bitmap, wxIcon);
+    if ( icon )
+    {
+        HDC hdc = ::CreateCompatibleDC(NULL);   // screen DC
+        HBITMAP hbitmap = ::CreateCompatibleBitmap(hdc,
+                                                   icon->GetWidth(),
+                                                   icon->GetHeight());
+        ::SelectObject(hdc, hbitmap);
+        ::DrawIcon(hdc, 0, 0, (HICON)icon->GetHICON());
+
+        ::DeleteDC(hdc);
+
+        SetHBITMAP((WXHBITMAP)hbitmap);
+    }
+    else
+    {
+        Ref(bitmap);
+    }
+
+    if ( wxTheBitmapList )
+        wxTheBitmapList->AddBitmap(this);
+}
+
+wxBitmap::~wxBitmap()

 {
     if (wxTheBitmapList)
         wxTheBitmapList->DeleteObject(this);
 }
 
 {
     if (wxTheBitmapList)
         wxTheBitmapList->DeleteObject(this);
 }
 

-bool wxBitmap::FreeResource(bool force)
+bool wxBitmap::FreeResource(bool WXUNUSED(force))

 {
   if ( !M_BITMAPDATA )
   return FALSE;
 
   if (M_BITMAPDATA->m_selectedInto)
   {
 {
   if ( !M_BITMAPDATA )
   return FALSE;
 
   if (M_BITMAPDATA->m_selectedInto)
   {

-    char buf[200];
-    sprintf(buf, "Bitmap %X was deleted without selecting out of wxMemoryDC %X.", (unsigned int) this, (unsigned int) M_BITMAPDATA->m_selectedInto);
+    wxChar buf[200];
+    wxSprintf(buf, _T("Bitmap %lX was deleted without selecting out of wxMemoryDC %lX."), (unsigned long) this, (unsigned long) M_BITMAPDATA->m_selectedInto);

     wxFatalError(buf);
   }
   if (M_BITMAPDATA->m_hBitmap)
     wxFatalError(buf);
   }
   if (M_BITMAPDATA->m_hBitmap)


@@ -144,6 +188,12 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
     wxTheBitmapList->AddBitmap(this);
 }
 
     wxTheBitmapList->AddBitmap(this);
 }
 

+// Create from XPM data
+wxBitmap::wxBitmap(char **data, wxControl *WXUNUSED(anItem))
+{
+  (void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+}
+

 wxBitmap::wxBitmap(int w, int h, int d)
 {
   (void)Create(w, h, d);
 wxBitmap::wxBitmap(int w, int h, int d)
 {
   (void)Create(w, h, d);


@@ -168,14 +218,6 @@ wxBitmap::wxBitmap(const wxString& filename, long type)
     wxTheBitmapList->AddBitmap(this);
 }
 
     wxTheBitmapList->AddBitmap(this);
 }
 

-#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);
-}
-#endif
-

 bool wxBitmap::Create(int w, int h, int d)
 {
   UnRef();
 bool wxBitmap::Create(int w, int h, int d)
 {
   UnRef();


@@ -192,9 +234,9 @@ bool wxBitmap::Create(int w, int h, int d)
   }
   else
   {
   }
   else
   {

-    HDC dc = GetDC(NULL);
+    HDC dc = GetDC((HWND) NULL);

     M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateCompatibleBitmap(dc, w, h);
     M_BITMAPDATA->m_hBitmap = (WXHBITMAP) CreateCompatibleBitmap(dc, w, h);

-    ReleaseDC(NULL, dc);
+    ReleaseDC((HWND) NULL, dc);

     M_BITMAPDATA->m_depth = wxDisplayDepth();
   }
   if (M_BITMAPDATA->m_hBitmap)
     M_BITMAPDATA->m_depth = wxDisplayDepth();
   }
   if (M_BITMAPDATA->m_hBitmap)


@@ -213,7 +255,7 @@ bool wxBitmap::LoadFile(const wxString& filename, long type)
   wxBitmapHandler *handler = FindHandler(type);
 
   if ( handler == NULL ) {
   wxBitmapHandler *handler = FindHandler(type);
 
   if ( handler == NULL ) {

-    wxLogWarning("no bitmap handler for type %d defined.", type);
+    wxLogWarning(_T("no bitmap handler for type %d defined."), type);

 
     return FALSE;
   }
 
     return FALSE;
   }


@@ -230,7 +272,7 @@ bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
   wxBitmapHandler *handler = FindHandler(type);
 
   if ( handler == NULL ) {
   wxBitmapHandler *handler = FindHandler(type);
 
   if ( handler == NULL ) {

-    wxLogWarning("no bitmap handler for type %d defined.", type);
+    wxLogWarning(_T("no bitmap handler for type %d defined."), type);

 
     return FALSE;
   }
 
     return FALSE;
   }


@@ -243,7 +285,7 @@ bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *pal
   wxBitmapHandler *handler = FindHandler(type);
 
   if ( handler == NULL ) {
   wxBitmapHandler *handler = FindHandler(type);
 
   if ( handler == NULL ) {

-    wxLogWarning("no bitmap handler for type %d defined.", type);
+    wxLogWarning(_T("no bitmap handler for type %d defined."), type);

 
     return FALSE;
   }
 
     return FALSE;
   }


@@ -343,7 +385,7 @@ wxBitmapHandler *wxBitmap::FindHandler(const wxString& name)
   while ( node )
   {
     wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
   while ( node )
   {
     wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();

-    if ( handler->GetName() == name )
+    if ( (handler->GetName().Cmp(name) == 0) )

       return handler;
     node = node->Next();
   }
       return handler;
     node = node->Next();
   }


@@ -356,8 +398,8 @@ wxBitmapHandler *wxBitmap::FindHandler(const wxString& extension, long bitmapTyp
   while ( node )
   {
     wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
   while ( node )
   {
     wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();

-    if ( handler->GetExtension() == extension &&
-          (bitmapType == -1 || handler->GetType() == bitmapType) )
+    if ( (handler->GetExtension().Cmp(extension) == 0) &&
+          (bitmapType == -1 || (handler->GetType() == bitmapType)) )

       return handler;
     node = node->Next();
   }
       return handler;
     node = node->Next();
   }


@@ -390,10 +432,11 @@ wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const
 {
     wxMemoryDC      memDC;
     wxBitmap        tmpBitmap(this->GetWidth(), this->GetHeight(), dc.GetDepth());
 {
     wxMemoryDC      memDC;
     wxBitmap        tmpBitmap(this->GetWidth(), this->GetHeight(), dc.GetDepth());

-    HPALETTE        hPal = NULL;
+    HPALETTE        hPal = (HPALETTE) NULL;

     LPBITMAPINFO    lpDib;
     LPBITMAPINFO    lpDib;

-    void            *lpBits = NULL;
+    void            *lpBits = (void*) NULL;

 
 

+/*

     wxASSERT( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != 0) );
 
     tmpBitmap.SetPalette(this->GetPalette());
     wxASSERT( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != 0) );
 
     tmpBitmap.SetPalette(this->GetPalette());


@@ -401,6 +444,23 @@ wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const
     memDC.SetPalette(this->GetPalette());
 
     hPal = (HPALETTE) this->GetPalette()->GetHPALETTE();
     memDC.SetPalette(this->GetPalette());
 
     hPal = (HPALETTE) this->GetPalette()->GetHPALETTE();

+*/
+    if( 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();
+    }
+    else
+    {
+        hPal = (HPALETTE) ::GetStockObject(DEFAULT_PALETTE);
+        wxPalette palette;
+        palette.SetHPALETTE( (WXHPALETTE)hPal );
+        tmpBitmap.SetPalette( palette );
+        memDC.SelectObject(tmpBitmap);
+        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
     createDIB(this->GetWidth(), -this->GetHeight(), this->GetDepth(), hPal, &lpDib);


@@ -422,7 +482,7 @@ wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const
  * wxMask
  */
 
  * wxMask
  */
 

-wxMask::wxMask(void)
+wxMask::wxMask()

 {
     m_maskBitmap = 0;
 }
 {
     m_maskBitmap = 0;
 }


@@ -450,7 +510,7 @@ wxMask::wxMask(const wxBitmap& bitmap)
   Create(bitmap);
 }
 
   Create(bitmap);
 }
 

-wxMask::~wxMask(void)
+wxMask::~wxMask()

 {
     if ( m_maskBitmap )
         ::DeleteObject((HBITMAP) m_maskBitmap);
 {
     if ( m_maskBitmap )
         ::DeleteObject((HBITMAP) m_maskBitmap);


@@ -564,18 +624,18 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 

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

 {
   return FALSE;
 }
 
 {
   return FALSE;
 }
 

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

 {
   return FALSE;
 }
 
 {
   return FALSE;
 }
 

-bool wxBitmapHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
+bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), int WXUNUSED(type), const wxPalette *WXUNUSED(palette))

 {
   return FALSE;
 }
 {
   return FALSE;
 }


@@ -588,7 +648,7 @@ class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
 {
   DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler)
 public:
 {
   DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler)
 public:

-  inline wxBMPResourceHandler(void)
+  inline wxBMPResourceHandler()

   {
   m_name = "Windows bitmap resource";
   m_extension = "";
   {
   m_name = "Windows bitmap resource";
   m_extension = "";


@@ -600,24 +660,29 @@ public:
 };
 IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
 
 };
 IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
 

-bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-    int desiredWidth, int desiredHeight)
+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)
     {
 {
     // TODO: load colourmap.
     M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ::LoadBitmap(wxGetInstance(), name);
     if (M_BITMAPHANDLERDATA->m_hBitmap)
     {

-      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;
-      return TRUE;
+        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;
+
+        if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) )
+        {
+        }
+
+        return TRUE;

     }
 
   // it's probably not found
     }
 
   // it's probably not found

-  wxLogError("Can't load bitmap '%s' from resources! Check .rc file.", name.c_str());
+  wxLogError(_T("Can't load bitmap '%s' from resources! Check .rc file."), name.c_str());

 
   return FALSE;
 }
 
   return FALSE;
 }


@@ -626,7 +691,7 @@ class WXDLLEXPORT wxBMPFileHandler: public wxBitmapHandler
 {
   DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)
 public:
 {
   DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)
 public:

-  inline wxBMPFileHandler(void)
+  inline wxBMPFileHandler()

   {
   m_name = "Windows bitmap file";
   m_extension = "bmp";
   {
   m_name = "Windows bitmap file";
   m_extension = "bmp";


@@ -639,8 +704,8 @@ public:
 };
 IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
 
 };
 IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
 

-bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-    int desiredWidth, int desiredHeight)
+bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
+    int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))

 {
 #if wxUSE_IMAGE_LOADING_IN_MSW
     wxPalette *palette = NULL;
 {
 #if wxUSE_IMAGE_LOADING_IN_MSW
     wxPalette *palette = NULL;


@@ -657,14 +722,17 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long fla
       palette = NULL;
     }
     if (palette)
       palette = NULL;
     }
     if (palette)

-      M_BITMAPHANDLERDATA->m_bitmapPalette = *palette;
+    {
+        M_BITMAPHANDLERDATA->m_bitmapPalette = *palette;
+        delete palette;
+    }

     return success;
 #else
   return FALSE;
 #endif
 }
 
     return success;
 #else
   return FALSE;
 #endif
 }
 

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

 {
 #if wxUSE_IMAGE_LOADING_IN_MSW
     wxPalette *actualPalette = (wxPalette *)pal;
 {
 #if wxUSE_IMAGE_LOADING_IN_MSW
     wxPalette *actualPalette = (wxPalette *)pal;


@@ -676,170 +744,7 @@ bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type
 #endif
 }
 
 #endif
 }
 

-class WXDLLEXPORT wxXPMFileHandler: public wxBitmapHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxXPMFileHandler)
-public:
-  inline wxXPMFileHandler(void)
-  {
-  m_name = "XPM bitmap file";
-  m_extension = "xpm";
-  m_type = wxBITMAP_TYPE_XPM;
-  };
-
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-    int desiredWidth = -1, int desiredHeight = -1);
-  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, long flags,
-    int desiredWidth, int desiredHeight)
-{
-#if wxUSE_XPM_IN_MSW
-    XImage *ximage;
-    XpmAttributes xpmAttr;
-    HDC     dc;
-
-    M_BITMAPHANDLERDATA->m_ok = FALSE;
-    dc = CreateCompatibleDC(NULL);
-    if (dc)
-    {
-      xpmAttr.valuemask = XpmReturnPixels;
-      int errorStatus = XpmReadFileToImage(&dc, WXSTRINGCAST name, &ximage, (XImage **) NULL, &xpmAttr);
-      DeleteDC(dc);
-      if (errorStatus == XpmSuccess)
-      {
-        M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ximage->bitmap;
-
-        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;
-        XpmFreeAttributes(&xpmAttr);
-        XImageFree(ximage);
-
-        M_BITMAPHANDLERDATA->m_ok = TRUE;
-        return TRUE;
-      }
-      else
-      {
-        M_BITMAPHANDLERDATA->m_ok = FALSE;
-        return FALSE;
-      }
-    }
-#endif
-
-    return FALSE;
-}
-
-bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
-{
-#if wxUSE_XPM_IN_MSW
-    HDC     dc = NULL;
-    
-    XImage  ximage;
-    
-    dc = CreateCompatibleDC(NULL);
-    if (dc)
-    {
-        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 = (HBITMAP)M_BITMAPHANDLERDATA->m_hBitmap;
-            int errorStatus = XpmWriteFileFromImage(&dc, WXSTRINGCAST name,
-                &ximage, (XImage *) NULL, (XpmAttributes *) NULL);
-            
-            if (dc)
-                DeleteDC(dc);
-            
-            if (errorStatus == XpmSuccess)
-                return TRUE;    /* no error */
-            else
-                return FALSE;
-        } else return FALSE;
-    } else return FALSE;
-#else
-    return FALSE;
-#endif
-}
-
-class WXDLLEXPORT wxXPMDataHandler: public wxBitmapHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxXPMDataHandler)
-public:
-  inline wxXPMDataHandler(void)
-  {
-  m_name = "XPM bitmap data";
-  m_extension = "xpm";
-  m_type = wxBITMAP_TYPE_XPM_DATA;
-  };
-
-  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, long flags, int width, int height, int depth)
-{
-#if wxUSE_XPM_IN_MSW
-  XImage *ximage;
-  int     ErrorStatus;
-  XpmAttributes xpmAttr;
-  HDC     dc;
-
-  M_BITMAPHANDLERDATA->m_ok = FALSE;
-  M_BITMAPHANDLERDATA->m_numColors = 0;
-
-  dc = CreateCompatibleDC(NULL);  /* memory DC */
-
-  if (dc)
-  {
-    xpmAttr.valuemask = XpmReturnInfos; /* get infos back */
-    ErrorStatus = XpmCreateImageFromData(&dc, (char **)data,
-         &ximage, (XImage **) NULL, &xpmAttr);
-
-    if (ErrorStatus == XpmSuccess)
-    {
-      /* ximage is malloced and contains bitmap and attributes */
-      M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ximage->bitmap;
-
-      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;
-      XpmFreeAttributes(&xpmAttr);
-
-      XImageFree(ximage); // releases the malloc, but does not detroy
-                          // the bitmap
-      M_BITMAPHANDLERDATA->m_ok = TRUE;
-      DeleteDC(dc);
-
-      return TRUE;
-    } 
-    else
-    {
-      M_BITMAPHANDLERDATA->m_ok = FALSE;
-//    XpmDebugError(ErrorStatus, NULL);
-      DeleteDC(dc);
-      return FALSE;
-    }
-  }
-#endif
-
-  return FALSE;
-}
-
-void wxBitmap::CleanUpHandlers(void)
+void wxBitmap::CleanUpHandlers()

 {
   wxNode *node = sm_handlers.First();
   while ( node )
 {
   wxNode *node = sm_handlers.First();
   while ( node )


@@ -852,12 +757,16 @@ void wxBitmap::CleanUpHandlers(void)
   }
 }
 
   }
 }
 

-void wxBitmap::InitStandardHandlers(void)
+void wxBitmap::InitStandardHandlers()

 {
   AddHandler(new wxBMPResourceHandler);
   AddHandler(new wxBMPFileHandler);
 {
   AddHandler(new wxBMPResourceHandler);
   AddHandler(new wxBMPFileHandler);

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

   AddHandler(new wxICOResourceHandler);
   AddHandler(new wxICOFileHandler);
 }
   AddHandler(new wxICOResourceHandler);
   AddHandler(new wxICOFileHandler);
 }