matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy

Browse Source
This commit is contained in:
Simon Robertshaw 2012-05-03 21:53:16 +01:00
commit 429f106ebf
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/defines.h
View File

@ -11,7 +11,7 @@
#define SAVE_VERSION 78 #define SAVE_VERSION 78
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BETA #define BETA
#define BUILD_NUM 161 #define BUILD_NUM 162
//VersionInfoEnd //VersionInfoEnd
#define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter

4
src/misc.c
View File

@ -606,6 +606,7 @@ void clipboard_push_text(char * text)
char * clipboard_pull_text() char * clipboard_pull_text()
{ {
#ifdef MACOSX #ifdef MACOSX
printf("Not implemented: get text from clipboard\n");
#elif defined WIN32 #elif defined WIN32
if (OpenClipboard(NULL)) if (OpenClipboard(NULL))
{ {
@ -623,10 +624,11 @@ char * clipboard_pull_text()
} }
} }
#elif (defined(LIN32) || defined(LIN64)) && defined(SDL_VIDEO_DRIVER_X11) #elif (defined(LIN32) || defined(LIN64)) && defined(SDL_VIDEO_DRIVER_X11)
printf("Not implemented: get text from clipboard\n");
#else #else
printf("Not implemented: get text from clipboard\n"); printf("Not implemented: get text from clipboard\n");
return "";
#endif #endif
return "";
} }
int register_extension() int register_extension()