--- nono/wx/wxmainview.h 2026/04/29 17:05:12 1.1.1.12 +++ nono/wx/wxmainview.h 2026/04/29 17:05:27 1.1.1.14 @@ -12,11 +12,16 @@ #include "wxnono.h" +wxDECLARE_EVENT(NONO_EVT_MOUSEMODE, wxCommandEvent); + +class Keyboard; +class Renderer; + class WXMainView : public wxPanel { using inherited = wxPanel; public: - WXMainView(wxWindow *); + explicit WXMainView(wxWindow *); virtual ~WXMainView() override; bool Init(); @@ -51,10 +56,7 @@ class WXMainView : public wxPanel void OnMouse(wxMouseEvent& event); void OnMouseCaptureLost(wxMouseCaptureLostEvent& event); void OnRender(wxCommandEvent& event); - - // 仮想画面サイズ (ピクセル) - int rendwidth {}; - int rendheight {}; + void OnMouseMode(wxCommandEvent& event); // 実画面サイズ (ピクセル) int viewwidth {}; @@ -81,7 +83,8 @@ class WXMainView : public wxPanel // マウスカーソルを移動させる void MyWarpPointer(wxSize pos); + Keyboard *keyboard {}; + Renderer *renderer {}; + wxDECLARE_EVENT_TABLE(); }; - -extern WXMainView *gMainView;