--- nono/wx/wxdumpmonitor.cpp 2026/04/29 17:04:28 1.1 +++ nono/wx/wxdumpmonitor.cpp 2026/04/29 17:04:36 1.1.1.4 @@ -1,9 +1,9 @@ // // nono -// Copyright (C) 2019 isaki@NetBSD.org +// Copyright (C) 2020 nono project +// Licensed under nono-license.txt // -#include "wxheader.h" #include "wxdumpmonitor.h" #include "wxtextscreen.h" #include "mystring.h" @@ -29,13 +29,14 @@ wxEND_EVENT_TABLE() // コンストラクタ WXMemdumpWindow::WXMemdumpWindow(wxWindow *parent, wxWindowID id) - : inherited(parent, id, "メモリダンプ") + : inherited(parent, id, _("Memory Dump")) { col = 76; row = 16; // 最初に不一致を起こさせて再描画させるため last_addr = 0xffffffff; + wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer *vbox = new wxBoxSizer(wxVERTICAL); // 上枠 @@ -63,7 +64,8 @@ WXMemdumpWindow::WXMemdumpWindow(wxWindo screen = new WXTextScreen(this, col, row, monitor.GetBuf()); vbox->Add(screen, 0, wxEXPAND); - SetSizer(vbox); + topsizer->Add(vbox, BorderFlags); + SetSizer(topsizer); Layout(); Fit(); @@ -175,8 +177,8 @@ WXMemdumpWindow::Update() std::string hexstr; std::string chrstr; for (int x = 0; x < 8; x++) { - uint64 b1 = m68030_phys_peek_8(paddr); - uint64 b2 = m68030_phys_peek_8(paddr + 1); + uint64 b1 = vm_phys_peek_8(paddr); + uint64 b2 = vm_phys_peek_8(paddr + 1); // 偶数バイト目 if ((int64)b1 < 0) {