--- nono/wx/wxlcdwindow.h 2026/04/29 17:05:16 1.1.1.8 +++ nono/wx/wxlcdwindow.h 2026/04/29 17:05:44 1.1.1.10 @@ -21,8 +21,8 @@ class WXLCDPanel : public WXTextPanel { using inherited = WXTextPanel; public: - WXLCDPanel(wxWindow *parent); - virtual ~WXLCDPanel() override; + explicit WXLCDPanel(wxWindow *parent); + ~WXLCDPanel() override; void FontChanged() override; @@ -45,11 +45,8 @@ class WXLCDWindow : public WXSubWindow { using inherited = WXSubWindow; public: - WXLCDWindow(wxWindow *parent); - virtual ~WXLCDWindow() override; - - private: - WXLCDPanel *panel {}; + explicit WXLCDWindow(wxWindow *parent); + ~WXLCDWindow() override; }; // モニタの LCD キャラクタ部パネル @@ -57,8 +54,8 @@ class WXLCDCharPanel : public WXTextPane { using inherited = WXTextPanel; public: - WXLCDCharPanel(wxWindow *parent); - virtual ~WXLCDCharPanel() override; + explicit WXLCDCharPanel(wxWindow *parent); + ~WXLCDCharPanel() override; void FontChanged() override; @@ -77,10 +74,14 @@ class WXLCDMonitor : public WXSubWindow { using inherited = WXSubWindow; public: - WXLCDMonitor(wxWindow *parent); - virtual ~WXLCDMonitor() override; + explicit WXLCDMonitor(wxWindow *parent); + ~WXLCDMonitor() override; + + void FontChanged() override; + bool Layout() override; private: WXMonitorPanel *monpanel {}; WXLCDCharPanel *chrpanel {}; + WXBitmapPanel *space {}; };