--- nono/wx/wxsoftkey.h 2026/04/29 17:05:16 1.1.1.13 +++ nono/wx/wxsoftkey.h 2026/04/29 17:05:44 1.1.1.15 @@ -74,7 +74,7 @@ class WXSoftKeyPanel : public WXTextPane WXSoftKeyPanel(wxWindow *parent, const std::vector& keydata_, int u_width_, int u_height_); public: - virtual ~WXSoftKeyPanel() override; + ~WXSoftKeyPanel() override; // フォントサイズ変更 void FontChanged() override; @@ -169,8 +169,8 @@ class WXLunaSoftKeyPanel : public WXSoft { using inherited = WXSoftKeyPanel; public: - WXLunaSoftKeyPanel(wxWindow *parent); - virtual ~WXLunaSoftKeyPanel() override; + explicit WXLunaSoftKeyPanel(wxWindow *parent); + ~WXLunaSoftKeyPanel() override; private: int DrawLED(const keydata_t& key) override; @@ -184,8 +184,8 @@ class WXX68kSoftKeyPanel : public WXSoft { using inherited = WXSoftKeyPanel; public: - WXX68kSoftKeyPanel(wxWindow *parent); - virtual ~WXX68kSoftKeyPanel() override; + explicit WXX68kSoftKeyPanel(wxWindow *parent); + ~WXX68kSoftKeyPanel() override; private: int DrawLED(const keydata_t& key) override; @@ -200,9 +200,5 @@ class WXSoftKeyWindow : public WXSubWind using inherited = WXSubWindow; public: WXSoftKeyWindow(wxWindow *parent, VMType vmtype); - virtual ~WXSoftKeyWindow() override; - - private: - // キーボードパネル - WXSoftKeyPanel *panel {}; + ~WXSoftKeyWindow() override; };