applying patch, fixes #10523

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

diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
index 65294d62c6185f5d939397c858c38f9f02a8081d..013e9f467428c2e83ffe0393235b56ebcbd2b41c 100644 (file)
--- a/src/mgl/bitmap.cpp
+++ b/src/mgl/bitmap.cpp
@@ -31,6 +31,13 @@
 
 #include <mgraph.hpp>
 
 
 #include <mgraph.hpp>
 

+static bitmap_t *MyMGL_createBitmap(int width, int height,
+                                    int bpp, pixel_format_t *pf)
+{
+    MGLMemoryDC mdc(width, height, bpp, pf);
+    return MGL_getBitmapFromDC(mdc.getDC(), 0, 0, width, height, TRUE);
+}
+

 //-----------------------------------------------------------------------------
 // MGL pixel formats:
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // MGL pixel formats:
 //-----------------------------------------------------------------------------


@@ -54,10 +61,12 @@ static pixel_format_t gs_pixel_format_wxImage =
 // wxBitmap
 //-----------------------------------------------------------------------------
 
 // wxBitmap
 //-----------------------------------------------------------------------------
 

-class wxBitmapRefData: public wxObjectRefData
+class wxBitmapRefData: public wxGDIRefData

 {
 public:
     wxBitmapRefData();
 {
 public:
     wxBitmapRefData();

+    wxBitmapRefData(int width, int height, int bpp);
+    wxBitmapRefData(const wxBitmapRefData& data);

     virtual ~wxBitmapRefData();
 
     virtual bool IsOk() const { return m_bitmap != NULL; }
     virtual ~wxBitmapRefData();
 
     virtual bool IsOk() const { return m_bitmap != NULL; }


@@ -68,18 +77,84 @@ public:
     wxPalette      *m_palette;
     wxMask         *m_mask;
     bitmap_t       *m_bitmap;
     wxPalette      *m_palette;
     wxMask         *m_mask;
     bitmap_t       *m_bitmap;

+
+private:
+    void DoCreateBitmap(int width, int height, int depth);

 };
 
 };
 

+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;
+
+    switch ( depth )
+    {
+        case -1:
+            wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
+
+            g_displayDC->getPixelFormat(pf_dummy);
+            mglDepth = g_displayDC->getBitsPerPixel();
+            pf = &pf_dummy;
+            break;
+        case 1:
+        case 8:
+            pf = NULL;
+            mglDepth = 8; // we emulate monochrome bitmaps using 8 bit ones
+            break;
+        case 15:
+            pf = &gs_pixel_format_15;
+            break;
+        case 16:
+            pf = &gs_pixel_format_16;
+            break;
+        case 24:
+            pf = &gs_pixel_format_24;
+            break;
+        case 32:
+            pf = &gs_pixel_format_32;
+            break;
+        default:
+            wxFAIL_MSG(wxT("invalid bitmap depth"));
+            m_bitmap = NULL;
+            return;
+    }
+
+    m_bitmap = MyMGL_createBitmap(width, height, mglDepth, pf);
+}
+

 wxBitmapRefData::wxBitmapRefData()
 {
 wxBitmapRefData::wxBitmapRefData()
 {

-    m_mask = NULL;
-    m_width = 0;
-    m_height = 0;
+    m_width =
+    m_height =

     m_bpp = 0;
     m_bpp = 0;

+

     m_palette = NULL;
     m_palette = NULL;

+    m_mask = NULL;
+

     m_bitmap = NULL;
 }
 
     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)
+{
+    DoCreateBitmap(data.m_width, data.m_height, data.m_bpp);
+
+    m_palette = NULL; // FIXME: should copy
+    m_mask = NULL; // FIXME: should copy
+}
+

 wxBitmapRefData::~wxBitmapRefData()
 {
     if ( m_bitmap )
 wxBitmapRefData::~wxBitmapRefData()
 {
     if ( m_bitmap )


@@ -100,11 +175,14 @@ wxBitmap::wxBitmap(int width, int height, int depth)
 }
 
 
 }
 
 

-static bitmap_t *MyMGL_createBitmap(int width, int height,
-                                    int bpp, pixel_format_t *pf)
+wxGDIRefData *wxBitmap::CreateGDIRefData() const

 {
 {

-    MGLMemoryDC mdc(width, height, bpp, pf);
-    return MGL_getBitmapFromDC(mdc.getDC(), 0, 0, width, height, TRUE);
+    return new wxBitmapRefData;
+}
+
+wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxBitmapRefData(*static_cast<const wxBitmapRefData *>(data));

 }
 
 bool wxBitmap::Create(int width, int height, int depth)
 }
 
 bool wxBitmap::Create(int width, int height, int depth)


@@ -113,58 +191,13 @@ bool wxBitmap::Create(int width, int height, int depth)
 
     wxCHECK_MSG( (width > 0) && (height > 0), false, wxT("invalid bitmap size") );
 
 
     wxCHECK_MSG( (width > 0) && (height > 0), false, wxT("invalid bitmap size") );
 

-    pixel_format_t pf_dummy;
-    pixel_format_t *pf;
-    int mglDepth = depth;
+    m_refData = new wxBitmapRefData(width, height, depth);

 
 

-    switch ( depth )
-    {
-        case -1:
-            wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
-
-            g_displayDC->getPixelFormat(pf_dummy);
-            mglDepth = g_displayDC->getBitsPerPixel();
-            pf = &pf_dummy;
-            break;
-        case 1:
-        case 8:
-            pf = NULL;
-            break;
-        case 15:
-            pf = &gs_pixel_format_15;
-            break;
-        case 16:
-            pf = &gs_pixel_format_16;
-            break;
-        case 24:
-            pf = &gs_pixel_format_24;
-            break;
-        case 32:
-            pf = &gs_pixel_format_32;
-            break;
-        default:
-            wxFAIL_MSG(wxT("invalid bitmap depth"));
-            return false;
-    }
-
-    m_refData = new wxBitmapRefData();
-    M_BMPDATA->m_mask = (wxMask *) NULL;
-    M_BMPDATA->m_palette = (wxPalette *) NULL;
-    M_BMPDATA->m_width = width;
-    M_BMPDATA->m_height = height;
-    M_BMPDATA->m_bpp = mglDepth;
-
-    if ( mglDepth != 1 )
-    {
-        M_BMPDATA->m_bitmap = MyMGL_createBitmap(width, height, mglDepth, pf);
-    }
-    else
+    if ( depth == 1 )

     {
         // 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.
     {
         // 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.

-
-        M_BMPDATA->m_bitmap = MyMGL_createBitmap(width, height, 8, pf);

         SetMonoPalette(wxColour(255, 255, 255), wxColour(0, 0, 0));
     }
 
         SetMonoPalette(wxColour(255, 255, 255), wxColour(0, 0, 0));
     }
 


@@ -290,7 +323,7 @@ int wxBitmap::GetDepth() const
 
 wxMask *wxBitmap::GetMask() const
 {
 
 wxMask *wxBitmap::GetMask() const
 {

-    wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_mask;
 }
 
     return M_BMPDATA->m_mask;
 }


@@ -398,7 +431,7 @@ MGLDevCtx *wxBitmap::CreateTmpDC() const
 
 bool wxBitmap::LoadFile(const wxString &name, wxBitmapType type)
 {
 
 bool wxBitmap::LoadFile(const wxString &name, wxBitmapType type)
 {

-    UnRef();
+    AllocExclusive();

 
     if ( type == wxBITMAP_TYPE_BMP || type == wxBITMAP_TYPE_PNG ||
          type == wxBITMAP_TYPE_PCX || type == wxBITMAP_TYPE_JPEG )
 
     if ( type == wxBITMAP_TYPE_BMP || type == wxBITMAP_TYPE_PNG ||
          type == wxBITMAP_TYPE_PCX || type == wxBITMAP_TYPE_JPEG )


@@ -428,8 +461,6 @@ bool wxBitmap::LoadFile(const wxString &name, wxBitmapType type)
         }
     }
 
         }
     }
 

-    m_refData = new wxBitmapRefData();
-

     return handler->LoadFile(this, name, type, -1, -1);
 }
 
     return handler->LoadFile(this, name, type, -1, -1);
 }