fixed incorrect DLL export macro for wxJoystick

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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index 6d50b2a0a9035ac69bb4d9e46727b04a1653580d..3d7d6403f634e92dec9945222f76e4751d0e1472 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -13,16 +13,11 @@
 #define _WX_BUFFER_H
 
 #include "wx/chartype.h"
 #define _WX_BUFFER_H
 
 #include "wx/chartype.h"

-#include "wx/wxcrt.h"
+#include "wx/wxcrtbase.h"

 
 #include <stdlib.h>             // malloc() and free()
 
 
 #include <stdlib.h>             // malloc() and free()
 

-class WXDLLIMPEXP_BASE wxCStrData;
-
-inline char *wxStrDup(const char *s) { return wxStrdupA(s); }
-#if wxUSE_WCHAR_T
-    inline wchar_t *wxStrDup(const wchar_t *ws) { return wxStrdupW(ws); }
-#endif
+class WXDLLIMPEXP_FWD_BASE wxCStrData;

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


@@ -36,7 +31,7 @@ public:
     typedef T CharType;
 
     wxCharTypeBuffer(const CharType *str = NULL)
     typedef T CharType;
 
     wxCharTypeBuffer(const CharType *str = NULL)

-        : m_str(str ? wxStrDup(str) : NULL),
+        : m_str(str ? wxStrdup(str) : NULL),

           m_owned(true)
     {
     }
           m_owned(true)
     {
     }


@@ -103,7 +98,7 @@ public:
     {
         if ( m_owned )
             free(m_str);
     {
         if ( m_owned )
             free(m_str);

-        m_str = str ? wxStrDup(str) : NULL;
+        m_str = str ? wxStrdup(str) : NULL;

         m_owned = true;
         return *this;
     }
         m_owned = true;
         return *this;
     }


@@ -155,7 +150,7 @@ private:
     bool m_owned;
 };
 
     bool m_owned;
 };
 

-class WXDLLIMPEXP_BASE wxCharBuffer : public wxCharTypeBuffer<char>
+class wxCharBuffer : public wxCharTypeBuffer<char>

 {
 public:
     typedef wxCharTypeBuffer<char> wxCharTypeBufferBase;
 {
 public:
     typedef wxCharTypeBuffer<char> wxCharTypeBufferBase;


@@ -170,7 +165,7 @@ public:
 };
 
 #if wxUSE_WCHAR_T
 };
 
 #if wxUSE_WCHAR_T

-class WXDLLIMPEXP_BASE wxWCharBuffer : public wxCharTypeBuffer<wchar_t>
+class wxWCharBuffer : public wxCharTypeBuffer<wchar_t>

 {
 public:
     typedef wxCharTypeBuffer<wchar_t> wxCharTypeBufferBase;
 {
 public:
     typedef wxCharTypeBuffer<wchar_t> wxCharTypeBufferBase;