--- nono/wx/fontmanager.cpp	2026/04/29 17:05:09	1.1
+++ nono/wx/fontmanager.cpp	2026/04/29 17:05:12	1.1.1.2
@@ -11,7 +11,7 @@
 #include "fontmanager.h"
 #include "privatechar.h"
 #include "wxtextpanel.h"
-#include "cgrom.h"
+#include "builtinrom.h"
 #include "kaname12.h"
 
 // グローバル参照用
@@ -39,10 +39,10 @@ FontManager::SetFont(FontId fontid_)
 	const uint8 *base;
 	switch (fontid) {
 	 case FontId::_6x12:
-		base = BuiltinCGROM::Get6x12();
+		base = Builtin::CGROM6x12();
 		break;
 	 case FontId::_8x16:
-		base = BuiltinCGROM::Get8x16();
+		base = Builtin::CGROM8x16();
 		break;
 	 default:
 		PANIC("fontid=%d", fontid);
@@ -174,7 +174,7 @@ FontManager::KanjiGlyph(uint16 sjiscode,
 		break;
 	 case FontId::_8x16:
 		// 16x16 は X680x0 CGROM のを使う。
-		base = BuiltinCGROM::Get16x16();
+		base = Builtin::CGROM16x16();
 		break;
 	 default:
 		// ここより先に必ず半角のほうでエラーが出るはず