wxDialogBase only has one ctor, so just do initialization in ctor instead of Init()

[wxWidgets.git] / include / wx / ptr_shrd.h

diff --git a/include/wx/ptr_shrd.h b/include/wx/ptr_shrd.h
index 71492d9754495cc8386f9ec29e4cd25a5c6917eb..635cfe36e069ce07d4673576fc5f414508a65ea6 100644 (file)
--- a/include/wx/ptr_shrd.h
+++ b/include/wx/ptr_shrd.h
@@ -1,143 +1,11 @@
-/////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/ptr_shrd.h
-// Purpose:     Shared pointer based on the counted_ptr<> template, which
-//              is in the public domain
-// Author:      Robert Roebling, Yonat Sharon
-// RCS-ID:      $Id: object.h 47254 2007-07-09 10:09:52Z VS $
-// Copyright:   Robert Roebling
+// Purpose:     compatibility wrapper for wx/sharedptr.h
+// Author:      Vadim Zeitlin
+// Created:     2009-02-03
+// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_SHARED_PTRH__
-#define _WX_SHARED_PTRH__
-
-#include "wx/defs.h"
-#include "wx/atomic.h"
-
-// ----------------------------------------------------------------------------
-// wxSharedPtr: A smart pointer with non-intrusive reference counting.
-// ----------------------------------------------------------------------------
-
-template <class T> 
-class wxSharedPtr
-{
-public:
-    typedef T element_type;
-
-    wxEXPLICIT wxSharedPtr( T* ptr = NULL )
-        : m_ref(NULL) 
-    { 
-        if (ptr) 
-            m_ref = new reftype(ptr); 
-    }
-        
-    ~wxSharedPtr()                           { Release(); }
-    wxSharedPtr(const wxSharedPtr& tocopy)   { Acquire(tocopy.m_ref); }
-    
-    wxSharedPtr& operator=( const wxSharedPtr& tocopy )
-    {
-        if (this != &tocopy) 
-        {
-            Release();
-            Acquire(tocopy.m_ref);
-        }
-        return *this;
-    }
-
-    wxSharedPtr& operator=( T* ptr )
-    {
-        if (get() != ptr) 
-        {
-            Release();
-            if (ptr) 
-                m_ref = new reftype(ptr); 
-        }
-        return *this;
-    }
-
-    // test for pointer validity: defining conversion to unspecified_bool_type
-    // and not more obvious bool to avoid implicit conversions to integer types
-    typedef T *(wxSharedPtr<T>::*unspecified_bool_type)() const;
-    operator unspecified_bool_type() const
-    {
-        if (m_ref && m_ref->m_ptr)
-           return  &wxSharedPtr<T>::get;
-        else
-           return NULL;
-    }
-
-    T& operator*() const
-    { 
-        wxASSERT(m_ref != NULL);    
-        wxASSERT(m_ref->m_ptr != NULL);    
-        return *(m_ref->m_ptr);
-    }
-    
-    T* operator->() const
-    { 
-        wxASSERT(m_ref != NULL);    
-        wxASSERT(m_ref->m_ptr != NULL);    
-        return m_ref->m_ptr;
-    }
-    
-    T* get() const    
-    { 
-        return m_ref ? m_ref->m_ptr : NULL; 
-    }
-    
-    void reset( T* ptr = NULL )
-    {
-        Release();
-        if (ptr) 
-            m_ref = new reftype(ptr); 
-    }
-    
-    bool unique()   const    { return (m_ref ? m_ref->m_count == 1 : true); }
-    long use_count() const   { return (m_ref ? (long)m_ref->m_count : 0); }
-
-private:
-
-    struct reftype 
-    {
-        reftype( T* ptr = NULL, unsigned count = 1 ) : m_ptr(ptr), m_count(count) {}
-        T*          m_ptr;
-        wxAtomicInt m_count;
-    }* m_ref;
-
-    void Acquire(reftype* ref) 
-    {
-        m_ref = ref;
-        if (ref) 
-            wxAtomicInc( ref->m_count );
-    }
-
-    void Release()
-    {
-        if (m_ref) 
-        {
-            wxAtomicDec( m_ref->m_count );
-            if (m_ref->m_count == 0) 
-            {
-                delete m_ref->m_ptr;
-                delete m_ref;
-            }
-            m_ref = NULL;
-        }
-    }
-};
-
-template <class T, class U>
-bool operator == (wxSharedPtr<T> const &a, wxSharedPtr<U> const &b )
-{
-    return a.get() == b.get();
-}
-
-template <class T, class U>
-bool operator != (wxSharedPtr<T> const &a, wxSharedPtr<U> const &b )
-{
-    return a.get() != b.get();
-}
-
-
-
-#endif // _WX_SHARED_PTRH__
+// do not include this file in any new code, include wx/sharedptr.h instead
+#include "wx/sharedptr.h"