--- nono/wx/wxmainview.h 2026/04/29 17:05:16 1.1.1.13 +++ nono/wx/wxmainview.h 2026/04/29 17:05:53 1.1.1.17 @@ -14,15 +14,16 @@ wxDECLARE_EVENT(NONO_EVT_MOUSEMODE, wxCommandEvent); +class DumbKeyboard; class Keyboard; -class Renderer; +class VideoRenderer; class WXMainView : public wxPanel { using inherited = wxPanel; public: - WXMainView(wxWindow *); - virtual ~WXMainView() override; + explicit WXMainView(wxWindow *); + ~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,8 +84,9 @@ class WXMainView : public wxPanel // マウスカーソルを移動させる void MyWarpPointer(wxSize pos); - Keyboard *keyboard {}; - Renderer *renderer {}; + DumbKeyboard *dumbkbd {}; + Keyboard *richkbd {}; + VideoRenderer *renderer {}; wxDECLARE_EVENT_TABLE(); };