--- nono/wx/wxsoftkey.h 2026/04/29 17:04:53 1.1.1.6 +++ nono/wx/wxsoftkey.h 2026/04/29 17:04:56 1.1.1.7 @@ -6,7 +6,7 @@ #pragma once -#include "wxbmp.h" +#include "wxbitmapbuf.h" #include "wxsubwindow.h" #include "wxtextpanel.h" #include "keyboard.h" @@ -75,7 +75,6 @@ class WXSoftKeyPanel : public WXTextPane protected: void InitLED(); void DoSize(); - void OnSize(wxSizeEvent& event); void OnPaint(wxPaintEvent& event); void OnTimer(wxTimerEvent& event); @@ -117,7 +116,7 @@ class WXSoftKeyPanel : public WXTextPane int u_height {}; // コントロール全域のビットマップ - WXBitmap bitmap {}; + WXBitmapBuf bitmap {}; // エンター記号の周囲の点集合 std::vector enter_points {}; @@ -180,7 +179,7 @@ class WXSoftKeyWindow : public WXSubWind { using inherited = WXSubWindow; public: - WXSoftKeyWindow(wxWindow *parent, wxWindowID id, vmtype_t vmtype); + WXSoftKeyWindow(wxWindow *parent, vmtype_t vmtype); virtual ~WXSoftKeyWindow() override; private: