X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fdiskwindow.h;h=31317501b78cdcc9a0ad5e4d9a24a03d957d7f84;hb=c0001155bc0909da61f6c849c0be9b16e9b7f4b6;hp=8ef6272bb820474244b3cd9097b0d1ffc93438f1;hpb=a3edd967566ede2c3d58d459b115acc94b13b329;p=apple2 diff --git a/src/gui/diskwindow.h b/src/gui/diskwindow.h index 8ef6272..3131750 100644 --- 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,7 +32,7 @@ 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,