--- nono/wx/wxversion.h 2026/04/29 17:05:27 1.1.1.7 +++ nono/wx/wxversion.h 2026/04/29 17:05:57 1.1.1.11 @@ -11,7 +11,6 @@ #pragma once #include "wxnono.h" -#include "monitor.h" // バージョンダイアログ class WXVersionDlg : public wxDialog @@ -19,7 +18,7 @@ class WXVersionDlg : public wxDialog using inherited = wxDialog; public: explicit WXVersionDlg(wxWindow *parent); - virtual ~WXVersionDlg() override; + ~WXVersionDlg() override; }; // ホスト情報モニタ @@ -30,16 +29,17 @@ class HostInfoMonitor : public Object HostInfoMonitor(); ~HostInfoMonitor() override; - Monitor monitor { this }; + Monitor *monitor {}; private: - DECLARE_MONITOR_CALLBACK(MonitorUpdate); + DECLARE_MONITOR_SCREEN(MonitorScreen); wxString osname {}; wxString machinename {}; wxString avx2str {}; wxString neonstr {}; wxString wxname {}; + const char *slirpver {}; }; extern HostInfoMonitor *gHostInfo;