Converted to SDL 2, added fullscreen toggle.

[apple2] / src / gui / element.h

diff --git a/src/gui/element.h b/src/gui/element.h
index 305b90e2d342c840e3be3b268e5a2f762912f5c7..e3ad812e309ddb89beb6113e621faaf3d047305e 100755 (executable)
--- a/src/gui/element.h
+++ b/src/gui/element.h
@@ -12,26 +12,26 @@
 
 enum { WINDOW_CLOSE, MENU_ITEM_CHOSEN, SCREEN_REFRESH_NEEDED };
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <list>
-#include "types.h"
+#include <stdint.h>
 
 class Element
 {
        public:
-               Element(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0,
+               Element(uint32_t x = 0, uint32_t y = 0, uint32_t w = 0, uint32_t h = 0,
                        Element * parentElement = NULL);
-               Element(uint32 x, uint32 y, uint32 w, uint32 h,
-                       uint8 fgR = 0xFF, uint8 fgG = 0xFF, uint8 fgB = 0xFF, uint8 fgA = 0xFF,
-                       uint8 bgR = 0x00, uint8 bgG = 0x00, uint8 bgB = 0x00, uint8 bgA = 0xFF,
+               Element(uint32_t x, uint32_t y, uint32_t w, uint32_t h,
+                       uint8_t fgR = 0xFF, uint8_t fgG = 0xFF, uint8_t fgB = 0xFF, uint8_t fgA = 0xFF,
+                       uint8_t bgR = 0x00, uint8_t bgG = 0x00, uint8_t bgB = 0x00, uint8_t bgA = 0xFF,
                        Element * parentElement = NULL);
                virtual ~Element();                                                     // Destructor cannot be pure virtual...
-               virtual void HandleKey(SDLKey key) = 0;         // These are "pure" virtual functions...
-               virtual void HandleMouseMove(uint32 x, uint32 y) = 0;
-               virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown) = 0;
+               virtual void HandleKey(SDL_Scancode key) = 0;           // These are "pure" virtual functions...
+               virtual void HandleMouseMove(uint32_t x, uint32_t y) = 0;
+               virtual void HandleMouseButton(uint32_t x, uint32_t y, bool mouseDown) = 0;
                virtual void Draw(void) = 0;
                virtual void Notify(Element *) = 0;
-               bool Inside(uint32 x, uint32 y);
+               bool Inside(uint32_t x, uint32_t y);
 //Badly named, though we may code something that does this...
 //             SDL_Rect GetParentCorner(void);
                SDL_Rect GetScreenCoords(void);
@@ -54,10 +54,10 @@ class Element
 
        protected:
                SDL_Rect extents;
-               uint32 state;
+               uint32_t state;
                Element * parent;
-               uint32 fgColor;
-               uint32 bgColor;
+               uint32_t fgColor;
+               uint32_t bgColor;
                SDL_Surface * backstore;
                std::list<SDL_Rect> coverList;
                bool visible;