--- nono/wx/wxversion.h 2026/04/29 17:05:23 1.1.1.6 +++ nono/wx/wxversion.h 2026/04/29 17:05:57 1.1.1.11 @@ -11,15 +11,14 @@ #pragma once #include "wxnono.h" -#include "monitor.h" // バージョンダイアログ class WXVersionDlg : public wxDialog { using inherited = wxDialog; public: - WXVersionDlg(wxWindow *parent); - virtual ~WXVersionDlg() override; + explicit WXVersionDlg(wxWindow *parent); + ~WXVersionDlg() override; }; // ホスト情報モニタ @@ -30,15 +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;