Get rid of various old compiler and platform checks

[irrlicht.git] / source / Irrlicht / COSOperator.cpp

diff --git a/source/Irrlicht/COSOperator.cpp b/source/Irrlicht/COSOperator.cpp
index 0867b3d4fea47d502cd1961e75806219fa49183a..a6f9461d8a253a4eede0d8b0b481620599da5786 100644 (file)
--- a/source/Irrlicht/COSOperator.cpp
+++ b/source/Irrlicht/COSOperator.cpp
@@ -5,9 +5,7 @@
 #include "COSOperator.h"\r
 \r
 #ifdef _IRR_WINDOWS_API_\r
-#ifndef _IRR_XBOX_PLATFORM_\r
 #include <windows.h>\r
-#endif\r
 #else\r
 #include <string.h>\r
 #include <unistd.h>\r
@@ -56,29 +54,33 @@ const core::stringc& COSOperator::getOperatingSystemVersion() const
 \r
 \r
 //! copies text to the clipboard\r
-void COSOperator::copyToClipboard(const c8* text) const\r
+//! \param text: text in utf-8\r
+void COSOperator::copyToClipboard(const c8 *text) const\r
 {\r
        if (strlen(text)==0)\r
                return;\r
 \r
 // Windows version\r
-#if defined(_IRR_XBOX_PLATFORM_)\r
-#elif defined(_IRR_WINDOWS_API_)\r
+#if defined(_IRR_WINDOWS_API_)\r
        if (!OpenClipboard(NULL) || text == 0)\r
                return;\r
 \r
        EmptyClipboard();\r
 \r
+       core::stringw tempbuffer;\r
+       core::multibyteToWString(tempbuffer, text);\r
+       const u32 size = (tempbuffer.size() + 1) * sizeof(wchar_t);\r
+\r
        HGLOBAL clipbuffer;\r
-       char * buffer;\r
+       void * buffer;\r
 \r
-       clipbuffer = GlobalAlloc(GMEM_DDESHARE, strlen(text)+1);\r
-       buffer = (char*)GlobalLock(clipbuffer);\r
+       clipbuffer = GlobalAlloc(GMEM_MOVEABLE, size);\r
+       buffer = GlobalLock(clipbuffer);\r
 \r
-       strcpy(buffer, text);\r
+       memcpy(buffer, tempbuffer.c_str(), size);\r
 \r
        GlobalUnlock(clipbuffer);\r
-       SetClipboardData(CF_TEXT, clipbuffer);\r
+       SetClipboardData(CF_UNICODETEXT, clipbuffer);\r
        CloseClipboard();\r
 \r
 #elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)\r
@@ -87,7 +89,7 @@ void COSOperator::copyToClipboard(const c8* text) const
 \r
     if ((text != NULL) && (strlen(text) > 0))\r
     {\r
-        str = [NSString stringWithCString:text encoding:NSWindowsCP1252StringEncoding];\r
+        str = [NSString stringWithCString:text encoding:NSUTF8StringEncoding];\r
         board = [NSPasteboard generalPasteboard];\r
         [board declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:NSApp];\r
         [board setString:str forType:NSStringPboardType];\r
@@ -96,29 +98,29 @@ void COSOperator::copyToClipboard(const c8* text) const
 #elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)\r
     if ( IrrDeviceLinux )\r
         IrrDeviceLinux->copyToClipboard(text);\r
-#else\r
-\r
 #endif\r
 }\r
 \r
 \r
 //! gets text from the clipboard\r
-//! \return Returns 0 if no string is in there.\r
+//! \return Returns 0 if no string is in there, otherwise an utf-8 string.\r
 const c8* COSOperator::getTextFromClipboard() const\r
 {\r
-#if defined(_IRR_XBOX_PLATFORM_)\r
-               return 0;\r
-#elif defined(_IRR_WINDOWS_API_)\r
+#if defined(_IRR_WINDOWS_API_)\r
        if (!OpenClipboard(NULL))\r
                return 0;\r
 \r
-       char * buffer = 0;\r
+       wchar_t * buffer = 0;\r
+\r
+       HANDLE hData = GetClipboardData( CF_UNICODETEXT );\r
+       buffer = (wchar_t*) GlobalLock( hData );\r
+\r
+       core::wStringToMultibyte(ClipboardBuf, buffer);\r
 \r
-       HANDLE hData = GetClipboardData( CF_TEXT );\r
-       buffer = (char*)GlobalLock( hData );\r
        GlobalUnlock( hData );\r
        CloseClipboard();\r
-       return buffer;\r
+\r
+       return ClipboardBuf.c_str();\r
 \r
 #elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)\r
     NSString* str = nil;\r
@@ -129,7 +131,7 @@ const c8* COSOperator::getTextFromClipboard() const
     str = [board stringForType:NSStringPboardType];\r
 \r
     if (str != nil)\r
-        result = (char*)[str cStringUsingEncoding:NSWindowsCP1252StringEncoding];\r
+        result = (char*)[str cStringUsingEncoding:NSUTF8StringEncoding];\r
 \r
     return (result);\r
 \r
@@ -147,7 +149,7 @@ const c8* COSOperator::getTextFromClipboard() const
 \r
 bool COSOperator::getSystemMemory(u32* Total, u32* Avail) const\r
 {\r
-#if defined(_IRR_WINDOWS_API_) && !defined (_IRR_XBOX_PLATFORM_)\r
+#if defined(_IRR_WINDOWS_API_)\r
 \r
        MEMORYSTATUSEX MemoryStatusEx;\r
        MemoryStatusEx.dwLength = sizeof(MEMORYSTATUSEX);\r