--- np2/embed/menubase/menusys.c 2004/06/19 17:28:29 1.4 +++ np2/embed/menubase/menusys.c 2004/07/01 11:42:54 1.7 @@ -44,7 +44,7 @@ typedef struct { static MENUSYS menusys; -#if !defined(CHARSET_OEM) || defined(OSLANG_SJIS) +#if !defined(RESOURCE_US) && (!defined(CHARSET_OEM) || defined(OSLANG_SJIS)) static const char str_sysr[] = // 元のサイズに戻す "\214\263\202\314\203\124\203\103\203\131\202\311" \ "\226\337\202\267"; @@ -58,7 +58,7 @@ static const char str_sysx[] = // 最 "\215\305\221\345\211\273"; static const char str_sysc[] = // 閉じる "\225\302\202\266\202\351"; -#elif defined(OSLANG_EUC) +#elif defined(OSLANG_EUC) && !defined(RESOURCE_US) static const char str_sysr[] = // 元のサイズに戻す "\270\265\244\316\245\265\245\244\245\272\244\313" \ "\314\341\244\271"; @@ -72,7 +72,7 @@ static const char str_sysx[] = // 最 "\272\307\302\347\262\275"; static const char str_sysc[] = // 閉じる "\312\304\244\270\244\353"; -#elif defined(OSLANG_UTF8) +#elif defined(OSLANG_UTF8) && !defined(RESOURCE_US) static const char str_sysr[] = // 元のサイズに戻す "\345\205\203\343\201\256\343\202\265\343\202\244\343\202\272" \ "\343\201\253\346\210\273\343\201\231"; @@ -345,7 +345,7 @@ static BOOL wndopenbase(MENUSYS *sys) { mrect.right -= MENUSYS_BCAPTION; mrect.bottom += MENUSYS_BCAPTION; } - vram = menuvram_create(menubase.width, height); + vram = menuvram_create(menubase.width, height, menubase.bpp); sys->wnd[0].vram = vram; if (vram == NULL) { goto wopn0_err; @@ -559,7 +559,7 @@ static BOOL childopn(MENUSYS *sys, int d width = menubase.width; } height += (MENU_FBORDER + MENU_BORDER); - wnd->vram = menuvram_create(width, height); + wnd->vram = menuvram_create(width, height, menubase.bpp); if (wnd->vram == NULL) { TRACEOUT(("sub menu vram couldn't create")); goto copn_err;