Reverted patch [ 746201 ] (partially) because of unwanted side-effects

[wxWidgets.git] / include / wx / msw / dib.h

diff --git a/include/wx/msw/dib.h b/include/wx/msw/dib.h
index f4f0bf0a86dc11b4af1c614fad8b71a022cb33ee..6a2a40a02077f88e3d253f9f1ea55a929fa2e292 100644 (file)
--- a/include/wx/msw/dib.h
+++ b/include/wx/msw/dib.h
@@ -151,30 +151,10 @@ public:
 
 private:
     // common part of all ctors
 
 private:
     // common part of all ctors

-    void Init()
-    {
-        m_handle = 0;
-
-        m_data = NULL;
-
-        m_width =
-        m_height =
-        m_depth = 0;
-    }
+    void Init();

 
     // free resources
 
     // free resources

-    void Free()
-    {
-        if ( m_handle )
-        {
-            if ( !::DeleteObject(m_handle) )
-            {
-                wxLogLastError(wxT("DeleteObject(hDIB)"));
-            }
-
-            Init();
-        }
-    }
+    void Free();

 
     // the DIB section handle, 0 if invalid
     HBITMAP m_handle;
 
     // the DIB section handle, 0 if invalid
     HBITMAP m_handle;


@@ -198,6 +178,11 @@ private:
         m_height,
         m_depth;
 
         m_height,
         m_depth;
 

+    // in some cases we could be using a handle which we didn't create and in
+    // this case we shouldn't free it neither -- this flag tell us if this is
+    // the case
+    bool m_ownsHandle;
+

 
     // DIBs can't be copied
     wxDIB(const wxDIB&);
 
     // DIBs can't be copied
     wxDIB(const wxDIB&);


@@ -208,6 +193,33 @@ private:
 // inline functions implementation
 // ----------------------------------------------------------------------------
 
 // inline functions implementation
 // ----------------------------------------------------------------------------
 

+inline
+void wxDIB::Init()
+{
+    m_handle = 0;
+    m_ownsHandle = true;
+
+    m_data = NULL;
+
+    m_width =
+    m_height =
+    m_depth = 0;
+}
+
+inline
+void wxDIB::Free()
+{
+    if ( m_handle && m_ownsHandle )
+    {
+        if ( !::DeleteObject(m_handle) )
+        {
+            wxLogLastError(wxT("DeleteObject(hDIB)"));
+        }
+
+        Init();
+    }
+}
+

 inline wxDIB::~wxDIB()
 {
     Free();
 inline wxDIB::~wxDIB()
 {
     Free();