Don't reset bullet number and outline number when applying style sheet.

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

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 48f804ef1e8d069113eb3673b33f1b2bf0c4a999..74c400fcccbebe46dbff89ec8438a0d53e0ea4bd 100644 (file)
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -84,11 +84,7 @@ void wxBitmapRefData::Free()
             wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)"));
         }
     }
             wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)"));
         }
     }

-    if (m_pBitmapMask)
-    {
-        delete m_pBitmapMask;
-        m_pBitmapMask = NULL;
-    }
+    wxDELETE(m_pBitmapMask);

 } // end of wxBitmapRefData::Free
 
 // ----------------------------------------------------------------------------
 } // end of wxBitmapRefData::Free
 
 // ----------------------------------------------------------------------------


@@ -917,7 +913,7 @@ wxImage wxBitmap::ConvertToImage() const
     // May already be selected into a PS
     //
     pDC = GetSelectedInto();
     // May already be selected into a PS
     //
     pDC = GetSelectedInto();

-    const wxPMDCImpl *impl; 
+    const wxPMDCImpl *impl;

     if (pDC != NULL &&
         (impl = wxDynamicCast( pDC->GetImpl(), wxPMDCImpl )) != NULL)
     {
     if (pDC != NULL &&
         (impl = wxDynamicCast( pDC->GetImpl(), wxPMDCImpl )) != NULL)
     {