--- nono/wx/wxmainframe.h 2026/04/29 17:05:16 1.1.1.14 +++ nono/wx/wxmainframe.h 2026/04/29 17:05:23 1.1.1.15 @@ -12,12 +12,13 @@ #include "wxnono.h" #include "monitor.h" -#include "vm.h" #include class FDDDevice; class Keyboard; +class MPUDevice; class PowerDevice; +class SCSITarget; class Syncer; class WXMainView; class WXStatusPanel; @@ -67,6 +68,11 @@ class WXMainFrame : public wxFrame void OnClose(wxCloseEvent& event); void OnActivate(wxActivateEvent& event); + void OnPowerButton(wxCommandEvent& event); + void OnPowerButtonUI(wxUpdateUIEvent& event); + void OnSoftReset(wxCommandEvent& event); + void OnResetButton(wxCommandEvent& event); + void OnNMIButton(wxCommandEvent& event); void OnRestartVM(wxCommandEvent& event); void OnExit(wxCommandEvent&); @@ -98,10 +104,6 @@ class WXMainFrame : public wxFrame void OnCDForceUI(wxUpdateUIEvent& event); void OnMouseMode(wxCommandEvent& event); void OnMouseModeUI(wxUpdateUIEvent& event); - void OnPowerButton(wxCommandEvent& event); - void OnPowerButtonUI(wxUpdateUIEvent& event); - void OnResetButton(wxCommandEvent& event); - void OnNMIButton(wxCommandEvent& event); void OnKeyboardConnect(wxCommandEvent& event); void OnKeyboardConnectUI(wxUpdateUIEvent& event); @@ -111,6 +113,9 @@ class WXMainFrame : public wxFrame void OnAbout(wxCommandEvent&); + // 指定のモニタ/サブウィンドウがあればメニューに追加する + void AppendIf(wxMenu *, int id, const wxString& label); + int CreateMainviewScaleTable(); int CreateMonRateTable(); @@ -149,6 +154,7 @@ class WXMainFrame : public wxFrame WXStatusPanel *statuspanel {}; Keyboard *keyboard {}; + MPUDevice *mpu {}; PowerDevice *power {}; Syncer *syncer {};