--- nono/wx/wxversion.h 2026/04/29 17:04:45 1.1.1.3 +++ nono/wx/wxversion.h 2026/04/29 17:05:31 1.1.1.8 @@ -4,34 +4,41 @@ // Licensed under nono-license.txt // +// +// バージョンダイアログ +// + #pragma once -#include "wxheader.h" +#include "wxnono.h" // バージョンダイアログ class WXVersionDlg : public wxDialog { using inherited = wxDialog; public: - WXVersionDlg(wxWindow *parent); + explicit WXVersionDlg(wxWindow *parent); virtual ~WXVersionDlg() override; }; // ホスト情報モニタ -class HostInfoMonitor : public IMonitor +class HostInfoMonitor : public Object { + using inherited = Object; public: HostInfoMonitor(); - virtual ~HostInfoMonitor() override; + ~HostInfoMonitor() override; - nnSize GetMonitorSize() override; - void MonitorUpdate(TextScreen& monitor) override; + Monitor *monitor {}; private: - int width {}; + DECLARE_MONITOR_CALLBACK(MonitorUpdate); + wxString osname {}; wxString machinename {}; + wxString avx2str {}; + wxString neonstr {}; wxString wxname {}; }; -extern std::unique_ptr gHostInfo; +extern HostInfoMonitor *gHostInfo;