Mercurial > sdl-ios-xcode

diff src/video/win32/SDL_win32events.c @ 4755:436183eb30c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with main repo (mainly for non-printable character fix)
author dewyatt
date Sun, 18 Jul 2010 13:48:23 -0400
parents dc7bdcf06367 9faebccfefb3
children 518d1679d2d0
line wrap: on
line diff
--- a/src/video/win32/SDL_win32events.c	Tue Jul 13 15:05:45 2010 -0400
+++ b/src/video/win32/SDL_win32events.c	Sun Jul 18 13:48:23 2010 -0400
@@ -164,7 +164,10 @@
                 if (SDL_GetKeyboardFocus() != data->window) {
                     SDL_SetKeyboardFocus(data->window);
                 }
-                /* FIXME: Update keyboard state */
+                /*
+                 * FIXME: Update keyboard state
+                 */
+                WIN_CheckClipboardUpdate(data->videodata);
             } else {
                 if (SDL_GetKeyboardFocus() == data->window) {
                     SDL_SetKeyboardFocus(NULL);
@@ -587,17 +590,4 @@
     }
 }
 
-/* Sets an error message based on GetLastError() */
-void
-WIN_SetError(const char *prefix)
-{
-    TCHAR buffer[1024];
-    char *message;
-    FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0,
-                  buffer, SDL_arraysize(buffer), NULL);
-    message = WIN_StringToUTF8(buffer);
-    SDL_SetError("%s%s%s", prefix ? prefix : "", prefix ? ": " : "", message);
-    SDL_free(message);
-}
-
 /* vi: set ts=4 sw=4 expandtab: */