--- nono/wx/wxversion.h 2026/04/29 17:04:56 1.1.1.4 +++ nono/wx/wxversion.h 2026/04/29 17:05:31 1.1.1.8 @@ -4,17 +4,20 @@ // Licensed under nono-license.txt // +// +// バージョンダイアログ +// + #pragma once #include "wxnono.h" -#include "monitor.h" // バージョンダイアログ class WXVersionDlg : public wxDialog { using inherited = wxDialog; public: - WXVersionDlg(wxWindow *parent); + explicit WXVersionDlg(wxWindow *parent); virtual ~WXVersionDlg() override; }; @@ -24,18 +27,18 @@ class HostInfoMonitor : public Object using inherited = Object; public: HostInfoMonitor(); - virtual ~HostInfoMonitor() override; - operator bool() const { return aut; } + ~HostInfoMonitor() override; - Monitor monitor { this }; + Monitor *monitor {}; private: DECLARE_MONITOR_CALLBACK(MonitorUpdate); wxString osname {}; wxString machinename {}; + wxString avx2str {}; + wxString neonstr {}; wxString wxname {}; - uint32 aut; }; -extern std::unique_ptr gHostInfo; +extern HostInfoMonitor *gHostInfo;