wxStaticBitmapBase::DoGetBestSize

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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index b913e75100b40ea1546a53f882e60bbf3cf1d3d3..85c986a3e90e21527deca61ecb3ee15ab4990b3c 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -6,7 +6,7 @@
 // Created:     12.04.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     12.04.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // these classes are for private use only for now, they're not documented
 ///////////////////////////////////////////////////////////////////////////////
 
 // these classes are for private use only for now, they're not documented


@@ -16,7 +16,7 @@
 
 #include "wx/wxchar.h"
 
 
 #include "wx/wxchar.h"
 

-#include <string.h> // strdup
+#include <stdlib.h>             // malloc() and free()

 
 // ----------------------------------------------------------------------------
 // Special classes for (wide) character strings: they use malloc/free instead
 
 // ----------------------------------------------------------------------------
 // Special classes for (wide) character strings: they use malloc/free instead


@@ -95,19 +95,11 @@ private:                                                                    \
     chartype *m_str;                                                        \
 }
 
     chartype *m_str;                                                        \
 }
 

-DEFINE_BUFFER(wxCharBuffer, char, strdup);
+DEFINE_BUFFER(wxCharBuffer, char, wxStrdupA);

 
 #if wxUSE_WCHAR_T
 
 
 #if wxUSE_WCHAR_T
 

-inline wchar_t *wxWcsdupReplacement(const wchar_t *wcs)
-{
-    const size_t siz = (wxWcslen(wcs) + 1)*sizeof(wchar_t);
-    wchar_t *wcsCopy = (wchar_t *)malloc(siz);
-    memcpy(wcsCopy, wcs, siz);
-    return wcsCopy;
-}
-
-DEFINE_BUFFER(wxWCharBuffer, wchar_t, wxWcsdupReplacement);
+DEFINE_BUFFER(wxWCharBuffer, wchar_t, wxStrdupW);

 
 #endif // wxUSE_WCHAR_T
 
 
 #endif // wxUSE_WCHAR_T
 


@@ -182,6 +174,8 @@ private:
 
     // the reference count
     size_t m_ref;
 
     // the reference count
     size_t m_ref;

+
+    DECLARE_NO_COPY_CLASS(wxMemoryBufferData)

 };
 
 
 };