Removed cursor patch from the SDL-1.2-hg patch, this should fix #457

This commit is contained in:
Scott McCreary
2011-01-12 19:58:50 +00:00
parent 93cf331846
commit 321de4614e

View File

@@ -1,6 +1,6 @@
diff -r 930614179450 src/video/bwindow/SDL_BWin.h
--- a/src/video/bwindow/SDL_BWin.h Fri Dec 03 16:55:25 2010 -0800
+++ b/src/video/bwindow/SDL_BWin.h Thu Dec 23 09:38:48 2010 +0000
diff -r 930614179450 libsdl-1.2-hg/src/video/bwindow/SDL_BWin.h
--- libsdl-1.2-hg/src/video/bwindow/SDL_BWin.h Fri Dec 03 16:55:25 2010 -0800
+++ libsdl-1.2-hg-haiku/src/video/bwindow/SDL_BWin.h Thu Dec 23 09:38:48 2010 +0000
@@ -113,7 +113,9 @@
SDL_GLView = new BGLView(Bounds(), "SDL GLView",
B_FOLLOW_ALL_SIDES, (B_WILL_DRAW|B_FRAME_EVENTS),
@@ -35,28 +35,4 @@ diff -r 930614179450 src/video/bwindow/SDL_BWin.h
Unlock();
return(retval);
}
diff -r 930614179450 src/video/bwindow/SDL_sysevents.cc
--- a/src/video/bwindow/SDL_sysevents.cc Fri Dec 03 16:55:25 2010 -0800
+++ b/src/video/bwindow/SDL_sysevents.cc Thu Dec 23 09:38:48 2010 +0000
@@ -36,6 +36,7 @@
#include "../../events/SDL_sysevents.h"
#include "../../events/SDL_events_c.h"
#include "SDL_sysevents_c.h"
+#include "../SDL_cursor_c.h"
void BE_PumpEvents(_THIS)
{
@@ -203,11 +204,13 @@
if (transit == B_EXITED_VIEW) {
if ( SDL_GetAppState() & SDL_APPMOUSEFOCUS ) {
SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
+ SDL_EraseCursor(SDL_VideoSurface);
be_app->SetCursor(B_HAND_CURSOR);
}
} else {
if ( !(SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) {
SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
+ SDL_EraseCursor(SDL_VideoSurface);
SDL_SetCursor(NULL);
}