diff src/video/windib/SDL_dibvideo.h @ 4162:3b7fc3416601 SDL-1.2

GAPI fixes from Stefan Klug
author Sam Lantinga <slouken@libsdl.org>
date Mon, 16 Feb 2009 22:32:34 +0000
parents a1b03ba2fcd0
children
line wrap: on
line diff
--- a/src/video/windib/SDL_dibvideo.h	Fri Jan 30 01:40:44 2009 +0000
+++ b/src/video/windib/SDL_dibvideo.h	Mon Feb 16 22:32:34 2009 +0000
@@ -27,18 +27,10 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-/* for PDA */
-typedef enum
-{
-	SDL_ORIENTATION_UP,
-	SDL_ORIENTATION_DOWN,
-	SDL_ORIENTATION_LEFT,
-	SDL_ORIENTATION_RIGHT
-} SDL_ScreenOrientation;
 
 /* Private display data */
-struct SDL_PrivateVideoData {
-    HBITMAP screen_bmp;
+struct DibInfo {
+	HBITMAP screen_bmp;
     HPALETTE screen_pal;
     LOGPALETTE *screen_logpal;
     BOOL grab_palette;
@@ -46,11 +38,8 @@
 #define NUM_MODELISTS	4		/* 8, 16, 24, and 32 bits-per-pixel */
     int SDL_nummodes[NUM_MODELISTS];
     SDL_Rect **SDL_modelist[NUM_MODELISTS];
-
-	SDL_ScreenOrientation orientation;
+        
 #ifdef _WIN32_WCE
-	int invert; /* do to remove, used by GAPI driver! */
-	char hiresFix; /* using hires mode without defining hires resource */
 	int supportRotation; /* for Pocket PC devices */
 	DWORD origRotation; /* for Pocket PC devices */
 #endif
@@ -59,12 +48,12 @@
     int allow_screensaver;
 };
 /* Old variable names */
-#define screen_bmp		(this->hidden->screen_bmp)
-#define screen_pal		(this->hidden->screen_pal)
-#define screen_logpal		(this->hidden->screen_logpal)
-#define grab_palette		(this->hidden->grab_palette)
-#define SDL_nummodes		(this->hidden->SDL_nummodes)
-#define SDL_modelist		(this->hidden->SDL_modelist)
-#define allow_screensaver	(this->hidden->allow_screensaver)
+#define screen_bmp		(this->hidden->dibInfo->screen_bmp)
+#define screen_pal		(this->hidden->dibInfo->screen_pal)
+#define screen_logpal		(this->hidden->dibInfo->screen_logpal)
+#define grab_palette		(this->hidden->dibInfo->grab_palette)
+#define SDL_nummodes		(this->hidden->dibInfo->SDL_nummodes)
+#define SDL_modelist		(this->hidden->dibInfo->SDL_modelist)
+#define allow_screensaver	(this->hidden->dibInfo->allow_screensaver)
 
 #endif /* _SDL_dibvideo_h */