--- nono/wx/wxlogmonitor.h 2026/04/29 17:05:08 1.1.1.7 +++ nono/wx/wxlogmonitor.h 2026/04/29 17:05:27 1.1.1.9 @@ -12,7 +12,7 @@ #include "wxsubwindow.h" #include "wxscrollbar.h" -#include "wxtextscreen.h" +#include "wxmonitor.h" class Logger; class WXLogMonitor; @@ -54,14 +54,16 @@ class LogMonitor : public Object }; // ログウィンドウ -class WXLogMonitor : public WXVResizeSubWindow +class WXLogMonitor : public WXSubWindow { - using inherited = WXVResizeSubWindow; + using inherited = WXSubWindow; friend class LogMonitor; public: - WXLogMonitor(wxWindow *); - virtual ~WXLogMonitor() override; + explicit WXLogMonitor(wxWindow *); + ~WXLogMonitor() override; + + bool Layout() override; private: // サイズ変更イベント @@ -79,6 +81,8 @@ class WXLogMonitor : public WXVResizeSub // スクロール処理 void DoScroll(int pos); + WXMonitorPanel *screen {}; + // スクロールバー WXScrollBar *vscroll {};