summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-05-03 20:53:16 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-05-03 20:53:16 (GMT)
commit429f106ebfbb09ecc53518462b6c4526cfc7dd2f (patch)
treed53703a4b774af928d6ac70a2a21d11937726463 /src
parent89911666f0b07986a2be7a1f42a5aec6738203a5 (diff)
parentd0b57d7d99a49963aabee5768917b27e16427d58 (diff)
downloadpowder-429f106ebfbb09ecc53518462b6c4526cfc7dd2f.zip
powder-429f106ebfbb09ecc53518462b6c4526cfc7dd2f.tar.gz
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src')
-rw-r--r--src/misc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/misc.c b/src/misc.c
index af52254..fbd5b39 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -606,6 +606,7 @@ void clipboard_push_text(char * text)
char * clipboard_pull_text()
{
#ifdef MACOSX
+ printf("Not implemented: get text from clipboard\n");
#elif defined WIN32
if (OpenClipboard(NULL))
{
@@ -623,10 +624,11 @@ char * clipboard_pull_text()
}
}
#elif (defined(LIN32) || defined(LIN64)) && defined(SDL_VIDEO_DRIVER_X11)
+ printf("Not implemented: get text from clipboard\n");
#else
printf("Not implemented: get text from clipboard\n");
- return "";
#endif
+ return "";
}
int register_extension()