--- nono/wx/wxversion.h 2026/04/29 17:04:40 1.1.1.2 +++ nono/wx/wxversion.h 2026/04/29 17:04:56 1.1.1.4 @@ -6,7 +6,8 @@ #pragma once -#include "wxheader.h" +#include "wxnono.h" +#include "monitor.h" // バージョンダイアログ class WXVersionDlg : public wxDialog @@ -14,24 +15,27 @@ class WXVersionDlg : public wxDialog using inherited = wxDialog; public: WXVersionDlg(wxWindow *parent); - ~WXVersionDlg() override; + virtual ~WXVersionDlg() override; }; // ホスト情報モニタ -class HostInfoMonitor : public IMonitor +class HostInfoMonitor : public Object { + using inherited = Object; public: HostInfoMonitor(); virtual ~HostInfoMonitor() override; + operator bool() const { return aut; } - nnSize GetMonitorSize() override; - void MonitorUpdate(TextScreen& monitor) override; + Monitor monitor { this }; private: - int width {}; + DECLARE_MONITOR_CALLBACK(MonitorUpdate); + wxString osname {}; wxString machinename {}; wxString wxname {}; + uint32 aut; }; extern std::unique_ptr gHostInfo;