bug fix for using multiline string (i.e. with embedded '\n's) in wxTextCtrl ctor

[wxWidgets.git] / src / common / longlong.cpp

diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index 824f039db299b94b04784b356437b96f419e738f..d0cda3912dd7029039d1fdd41e62ec18a6aa00c2 100644 (file)
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -28,7 +28,12 @@
 #if wxUSE_LONGLONG
 #include "wx/longlong.h"
 
+#if defined(__MWERKS__) && defined(__WXMSW__)
+#include <string.h>     // for memset()
+#else
 #include <memory.h>     // for memset()
+#endif
+
 #include <math.h>       // for fabs()
 
 // ============================================================================
@@ -608,12 +613,11 @@ void *wxLongLongWx::asArray(void) const
 #endif // wxUSE_LONGLONG_WX
 
 wxString
-#ifdef wxUSE_LONGLONG_NATIVE
-wxLongLongNative
+#if wxUSE_LONGLONG_NATIVE
+wxLongLongNative::ToString() const
 #else
-wxLognLongWx
+wxLongLongWx::ToString() const
 #endif
-::ToString() const
 {
     // TODO: this is awfully inefficient, anything better?
     wxString result;