--- nono/wx/wxhistmonitor.cpp 2026/04/29 17:04:53 1.1.1.2 +++ nono/wx/wxhistmonitor.cpp 2026/04/29 17:04:59 1.1.1.4 @@ -17,9 +17,9 @@ wxBEGIN_EVENT_TABLE(WXHistoryMonitor, in wxEND_EVENT_TABLE() // コンストラクタ -WXHistoryMonitor::WXHistoryMonitor(wxWindow *parent, wxWindowID id, - const wxString& name, IMonitor& monitor_) - : inherited(parent, id, name) +WXHistoryMonitor::WXHistoryMonitor(wxWindow *parent, const wxString& name, + Monitor& monitor_) + : inherited(parent, wxID_ANY, name) { // → // +--+-----------------------+--+--+ @@ -32,7 +32,7 @@ WXHistoryMonitor::WXHistoryMonitor(wxWin // | | +------------------+ | | | // +--+-----------------------+--+--+ - topsizer = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer *topsizer = new wxBoxSizer(wxHORIZONTAL); // 左余白 topsizer->Add(new WXPaddingPanel(this), 0, wxEXPAND); // 中列の縦 sizer @@ -94,8 +94,7 @@ WXHistoryMonitor::OnSize(wxSizeEvent& ev // スクロールバーを再設定 int pos = (int)screen->GetUserData(); - const wxSize& size = screen->GetSize(); - int thumbsize = size.GetHeight() - 1; // 常にヘッダ1行表示している + int thumbsize = screen->GetRow() - 1; // 常にヘッダ1行表示している int range = 256; // XXX 拾ってくるべき int pagesize = thumbsize - 1; if (pos > range - thumbsize) { @@ -144,9 +143,9 @@ WXHistoryMonitor::DoScroll(int pos) // // コンストラクタ -WXBranchHistoryMonitor::WXBranchHistoryMonitor(wxWindow *parent, wxWindowID id, - IMonitor& monitor) - : inherited(parent, id, _("Branch History"), monitor) +WXBranchHistoryMonitor::WXBranchHistoryMonitor(wxWindow *parent, + Monitor& monitor) + : inherited(parent, _("Branch History"), monitor) { exflag = 0; screen->SetUserData(exflag); @@ -163,8 +162,8 @@ WXBranchHistoryMonitor::~WXBranchHistory // コンストラクタ WXExceptionHistoryMonitor::WXExceptionHistoryMonitor(wxWindow *parent, - wxWindowID id, IMonitor& monitor) - : inherited(parent, id, _("Exception History"), monitor) + Monitor& monitor) + : inherited(parent, _("Exception History"), monitor) { exflag = 1ULL << 63; screen->SetUserData(exflag);