// Name: bitmap.cpp
// Author: Vaclav Slavik
// RCS-ID: $Id$
-// Copyright: (c) 2001 Vaclav Slavik
+// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
static pixel_format_t gs_pixel_format_32 =
{0xFF,0x18,0, 0xFF,0x10,0, 0xFF,0x08,0, 0xFF,0x00,0}; // RGBA 32bpp
-// FIXME_MGL -- these formats will probably have to go into another place,
-// where wxApp could use them to initialize g_displayDC
-
+static pixel_format_t gs_pixel_format_wxImage =
+ {0xFF,0x00,0, 0xFF,0x08,0, 0xFF,0x10,0, 0x00,0x00,0}; // RGB 24bpp for wxImage
//-----------------------------------------------------------------------------
// wxMask
if ( !Create(width, height, depth) ) return;
- MGLMemoryDC idc(width, height, 24, &gs_pixel_format_24,
+ MGLMemoryDC idc(width, height, 24, &gs_pixel_format_wxImage,
width * 3, (void*)image.GetData(), NULL);
wxASSERT_MSG( idc.isValid(), wxT("cannot create custom MGLDC") );
{
wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
- long width, height;
+ 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_24,
+ MGLMemoryDC idc(width, height, 24, &gs_pixel_format_wxImage,
width * 3, (void*)image.GetData(), NULL);
wxASSERT_MSG( idc.isValid(), wxT("cannot create custom MGLDC") );
case 4: cnt = 16; break;
case 8: cnt = 256; break;
default:
+ cnt = 0;
wxFAIL_MSG( wxT("bitmap with this depth cannot have palette") );
break;
}