--- nono/wx/wxlcdwindow.h	2026/04/29 17:04:45	1.1.1.2
+++ nono/wx/wxlcdwindow.h	2026/04/29 17:04:53	1.1.1.3
@@ -11,6 +11,7 @@
 #pragma once
 
 #include "wxheader.h"
+#include "wxbmp.h"
 #include "wxsubwindow.h"
 
 // LCD パネル
@@ -29,9 +30,7 @@ class WXLCDPanel : public wxPanel
 
 	const uint8 *ddram {};
 
-	std::unique_ptr<uint8[]> bmpbuf {};
-	std::unique_ptr<wxImage> image {};
-	std::unique_ptr<wxBitmap> bitmap {};
+	WXBitmap bitmap {};
 
 	// 描画管理用
 	uint32 count {};
@@ -53,9 +52,9 @@ class WXLCDWindow : public WXSubWindow
 };
 
 // LCD キャラクタパネル
-class WXLCDCharPanel : public wxPanel
+class WXLCDCharPanel : public WXPaddingPanel
 {
-	using inherited = wxPanel;
+	using inherited = WXPaddingPanel;
  public:
 	WXLCDCharPanel(wxWindow *parent);
 	virtual ~WXLCDCharPanel() override;
@@ -64,9 +63,7 @@ class WXLCDCharPanel : public wxPanel
 	void OnPaint(wxPaintEvent& event);
 	void Draw(wxDC&);
 
-	std::unique_ptr<uint8[]> bmpbuf {};
-	std::unique_ptr<wxImage> image {};
-	std::unique_ptr<wxBitmap> bitmap {};
+	WXBitmap bitmap {};
 
 	wxDECLARE_EVENT_TABLE();
 };