--- nono/wx/wxsoftkey.h 2026/04/29 17:04:43 1.1.1.4 +++ nono/wx/wxsoftkey.h 2026/04/29 17:04:45 1.1.1.5 @@ -143,15 +143,17 @@ class WXLunaSoftKeyPanel : public WXSoft using inherited = WXSoftKeyPanel; public: WXLunaSoftKeyPanel(wxWindow *parent); - virtual ~WXLunaSoftKeyPanel(); + virtual ~WXLunaSoftKeyPanel() override; private: - virtual int DrawLED(wxDC& dc, const keydata_t& key); - virtual void KeyDown(const keydata_t& key); - virtual void KeyUp(const keydata_t& key); + int DrawLED(wxDC& dc, const keydata_t& key) override; + void KeyDown(const keydata_t& key) override; + void KeyUp(const keydata_t& key) override; // キー描画データ - virtual const std::vector& GetKeydata() const { return keydata; } + const std::vector& GetKeydata() const override { + return keydata; + } static std::vector keydata; }; @@ -161,15 +163,17 @@ class WXX68kSoftKeyPanel : public WXSoft using inherited = WXSoftKeyPanel; public: WXX68kSoftKeyPanel(wxWindow *parent); - virtual ~WXX68kSoftKeyPanel(); + virtual ~WXX68kSoftKeyPanel() override; private: - virtual int DrawLED(wxDC& dc, const keydata_t& key); - virtual void KeyDown(const keydata_t& key); - virtual void KeyUp(const keydata_t& key); + int DrawLED(wxDC& dc, const keydata_t& key) override; + void KeyDown(const keydata_t& key) override; + void KeyUp(const keydata_t& key) override; // キー描画データ - virtual const std::vector& GetKeydata() const { return keydata; } + const std::vector& GetKeydata() const override { + return keydata; + } static std::vector keydata; }; @@ -179,7 +183,7 @@ class WXLunaSoftKeyWindow : public WXSub using inherited = WXSubWindow; public: WXLunaSoftKeyWindow(wxWindow *parent, wxWindowID id); - virtual ~WXLunaSoftKeyWindow(); + virtual ~WXLunaSoftKeyWindow() override; private: // キーボードパネル @@ -192,7 +196,7 @@ class WXX68kSoftKeyWindow : public WXSub using inherited = WXSubWindow; public: WXX68kSoftKeyWindow(wxWindow *parent, wxWindowID id); - virtual ~WXX68kSoftKeyWindow(); + virtual ~WXX68kSoftKeyWindow() override; private: // キーボードパネル