initialize m_surface when copying invalid bitmap

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/dfb/bitmap.cpp b/src/dfb/bitmap.cpp
index 8b57fb96deaf2da115d76923ae9d71e97d31389b..72f4fda4c04e180a13a58cb823d55a0a5ad134ed 100644 (file)
--- a/src/dfb/bitmap.cpp
+++ b/src/dfb/bitmap.cpp
@@ -69,8 +69,7 @@ public:
 
     wxBitmapRefData(const wxBitmapRefData& data)
     {
 
     wxBitmapRefData(const wxBitmapRefData& data)
     {

-        if ( data.m_surface )
-            m_surface = data.m_surface->Clone();
+        m_surface = data.m_surface ? data.m_surface->Clone() : NULL;

 
         m_mask = data.m_mask ? new wxMask(*data.m_mask) : NULL;
 #if wxUSE_PALETTE
 
         m_mask = data.m_mask ? new wxMask(*data.m_mask) : NULL;
 #if wxUSE_PALETTE


@@ -78,7 +77,7 @@ public:
 #endif
     }
 
 #endif
     }
 

-    ~wxBitmapRefData()
+    virtual ~wxBitmapRefData()

     {
         delete m_mask;
 #if wxUSE_PALETTE
     {
         delete m_mask;
 #if wxUSE_PALETTE