X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=e63c85ba817117224c0d5a232d6347a50f7beb58;hb=925dc3b341a087249ca6fa0be7c227e49d01b213;hp=7bfb041f6c7345cf919d649cfbe3eb0a4b374bc3;hpb=59d9acac0b803124032d42df4b7a5d03021ab16e;p=xonotic%2Fdarkplaces.git

diff --git a/sys_sdl.c b/sys_sdl.c
index 7bfb041f..e63c85ba 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -22,15 +22,10 @@
 
 #ifdef WIN32
 #ifdef _MSC_VER
-#if SDL_MAJOR_VERSION == 1
-#pragma comment(lib, "sdl.lib")
-#pragma comment(lib, "sdlmain.lib")
-#else
 #pragma comment(lib, "sdl2.lib")
 #pragma comment(lib, "sdl2main.lib")
 #endif
 #endif
-#endif
 
 #include "quakedef.h"
 
@@ -67,6 +62,10 @@ void Sys_Error (const char *error, ...)
 
 	Con_Printf ("Quake Error: %s\n", string);
 
+#ifdef WIN32
+	MessageBox(NULL, string, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
+#endif
+
 	Host_Shutdown ();
 	exit (1);
 }
@@ -169,31 +168,19 @@ char *Sys_ConsoleInput(void)
 
 char *Sys_GetClipboardData (void)
 {
-#ifdef WIN32
 	char *data = NULL;
 	char *cliptext;
 
-	if (OpenClipboard (NULL) != 0)
-	{
-		HANDLE hClipboardData;
-
-		if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
-		{
-			if ((cliptext = (char *)GlobalLock (hClipboardData)) != 0)
-			{
-				size_t allocsize;
-				allocsize = GlobalSize (hClipboardData) + 1;
-				data = (char *)Z_Malloc (allocsize);
-				strlcpy (data, cliptext, allocsize);
-				GlobalUnlock (hClipboardData);
-			}
-		}
-		CloseClipboard ();
+	cliptext = SDL_GetClipboardText();
+	if (cliptext != NULL) {
+		size_t allocsize;
+		allocsize = strlen(cliptext) + 1;
+		data = (char *)Z_Malloc (allocsize);
+		strlcpy (data, cliptext, allocsize);
+		SDL_free(cliptext);
 	}
+
 	return data;
-#else
-	return NULL;
-#endif
 }
 
 void Sys_InitConsole (void)