Converted to SDL 2, added fullscreen toggle.

[apple2] / src / gui / text.h

diff --git a/src/gui/text.h b/src/gui/text.h
index df3614b2d14e423050bd503dfa77c92d3a45e5db..ff7e8aaf91493a822775ae715dbff1f70025c606 100644 (file)
--- a/src/gui/text.h
+++ b/src/gui/text.h
@@ -13,17 +13,17 @@
 class Text: public Element
 {
        public:
-               Text(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0, Element * parent = NULL);
-               Text(uint32 x, uint32 y, std::string s, uint32 fg = 0xFF8484FF, uint32 bg = 0xFF84FF4D, Element * parent = NULL);
-               virtual void HandleKey(SDLKey key) {}
-               virtual void HandleMouseMove(uint32 x, uint32 y) {}
-               virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown) {}
+               Text(uint32_t x = 0, uint32_t y = 0, uint32_t w = 0, uint32_t h = 0, Element * parent = NULL);
+               Text(uint32_t x, uint32_t y, std::string s, uint32_t fg = 0xFF8484FF, uint32_t bg = 0xFF84FF4D, Element * parent = NULL);
+               virtual void HandleKey(SDL_Scancode key) {}
+               virtual void HandleMouseMove(uint32_t x, uint32_t y) {}
+               virtual void HandleMouseButton(uint32_t x, uint32_t y, bool mouseDown) {}
                virtual void Draw(void);
                virtual void Notify(Element *) {}
                void SetText(std::string s);
 
        protected:
-//             uint32 fgColor, bgColor;
+//             uint32_t fgColor, bgColor;
                std::string text;
 };