--- nono/wx/wxvideomonitor.cpp	2026/04/29 17:04:53	1.1.1.4
+++ nono/wx/wxvideomonitor.cpp	2026/04/29 17:04:56	1.1.1.5
@@ -5,8 +5,8 @@
 //
 
 #include "wxvideomonitor.h"
-#include "wxbmp.h"
-#include "bitmap.h"
+#include "wxbitmapbuf.h"
+#include "lunafb.h"
 
 //
 // LUNA ビットマップパネル
@@ -24,7 +24,7 @@ WXLunaBitmapPanel::WXLunaBitmapPanel(wxW
 	: inherited(parent, wxID_ANY, wxDefaultPosition,
 		wxSize(512, 384))	// 初期値は適当
 {
-	src = gBitmap->GetBuf();
+	src = gLunafb->GetBuf();
 
 	// 仮想キャンバスサイズを設定
 	SetVirtualSize(virtual_width, virtual_height);
@@ -138,9 +138,8 @@ wxBEGIN_EVENT_TABLE(WXLunaBitmapWindow,
 wxEND_EVENT_TABLE()
 
 // コンストラクタ
-WXLunaBitmapWindow::WXLunaBitmapWindow(wxWindow *parent, wxWindowID id,
-	const wxString& name)
-	: inherited(parent, id, name,
+WXLunaBitmapWindow::WXLunaBitmapWindow(wxWindow *parent, const wxString& name)
+	: inherited(parent, wxID_ANY, name,
 		inherited::DEFAULT_STYLE | wxRESIZE_BORDER)
 {
 	panel = new WXLunaBitmapPanel(this);