Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attempt to fix compilation after the last change

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-22 17:33:10 +00:00
parent 4c30dd1a6b
commit 1c0b21e8da
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/mgl/bitmap.cpp
View File

@@ -64,6 +64,7 @@ static pixel_format_t gs_pixel_format_wxImage =
class wxBitmapRefData: public wxGDIRefData class wxBitmapRefData: public wxGDIRefData
{ {
public: public:
wxBitmapRefData();
wxBitmapRefData(int width, int height, int bpp); wxBitmapRefData(int width, int height, int bpp);
wxBitmapRefData(const wxBitmapRefData& data); wxBitmapRefData(const wxBitmapRefData& data);
virtual ~wxBitmapRefData(); virtual ~wxBitmapRefData();
@@ -78,11 +79,15 @@ public:
bitmap_t *m_bitmap; bitmap_t *m_bitmap;
private: private:
void DoCreateBitmap(); void DoCreateBitmap(int width, int height, int depth);
}; };
void wxBitmapRefData::DoCreateBitmap() void wxBitmapRefData::DoCreateBitmap(int width, int height, int depth)
{ {
m_width = width;
m_height = height;
m_bpp = depth;
pixel_format_t pf_dummy; pixel_format_t pf_dummy;
pixel_format_t *pf; pixel_format_t *pf;
int mglDepth = depth; int mglDepth = depth;
@@ -122,28 +127,32 @@ void wxBitmapRefData::DoCreateBitmap()
m_bitmap = MyMGL_createBitmap(width, height, mglDepth, pf); m_bitmap = MyMGL_createBitmap(width, height, mglDepth, pf);
} }
wxBitmapRefData::wxBitmapRefData(int width, int height, int bpp) wxBitmapRefData::wxBitmapRefData()
{ {
m_width = width; m_width =
m_height = height; m_height =
m_bpp = bpp; m_bpp = 0;
m_palette = NULL; m_palette = NULL;
m_mask = NULL; m_mask = NULL;
DoCreateBitmap(); m_bitmap = NULL;
}
wxBitmapRefData::wxBitmapRefData(int width, int height, int bpp)
{
DoCreateBitmap(width, height, bpp);
m_palette = NULL;
m_mask = NULL;
} }
wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data) wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
{ {
m_width = data.m_width; DoCreateBitmap(data.m_width, data.m_height, data.m_bpp);
m_height = data.m_height;
m_bpp = data.m_bpp;
m_palette = NULL; // FIXME: should copy m_palette = NULL; // FIXME: should copy
m_mask = NULL; // FIXME: should copy m_mask = NULL; // FIXME: should copy
DoCreateBitmap();
} }
wxBitmapRefData::~wxBitmapRefData() wxBitmapRefData::~wxBitmapRefData()