Added floppy #2 saving, statistics to makefile.

[apple2] / src / gui / diskwindow.h

diff --git a/src/gui/diskwindow.h b/src/gui/diskwindow.h
index 9d4541aedf159fafecca7beacdc2bd11ff076fde..31317501b78cdcc9a0ad5e4d9a24a03d957d7f84 100644 (file)
--- a/src/gui/diskwindow.h
+++ b/src/gui/diskwindow.h
@@ -15,11 +15,11 @@ class Text;
 class DiskWindow: public Window
 {
        public:
-               DiskWindow(FloppyDrive * fdp, uint32 x = 0, uint32 y = 0);
+               DiskWindow(FloppyDrive * fdp, uint32_t x = 0, uint32_t y = 0);
                ~DiskWindow(); //Does this destructor need to be virtual? Not sure... Check!
-               virtual void HandleKey(SDLKey key);
-               virtual void HandleMouseMove(uint32 x, uint32 y);
-               virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown);
+               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 AddElement(Element * e);
@@ -32,10 +32,11 @@ class DiskWindow: public Window
 
        private:
                FloppyDrive * floppyDrive;
-//             uint16 cbWidth, cbHeight;
+//             uint16_t cbWidth, cbHeight;
 //             SDL_Surface * cbUp, * cbDown, * cbHover;
                Text * name1, * name2;
-               Button * load1, * load2, * eject1, * eject2, * newDisk1, * newDisk2, * swap;
+               Button * load1, * load2, * eject1, * eject2,
+                       * newDisk1, * newDisk2, * swap, * writeProtect1, * writeProtect2;
 };
 
 #endif // __DISKWINDOW_H__