--- nono/wx/wxversion.cpp 2026/04/29 17:05:27 1.1.1.8 +++ nono/wx/wxversion.cpp 2026/04/29 17:05:53 1.1.1.11 @@ -9,6 +9,8 @@ // #include "wxversion.h" +#include "hostnet.h" +#include "monitor.h" #include // グローバル参照用 @@ -36,7 +38,7 @@ WXVersionDlg::WXVersionDlg(wxWindow *par // Copyright vbox->Add(new wxStaticText(this, wxID_ANY, - "Copyright (C) 2020 nono project")); + "Copyright (C) 2020-2025 nono project")); // 空行 vbox->Add(new wxStaticText(this, wxID_ANY, "")); @@ -70,7 +72,7 @@ HostInfoMonitor::HostInfoMonitor() // この時点で必要な情報は全部集めておく int width = 0; - int height = 3; + int height = 4; // OS 名 const auto info = wxPlatformInfo::Get(); @@ -169,9 +171,16 @@ HostInfoMonitor::HostInfoMonitor() wxname = wxname + " (" + wxport + ")"; width = std::max(width, (int)wxname.Length()); - monitor.func = ToMonitorCallback(&HostInfoMonitor::MonitorUpdate); - monitor.SetSize(11 + width, height); - monitor.Regist(ID_MONITOR_WXHOSTINFO); + // libslirp バージョン + slirpver = HostNetDevice::GetSlirpVersion(); + if (slirpver == NULL) { + slirpver = "not compiled"; + } + width = std::max(width, (int)strlen(slirpver)); + + monitor = gMonitorManager->Regist(ID_MONITOR_WXHOSTINFO, this); + monitor->func = ToMonitorCallback(&HostInfoMonitor::MonitorUpdate); + monitor->SetSize(11 + width, height); } // デストラクタ @@ -212,4 +221,8 @@ HostInfoMonitor::MonitorUpdate(Monitor * screen.Puts(0, y, "wxWidgets:"); screen.Puts(x, y, (const char *)wxname.mb_str()); y++; + + screen.Puts(0, y, "libslirp:"); + screen.Puts(x, y, slirpver); + y++; }