--- nono/wx/wxmonitor.h 2026/04/29 17:04:45 1.1.1.5 +++ nono/wx/wxmonitor.h 2026/04/29 17:04:56 1.1.1.6 @@ -7,7 +7,7 @@ #pragma once #include "wxsubwindow.h" -#include "object.h" +#include "monitor.h" // // モニターウィンドウ @@ -16,11 +16,11 @@ class WXMonitorWindow : public WXSubWind { using inherited = WXSubWindow; public: - WXMonitorWindow(wxWindow *parent, wxWindowID id, const wxString& name, - IMonitor& monitor_); + WXMonitorWindow(wxWindow *parent, const wxString& name, + Monitor& monitor_); virtual ~WXMonitorWindow() override; - private: + protected: // テキストスクリーン WXTextScreen *screen {}; };