/////////////////////////////////////////////////////////////////////////////
-// Name: bitmap.cpp
+// Name: src/mgl/bitmap.cpp
// Author: Vaclav Slavik
// RCS-ID: $Id$
-// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "bitmap.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#endif
#include "wx/bitmap.h"
-#include "wx/icon.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/utils.h"
+ #include "wx/dcmemory.h"
+ #include "wx/icon.h"
+#endif
+
#include "wx/filefn.h"
#include "wx/image.h"
-#include "wx/dcmemory.h"
-#include "wx/utils.h"
-#include "wx/log.h"
-#include "wx/intl.h"
#include "wx/image.h"
#include "wx/xpmdecod.h"
//-----------------------------------------------------------------------------
static pixel_format_t gs_pixel_format_15 =
- {0x1F,0x0A,3, 0x1F,0x05,3, 0x1F,0x00,3, 0x01,0x0F,7}; // 555 15bpp
-
+ {0x1F,0x0A,3, 0x1F,0x05,3, 0x1F,0x00,3, 0x01,0x0F,7}; // 555 15bpp
+
static pixel_format_t gs_pixel_format_16 =
- {0x1F,0x0B,3, 0x3F,0x05,2, 0x1F,0x00,3, 0x00,0x00,0}; // 565 16bpp
+ {0x1F,0x0B,3, 0x3F,0x05,2, 0x1F,0x00,3, 0x00,0x00,0}; // 565 16bpp
static pixel_format_t gs_pixel_format_24 =
- {0xFF,0x10,0, 0xFF,0x08,0, 0xFF,0x00,0, 0x00,0x00,0}; // RGB 24bpp
+ {0xFF,0x10,0, 0xFF,0x08,0, 0xFF,0x00,0, 0x00,0x00,0}; // RGB 24bpp
static pixel_format_t gs_pixel_format_32 =
- {0xFF,0x18,0, 0xFF,0x10,0, 0xFF,0x08,0, 0xFF,0x00,0}; // RGBA 32bpp
+ {0xFF,0x18,0, 0xFF,0x10,0, 0xFF,0x08,0, 0xFF,0x00,0}; // RGBA 32bpp
static pixel_format_t gs_pixel_format_wxImage =
- {0xFF,0x00,0, 0xFF,0x08,0, 0xFF,0x10,0, 0x00,0x00,0}; // RGB 24bpp for wxImage
+ {0xFF,0x00,0, 0xFF,0x08,0, 0xFF,0x10,0, 0x00,0x00,0}; // RGB 24bpp for wxImage
//-----------------------------------------------------------------------------
// helpers
static wxColour wxQuantizeColour(const wxColour& clr, const wxBitmap& bmp)
{
pixel_format_t *pf = bmp.GetMGLbitmap_t()->pf;
-
+
if ( pf->redAdjust == 0 && pf->greenAdjust == 0 && pf->blueAdjust == 0 )
return clr;
else
- return wxColour((clr.Red() >> pf->redAdjust) << pf->redAdjust,
- (clr.Green() >> pf->greenAdjust) << pf->greenAdjust,
- (clr.Blue() >> pf->blueAdjust) << pf->blueAdjust);
+ return wxColour((unsigned char)((clr.Red() >> pf->redAdjust) << pf->redAdjust),
+ (unsigned char)((clr.Green() >> pf->greenAdjust) << pf->greenAdjust),
+ (unsigned char)((clr.Blue() >> pf->blueAdjust) << pf->blueAdjust));
}
{
delete m_bitmap;
m_bitmap = NULL;
-
+
wxColour clr(wxQuantizeColour(colour, bitmap));
wxImage imgSrc(bitmap.ConvertToImage());
- imgSrc.SetMask(FALSE);
+ imgSrc.SetMask(false);
wxImage image(imgSrc.ConvertToMono(clr.Red(), clr.Green(), clr.Blue()));
- if ( !image.Ok() ) return FALSE;
+ if ( !image.Ok() )
+ return false;
m_bitmap = new wxBitmap(image, 1);
unsigned char r,g,b;
wxPalette *pal = bitmap.GetPalette();
- wxCHECK_MSG( pal, FALSE, wxT("Cannot create mask from bitmap without palette") );
-
+ wxCHECK_MSG( pal, false, wxT("Cannot create mask from bitmap without palette") );
+
pal->GetRGB(paletteIndex, &r, &g, &b);
return Create(bitmap, wxColour(r, g, b));
delete m_bitmap;
m_bitmap = NULL;
- wxCHECK_MSG( bitmap.Ok(), FALSE, wxT("Invalid bitmap") );
- wxCHECK_MSG( bitmap.GetDepth() == 1, FALSE, wxT("Cannot create mask from colour bitmap") );
+ wxCHECK_MSG( bitmap.Ok(), false, wxT("Invalid bitmap") );
+ wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") );
m_bitmap = new wxBitmap(bitmap);
- return TRUE;
+ return true;
}
IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler,wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxBitmapBase)
-wxBitmap::wxBitmap()
-{
- if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
-}
-
wxBitmap::wxBitmap(int width, int height, int depth)
{
Create(width, height, depth);
-
- if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
}
-static bitmap_t *MyMGL_createBitmap(int width, int height,
+static bitmap_t *MyMGL_createBitmap(int width, int height,
int bpp, pixel_format_t *pf)
{
MGLMemoryDC mdc(width, height, bpp, pf);
{
UnRef();
- wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
-
- pixel_format_t pf_dummy, *pf;
+ wxCHECK_MSG( (width > 0) && (height > 0), false, wxT("invalid bitmap size") );
+
+ pixel_format_t pf_dummy;
+ pixel_format_t *pf;
int mglDepth = depth;
switch ( depth )
wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
g_displayDC->getPixelFormat(pf_dummy);
- mglDepth = g_displayDC->getBitsPerPixel();
+ mglDepth = g_displayDC->getBitsPerPixel();
pf = &pf_dummy;
break;
case 1:
pf = &gs_pixel_format_32;
break;
default:
- wxASSERT_MSG( 0, wxT("invalid bitmap depth") );
- return FALSE;
- break;
+ wxFAIL_MSG(wxT("invalid bitmap depth"));
+ return false;
}
m_refData = new wxBitmapRefData();
{
// MGL does not support mono DCs, so we have to emulate them with
// 8bpp ones. We do that by using a special palette with color 0
- // set to black and all other colors set to white.
+ // set to black and all other colors set to white.
M_BMPDATA->m_bitmap = MyMGL_createBitmap(width, height, 8, pf);
SetMonoPalette(wxColour(255, 255, 255), wxColour(0, 0, 0));
bool wxBitmap::CreateFromXpm(const char **bits)
{
- wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
-
+ wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
+
wxXPMDecoder decoder;
wxImage img = decoder.ReadData(bits);
- wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )
-
+ wxCHECK_MSG( img.Ok(), false, wxT("invalid bitmap data") );
+
*this = wxBitmap(img);
-
- if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
- return TRUE;
+ return true;
}
-wxBitmap::wxBitmap(const wxImage& image, int depth = -1)
+wxBitmap::wxBitmap(const wxImage& image, int depth)
{
long width, height;
- wxCHECK_RET( image.Ok(), wxT("invalid image") )
-
+ wxCHECK_RET( image.Ok(), wxT("invalid image") );
+
width = image.GetWidth();
height = image.GetHeight();
if ( !Create(width, height, depth) ) return;
-
+
MGLMemoryDC idc(width, height, 24, &gs_pixel_format_wxImage,
width * 3, (void*)image.GetData(), NULL);
wxASSERT_MSG( idc.isValid(), wxT("cannot create custom MGLDC") );
MGLDevCtx *bdc = CreateTmpDC();
- if ( depth <= 8 && image.HasPalette() )
+ if ( GetDepth() <= 8 && image.HasPalette() )
SetPalette(image.GetPalette());
bdc->bitBlt(idc, 0, 0, width, height, 0, 0, MGL_REPLACE_MODE);
delete bdc;
-
+
if ( image.HasMask() )
{
wxImage mask_image = image.ConvertToMono(image.GetMaskRed(),
image.GetMaskGreen(),
image.GetMaskBlue());
- mask_image.SetMask(FALSE);
+ mask_image.SetMask(false);
wxBitmap mask_bmp(mask_image, 1);
SetMask(new wxMask(mask_bmp));
}
wxImage wxBitmap::ConvertToImage() const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
+ wxCHECK_MSG( Ok(), wxImage(), wxT("invalid bitmap") );
int width, height;
width = GetWidth();
height = GetHeight();
-
+
wxImage image(width, height);
wxASSERT_MSG( image.Ok(), wxT("cannot create image") );
-
+
MGLMemoryDC idc(width, height, 24, &gs_pixel_format_wxImage,
width * 3, (void*)image.GetData(), NULL);
wxASSERT_MSG( idc.isValid(), wxT("cannot create custom MGLDC") );
if ( M_BMPDATA->m_palette )
image.SetPalette(*(M_BMPDATA->m_palette));
-
+
if ( GetMask() )
{
// in consistency with other ports, we convert parts covered
// bg colour set to black and fg colour to <16,16,16>
image.SetMaskColour(16, 16, 16);
- image.SetMask(TRUE);
+ image.SetMask(true);
wxDC tmpDC;
- tmpDC.SetMGLDC(&idc, FALSE);
+ tmpDC.SetMGLDC(&idc, false);
tmpDC.SetBackground(wxBrush(wxColour(16,16,16), wxSOLID));
tmpDC.Clear();
- tmpDC.DrawBitmap(*this, 0, 0, TRUE);
+ tmpDC.DrawBitmap(*this, 0, 0, true);
}
else
{
- image.SetMask(FALSE);
+ image.SetMask(false);
idc.putBitmap(0, 0, M_BMPDATA->m_bitmap, MGL_REPLACE_MODE);
}
return image;
}
-wxBitmap::wxBitmap(const wxBitmap& bmp)
-{
- Ref(bmp);
-
- if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
-}
-
wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type)
{
LoadFile(filename, type);
-
- if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
}
wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
bdc->clearDevice();
bdc->putMonoImage(0, 0, width, (width + 7) / 8, height, (void*)bits);
delete bdc;
-
- if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
-}
-
-wxBitmap::~wxBitmap()
-{
- if ( wxTheBitmapList ) wxTheBitmapList->DeleteObject(this);
-}
-
-wxBitmap& wxBitmap::operator = (const wxBitmap& bmp)
-{
- if ( *this == bmp ) return (*this);
- Ref(bmp);
- return *this;
}
bool wxBitmap::operator == (const wxBitmap& bmp) const
{
wxBitmap *bmp = (wxBitmap*)(&icon);
*this = *bmp;
- return TRUE;
+ return true;
}
wxBitmap wxBitmap::GetSubBitmap(const wxRect& rect) const
ret.SetPalette(*GetPalette());
MGLDevCtx *tdc = ret.CreateTmpDC();
- tdc->putBitmapSection(rect.x, rect.y,
+ tdc->putBitmapSection(rect.x, rect.y,
rect.x + rect.width, rect.y + rect.height,
0, 0, M_BMPDATA->m_bitmap, MGL_REPLACE_MODE);
delete tdc;
M_BMPDATA->m_bitmap->bitsPerPixel,
M_BMPDATA->m_bitmap->pf,
M_BMPDATA->m_bitmap->bytesPerLine,
- M_BMPDATA->m_bitmap->surface,
+ M_BMPDATA->m_bitmap->surface,
NULL);
wxCHECK_MSG( tdc->isValid(), NULL, wxT("cannot create temporary MGLDC") );
if ( M_BMPDATA->m_bitmap->pal != NULL )
{
int cnt;
-
+
switch (M_BMPDATA->m_bitmap->bitsPerPixel)
{
case 2: cnt = 2; break;
wxFAIL_MSG( wxT("bitmap with this depth cannot have palette") );
break;
}
-
+
tdc->setPalette(M_BMPDATA->m_bitmap->pal, cnt, 0);
tdc->realizePalette(cnt, 0, FALSE);
}
-
+
return tdc;
}
bool wxBitmap::LoadFile(const wxString &name, wxBitmapType type)
{
UnRef();
-
- if ( type == wxBITMAP_TYPE_BMP || type == wxBITMAP_TYPE_PNG ||
+
+ if ( type == wxBITMAP_TYPE_BMP || type == wxBITMAP_TYPE_PNG ||
type == wxBITMAP_TYPE_PCX || type == wxBITMAP_TYPE_JPEG )
{
// prevent accidental loading of bitmap from $MGL_ROOT:
if ( !wxFileExists(name) )
{
wxLogError(_("File %s does not exist."), name.c_str());
- return FALSE;
+ return false;
}
}
-
+
wxBitmapHandler *handler = FindHandler(type);
- if ( handler == NULL )
+ if ( handler == NULL )
{
wxImage image;
if ( !image.LoadFile(name, type) || !image.Ok() )
{
- wxLogError("no bitmap handler for type %d defined.", type);
- return FALSE;
+ wxLogError("no bitmap handler for type %d defined.", type);
+ return false;
}
else
{
*this = wxBitmap(image);
- return TRUE;
+ return true;
}
}
bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type, const wxPalette *palette) const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
+ wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
wxBitmapHandler *handler = FindHandler(type);
- if ( handler == NULL )
+ if ( handler == NULL )
{
wxImage image = ConvertToImage();
if ( palette )
else
{
wxLogError("no bitmap handler for type %d defined.", type);
- return FALSE;
+ return false;
}
}
M_BMPDATA->m_palette = NULL;
if ( !palette.Ok() ) return;
-
+
M_BMPDATA->m_palette = new wxPalette(palette);
int cnt = palette.GetColoursCount();
wxMGLBitmapHandler(wxBitmapType type,
const wxString& extension, const wxString& name);
- virtual bool Create(wxBitmap *bitmap, void *data, long flags,
- int width, int height, int depth = 1)
- { return FALSE; }
+ virtual bool Create(wxBitmap *WXUNUSED(bitmap),
+ void *WXUNUSED(data),
+ long WXUNUSED(flags),
+ int WXUNUSED(width),
+ int WXUNUSED(height),
+ int WXUNUSED(depth) = 1)
+ { return false; }
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight);
- virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
+ virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
int type, const wxPalette *palette = NULL);
};
-wxMGLBitmapHandler::wxMGLBitmapHandler(wxBitmapType type,
+wxMGLBitmapHandler::wxMGLBitmapHandler(wxBitmapType type,
const wxString& extension,
const wxString& name)
: wxBitmapHandler()
SetExtension(extension);
}
-bool wxMGLBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
- long flags,
- int WXUNUSED(desiredWidth),
+bool wxMGLBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
+ long flags,
+ int WXUNUSED(desiredWidth),
int WXUNUSED(desiredHeight))
{
int width, height, bpp;
pixel_format_t pf;
wxString fullname;
wxMemoryDC dc;
-
+
switch (flags)
{
case wxBITMAP_TYPE_BMP_RESOURCE:
default:
fullname= name;
break;
- }
+ }
switch (flags)
{
case wxBITMAP_TYPE_BMP:
case wxBITMAP_TYPE_BMP_RESOURCE:
if ( !MGL_getBitmapSize(fullname.mb_str(), &width, &height, &bpp, &pf) )
- return FALSE;
+ return false;
bitmap->Create(width, height, -1);
- if ( !bitmap->Ok() ) return FALSE;
+ if ( !bitmap->Ok() ) return false;
dc.SelectObject(*bitmap);
if ( !dc.GetMGLDC()->loadBitmapIntoDC(fullname.mb_str(), 0, 0, TRUE) )
- return FALSE;
+ return false;
break;
case wxBITMAP_TYPE_JPEG:
case wxBITMAP_TYPE_JPEG_RESOURCE:
if ( !MGL_getJPEGSize(fullname.mb_str(), &width, &height, &bpp, &pf) )
- return FALSE;
+ return false;
bitmap->Create(width, height, -1);
- if ( !bitmap->Ok() ) return FALSE;
+ if ( !bitmap->Ok() ) return false;
dc.SelectObject(*bitmap);
if ( !dc.GetMGLDC()->loadJPEGIntoDC(fullname.mb_str(), 0, 0, TRUE) )
- return FALSE;
+ return false;
break;
case wxBITMAP_TYPE_PNG:
case wxBITMAP_TYPE_PNG_RESOURCE:
if ( !MGL_getPNGSize(fullname.mb_str(), &width, &height, &bpp, &pf) )
- return FALSE;
+ return false;
bitmap->Create(width, height, -1);
- if ( !bitmap->Ok() ) return FALSE;
+ if ( !bitmap->Ok() ) return false;
dc.SelectObject(*bitmap);
if ( !dc.GetMGLDC()->loadPNGIntoDC(fullname.mb_str(), 0, 0, TRUE) )
- return FALSE;
+ return false;
break;
case wxBITMAP_TYPE_PCX:
case wxBITMAP_TYPE_PCX_RESOURCE:
if ( !MGL_getPCXSize(fullname.mb_str(), &width, &height, &bpp) )
- return FALSE;
+ return false;
bitmap->Create(width, height, -1);
- if ( !bitmap->Ok() ) return FALSE;
+ if ( !bitmap->Ok() ) return false;
dc.SelectObject(*bitmap);
if ( !dc.GetMGLDC()->loadPCXIntoDC(fullname.mb_str(), 0, 0, TRUE) )
- return FALSE;
+ return false;
break;
default:
break;
}
- return TRUE;
+ return true;
}
-bool wxMGLBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name,
+bool wxMGLBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name,
int type, const wxPalette * WXUNUSED(palette))
{
wxMemoryDC mem;
switch (type)
{
case wxBITMAP_TYPE_BMP:
- return tdc->saveBitmapFromDC(name.mb_str(), 0, 0, w, h);
- break;
+ return (bool)tdc->saveBitmapFromDC(name.mb_str(), 0, 0, w, h);
case wxBITMAP_TYPE_JPEG:
- return tdc->saveJPEGFromDC(name.mb_str(), 0, 0, w, h, 75);
- break;
+ return (bool)tdc->saveJPEGFromDC(name.mb_str(), 0, 0, w, h, 75);
case wxBITMAP_TYPE_PNG:
- return tdc->savePNGFromDC(name.mb_str(), 0, 0, w, h);
- break;
+ return (bool)tdc->savePNGFromDC(name.mb_str(), 0, 0, w, h);
case wxBITMAP_TYPE_PCX:
- return tdc->savePCXFromDC(name.mb_str(), 0, 0, w, h);
- break;
- default:
- return FALSE;
- break;
+ return (bool)tdc->savePCXFromDC(name.mb_str(), 0, 0, w, h);
}
+
+ return false;
}
-// let's handle PNGs in special way because they have alpha channel
+// let's handle PNGs in special way because they have alpha channel
// which we can access via bitmap_t most easily
class wxPNGBitmapHandler: public wxMGLBitmapHandler
{
int desiredWidth, int desiredHeight);
};
-bool wxPNGBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
- long flags,
+bool wxPNGBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
+ long flags,
int desiredWidth, int desiredHeight)
{
int width, height, bpp;
fullname = name;
if ( !MGL_getPNGSize(fullname.mb_str(), &width, &height, &bpp, &pf) )
- return FALSE;
+ return false;
if ( bpp != 32 )
{
// We can load ordinary PNGs faster with 'normal' MGL handler.
// Only RGBA PNGs need to be processed in special way because
// we have to convert alpha channel to mask
- return wxMGLBitmapHandler::LoadFile(bitmap, name, flags,
+ return wxMGLBitmapHandler::LoadFile(bitmap, name, flags,
desiredWidth, desiredHeight);
}
-
+
bitmap_t *bmp = MGL_loadPNG(fullname.mb_str(), TRUE);
-
- if ( bmp == NULL ) return FALSE;
+
+ if ( bmp == NULL ) return false;
bitmap->Create(bmp->width, bmp->height, -1);
- if ( !bitmap->Ok() ) return FALSE;
-
+ if ( !bitmap->Ok() ) return false;
+
// convert bmp to display's depth and write it to *bitmap:
wxMemoryDC dc;
dc.SelectObject(*bitmap);
dc.GetMGLDC()->putBitmap(0, 0, bmp, MGL_REPLACE_MODE);
dc.SelectObject(wxNullBitmap);
-
+
// create mask, if bmp contains alpha channel (ARGB format):
if ( bmp->bitsPerPixel == 32 )
{
s = ((wxUint32*)bmp->surface) + y * bmp->bytesPerLine/4;
for (x = 0; x < bmp->width; x++, s ++)
{
- if ( ((((*s) >> bmp->pf->rsvdPos) & bmp->pf->rsvdMask)
- << bmp->pf->rsvdAdjust) < 128 )
+ if ( ((((*s) >> bmp->pf->alphaPos) & bmp->pf->alphaMask)
+ << bmp->pf->alphaAdjust) < 128 )
*s = 0;
else
*s = 0x00FFFFFF; // white
dc.SelectObject(wxNullBitmap);
bitmap->SetMask(new wxMask(mask));
}
-
+
MGL_unloadBitmap(bmp);
-
- return TRUE;
+
+ return true;
}
public:
wxICOBitmapHandler(wxBitmapType type,
const wxString& extension, const wxString& name);
-
- virtual bool Create(wxBitmap *bitmap, void *data, long flags,
- int width, int height, int depth = 1)
- { return FALSE; }
-
+
+ virtual bool Create(wxBitmap *WXUNUSED(bitmap),
+ void *WXUNUSED(data),
+ long WXUNUSED(flags),
+ int WXUNUSED(width),
+ int WXUNUSED(height),
+ int WXUNUSED(depth) = 1)
+ { return false; }
+
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight);
- virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
+ virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
int type, const wxPalette *palette = NULL);
};
-wxICOBitmapHandler::wxICOBitmapHandler(wxBitmapType type,
+wxICOBitmapHandler::wxICOBitmapHandler(wxBitmapType type,
const wxString& extension,
const wxString& name)
: wxBitmapHandler()
SetExtension(extension);
}
-bool wxICOBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
- long flags,
- int WXUNUSED(desiredWidth),
+bool wxICOBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
+ long flags,
+ int WXUNUSED(desiredWidth),
int WXUNUSED(desiredHeight))
{
icon_t *icon = NULL;
if ( flags == wxBITMAP_TYPE_ICO_RESOURCE )
icon = MGL_loadIcon(wxString(name + wxT(".ico")).mb_str(), TRUE);
- else
+ else
icon = MGL_loadIcon(name.mb_str(), TRUE);
- if ( icon == NULL ) return FALSE;
+ if ( icon == NULL ) return false;
bitmap->Create(icon->xorMask.width, icon->xorMask.height);
dc->clearDevice();
dc->putMonoImage(0, 0, icon->xorMask.width, icon->byteWidth,
icon->xorMask.height, (void*)icon->andMask);
-
+
bitmap->SetMask(new wxMask(mask));
MGL_unloadIcon(icon);
-
- return TRUE;
+
+ return true;
}
-bool wxICOBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name,
- int type, const wxPalette * WXUNUSED(palette))
+bool wxICOBitmapHandler::SaveFile(const wxBitmap *WXUNUSED(bitmap),
+ const wxString& WXUNUSED(name),
+ int WXUNUSED(type),
+ const wxPalette * WXUNUSED(palette))
{
- return FALSE;
+ return false;
}
projects / wxWidgets.git / blobdiff