--- nono/wx/wxlcdwindow.cpp	2026/04/29 17:04:53	1.1.1.2
+++ nono/wx/wxlcdwindow.cpp	2026/04/29 17:04:56	1.1.1.3
@@ -9,7 +9,7 @@
 //
 
 #include "wxlcdwindow.h"
-#include "wxbmp.h"
+#include "wxbitmapbuf.h"
 #include "wxcolor.h"
 #include "wxtextscreen.h"
 #include "lcd.h"
@@ -132,11 +132,15 @@ WXLCDPanel::DrawChar(wxDC& dc, int x, in
 //
 
 // コンストラクタ
-WXLCDWindow::WXLCDWindow(wxWindow *parent, wxWindowID id)
-	: inherited(parent, id, _("Front LCD"))
+WXLCDWindow::WXLCDWindow(wxWindow *parent)
+	: inherited(parent, wxID_ANY, _("Front LCD"))
 {
+	wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
+
 	panel = new WXLCDPanel(this);
+	topsizer->Add(panel, 0, wxEXPAND);
 
+	SetSizer(topsizer);
 	// 大きさをそれに固定
 	Fit();
 }
@@ -243,8 +247,8 @@ WXLCDCharPanel::Draw(wxDC& dc)
 //
 
 // コンストラクタ
-WXLCDMonitor::WXLCDMonitor(wxWindow *parent, wxWindowID id)
-	: inherited(parent, id, _("LCD"))
+WXLCDMonitor::WXLCDMonitor(wxWindow *parent)
+	: inherited(parent, wxID_ANY, _("LCD"))
 {
 	// top
 	// | +--------------------------+
@@ -268,11 +272,12 @@ WXLCDMonitor::WXLCDMonitor(wxWindow *par
 	// 2段目の左余白
 	hbox1->Add(new WXPaddingPanel(this), 0, wxEXPAND);
 
-	monpanel = new WXTextScreen(this, *gLCD);
+	monpanel = new WXTextScreen(this, gMonitorManager.Get(ID_MONITOR_LCD));
 	hbox1->Add(monpanel, 0, wxEXPAND);
 
 	// 2段目の右余白
-	hbox1->Add(new WXPaddingPanel(this), 0, wxEXPAND);
+	// ここの1でこの右余白が空き全部を使用するので空き地が埋まる
+	hbox1->Add(new WXPaddingPanel(this), 1, wxEXPAND);
 
 	// 3段目
 	wxBoxSizer *hbox2 = new wxBoxSizer(wxHORIZONTAL);