mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-30 11:19:51 +02:00
Code Issues Projects Releases Wiki Activity

Fix Clipboard for renderer build, ensure MacOS and Windows clipboard funcs return std::string

Browse Source
This commit is contained in:
Simon Robertshaw
2014-03-16 11:35:53 +00:00
parent 5b67c8ce68
commit 197a70c2e6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/PowderToyRenderer.cpp
View File

@@ -18,8 +18,8 @@
void EngineProcess() {} void EngineProcess() {}
void ClipboardPush(char * text) {} void ClipboardPush(std::string) {}
char * ClipboardPull() {} std::string ClipboardPull() {}
int GetModifiers() { return 0; } int GetModifiers() { return 0; }
void readFile(std::string filename, std::vector<char> & storage) void readFile(std::string filename, std::vector<char> & storage)

4
src/PowderToySDL.cpp
View File

@@ -103,7 +103,7 @@ std::string ClipboardPull()
{ {
#ifdef MACOSX #ifdef MACOSX
const char *text = readClipboard(); const char *text = readClipboard();
return text ? text : ""; return text ? std::string(text) : "";
#elif defined(WIN) #elif defined(WIN)
if (OpenClipboard(NULL)) if (OpenClipboard(NULL))
{ {
@@ -114,7 +114,7 @@ std::string ClipboardPull()
glbuffer = (char*)GlobalLock(cbuffer); glbuffer = (char*)GlobalLock(cbuffer);
GlobalUnlock(cbuffer); GlobalUnlock(cbuffer);
CloseClipboard(); CloseClipboard();
return glbuffer ? glbuffer : ""; return glbuffer ? std::string(glbuffer) : "";
} }
#elif defined(LIN) && defined(SDL_VIDEO_DRIVER_X11) #elif defined(LIN) && defined(SDL_VIDEO_DRIVER_X11)
std::string text = ""; std::string text = "";