-/////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
// Name: wx/ptr_scpd.h
-// Purpose: scoped smart pointer class
-// Author: Jesse Lovelace <jllovela@eos.ncsu.edu>
-// Modified by:
-// Created: 06/01/02
-// RCS-ID: $Id$
-// Copyright: (c) Jesse Lovelace and original Boost authors (see below)
-// Licence: wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// This class closely follows the implementation of the boost
-// library scoped_ptr and is an adaption for c++ macro's in
-// the wxWindows project. The original authors of the boost
-// scoped_ptr are given below with their respective copyrights.
-
-// (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
-// Copyright (c) 2001, 2002 Peter Dimov
-//
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
-// This software is provided "as is" without express or implied
-// warranty, and with no claim as to its suitability for any purpose.
-//
-// See http://www.boost.org/libs/smart_ptr/scoped_ptr.htm for documentation.
-//
-
-#ifndef __WX_SCOPED_POINTER__
-#define __WX_SCOPED_POINTER__
-
-#include "wx/defs.h"
-
-/* checked deleters are used to make sure that the
- type being deleted is really a complete type.
- - Jesse Lovelace <jllovela@eos.ncsu.edu>
-*/
-
-#define wxCHECKED_DELETE(ptr) \
- if (true) { \
- typedef char complete[sizeof(*ptr)]; \
- delete ptr; \
- }
-
-#define wxCHECKED_DELETE_ARRAY(ptr) \
- if (true) { \
- typedef char complete[sizeof(*ptr)]; \
- delete [] ptr; \
- }
-
-/* These scoped pointers are *not* assignable and cannot be used
- within a container. Look for wxDECLARE_SHARED_PTR for this
- functionality.
-
- In addition, the type being used *must* be complete at the time
- that wxDEFINE_SCOPED_* is called or a compiler error will result.
- This is because the class checks for the completeness of the type
- being used.
-*/
-
-
-#define wxDECLARE_SCOPED_PTR(T, name) \
-class name \
-{ \
-private: \
- T * m_ptr; \
- \
- name(name const &); \
- name & operator=(name const &); \
- \
-public: \
- wxEXPLICIT name(T * ptr = NULL) \
- : m_ptr(ptr) { } \
- \
- ~name(); \
- \
- void reset(T * ptr = NULL) \
- { \
- if (m_ptr != ptr) \
- { \
- delete m_ptr; \
- m_ptr = ptr; \
- } \
- } \
- \
- T & operator*() const \
- { \
- wxASSERT(m_ptr != NULL); \
- return *m_ptr; \
- } \
- \
- T * operator->() const \
- { \
- wxASSERT(m_ptr != NULL); \
- return m_ptr; \
- } \
- \
- T * get() const \
- { \
- return m_ptr; \
- } \
- \
- void swap(name & ot) \
- { \
- T * tmp = ot.m_ptr; \
- ot.m_ptr = m_ptr; \
- m_ptr = tmp; \
- } \
-};
-
-#define wxDEFINE_SCOPED_PTR(T, name)\
-name::~name() \
-{ \
- wxCHECKED_DELETE(m_ptr) \
-}
-
-#define wxDECLARE_SCOPED_ARRAY(T, name)\
-class name \
-{ \
-private: \
- T * m_ptr; \
- name(name const &); \
- name & operator=(name const &); \
- \
-public: \
- wxEXPLICIT name(T * p = NULL) : m_ptr(p) \
- {} \
- \
- ~name(); \
- void reset(T * p = NULL); \
- \
- T & operator[](long int i) const\
- { \
- wxASSERT(m_ptr != NULL); \
- wxASSERT(i >= 0); \
- return m_ptr[i]; \
- } \
- \
- T * get() const \
- { \
- return m_ptr; \
- } \
- \
- void swap(name & ot) \
- { \
- T * tmp = ot.m_ptr; \
- ot.m_ptr = m_ptr; \
- m_ptr = tmp; \
- } \
-};
-
-#define wxDEFINE_SCOPED_ARRAY(T, name) \
-name::~name() \
-{ \
- wxCHECKED_DELETE_ARRAY(m_ptr) \
-} \
-void name::reset(T * p){ \
- if (m_ptr != p) \
- { \
- wxCHECKED_DELETE_ARRAY(m_ptr); \
- m_ptr = p; \
- } \
-}
-
-#endif
+// Purpose: compatibility wrapper for wxScoped{Ptr,Array}
+// Author: Vadim Zeitlin
+// Created: 2009-02-03
+// Copyright: (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence: wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// do not include this file in any new code, include either wx/scopedptr.h or
+// wx/scopedarray.h (or both) instead
+#include "wx/scopedarray.h"
+#include "wx/scopedptr.h"