--- nono/wx/wxlcdwindow.h	2026/04/29 17:04:45	1.1.1.2
+++ nono/wx/wxlcdwindow.h	2026/04/29 17:04:59	1.1.1.5
@@ -10,7 +10,8 @@
 
 #pragma once
 
-#include "wxheader.h"
+#include "wxnono.h"
+#include "wxbitmapbuf.h"
 #include "wxsubwindow.h"
 
 // LCD パネル
@@ -22,20 +23,14 @@ class WXLCDPanel : public wxPanel
 	virtual ~WXLCDPanel() override;
 
  private:
-	void OnTimer(wxTimerEvent& event);
+	void OnLCDChanged(wxCommandEvent& event);
 	void OnPaint(wxPaintEvent& event);
 	void Draw(wxDC&);
 	void DrawChar(wxDC&, int x, int y, uint8 ch);
 
 	const uint8 *ddram {};
 
-	std::unique_ptr<uint8[]> bmpbuf {};
-	std::unique_ptr<wxImage> image {};
-	std::unique_ptr<wxBitmap> bitmap {};
-
-	// 描画管理用
-	uint32 count {};
-	wxTimer timer {};
+	WXBitmapBuf bitmap {};
 
 	wxDECLARE_EVENT_TABLE();
 };
@@ -45,7 +40,7 @@ class WXLCDWindow : public WXSubWindow
 {
 	using inherited = WXSubWindow;
  public:
-	WXLCDWindow(wxWindow *parent, wxWindowID id);
+	WXLCDWindow(wxWindow *parent);
 	virtual ~WXLCDWindow() override;
 
  private:
@@ -53,9 +48,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 +59,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 {};
+	WXBitmapBuf bitmap {};
 
 	wxDECLARE_EVENT_TABLE();
 };
@@ -76,7 +69,7 @@ class WXLCDMonitor : public WXSubWindow
 {
 	using inherited = WXSubWindow;
  public:
-	WXLCDMonitor(wxWindow *parent, wxWindowID id);
+	WXLCDMonitor(wxWindow *parent);
 	virtual ~WXLCDMonitor() override;
 
  private: