--- nono/wx/wxmainview.h 2026/04/29 17:05:16 1.1.1.13 +++ nono/wx/wxmainview.h 2026/04/29 17:05:31 1.1.1.15 @@ -14,6 +14,7 @@ wxDECLARE_EVENT(NONO_EVT_MOUSEMODE, wxCommandEvent); +class DumbKeyboard; class Keyboard; class Renderer; @@ -21,7 +22,7 @@ class WXMainView : public wxPanel { using inherited = wxPanel; public: - WXMainView(wxWindow *); + explicit WXMainView(wxWindow *); virtual ~WXMainView() override; bool Init(); @@ -58,10 +59,6 @@ class WXMainView : public wxPanel void OnRender(wxCommandEvent& event); void OnMouseMode(wxCommandEvent& event); - // 仮想画面サイズ (ピクセル) - int rendwidth {}; - int rendheight {}; - // 実画面サイズ (ピクセル) int viewwidth {}; int viewheight {}; @@ -87,7 +84,8 @@ class WXMainView : public wxPanel // マウスカーソルを移動させる void MyWarpPointer(wxSize pos); - Keyboard *keyboard {}; + DumbKeyboard *dumbkbd {}; + Keyboard *richkbd {}; Renderer *renderer {}; wxDECLARE_EVENT_TABLE();