From 1c0b21e8da6de47255710e8f8652d5e27ae608fb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 22 Jul 2008 17:33:10 +0000
Subject: [PATCH] attempt to fix compilation after the last change

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/mgl/bitmap.cpp | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
index ad2e0199a1..a5e7521239 100644
--- a/src/mgl/bitmap.cpp
+++ b/src/mgl/bitmap.cpp
@@ -64,6 +64,7 @@ static pixel_format_t gs_pixel_format_wxImage =
 class wxBitmapRefData: public wxGDIRefData
 {
 public:
+    wxBitmapRefData();
     wxBitmapRefData(int width, int height, int bpp);
     wxBitmapRefData(const wxBitmapRefData& data);
     virtual ~wxBitmapRefData();
@@ -78,11 +79,15 @@ public:
     bitmap_t       *m_bitmap;
 
 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;
     int mglDepth = depth;
@@ -122,28 +127,32 @@ void wxBitmapRefData::DoCreateBitmap()
     m_bitmap = MyMGL_createBitmap(width, height, mglDepth, pf);
 }
 
-wxBitmapRefData::wxBitmapRefData(int width, int height, int bpp)
+wxBitmapRefData::wxBitmapRefData()
 {
-    m_width = width;
-    m_height = height;
-    m_bpp = bpp;
+    m_width =
+    m_height =
+    m_bpp = 0;
 
     m_palette = 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)
 {
-    m_width = data.m_width;
-    m_height = data.m_height;
-    m_bpp = data.m_bpp;
+    DoCreateBitmap(data.m_width, data.m_height, data.m_bpp);
 
     m_palette = NULL; // FIXME: should copy
     m_mask = NULL; // FIXME: should copy
-
-    DoCreateBitmap();
 }
 
 wxBitmapRefData::~wxBitmapRefData()
-- 
2.45.2