--- nono/wx/wxmainframe.h 2026/04/29 17:04:42 1.1.1.6 +++ nono/wx/wxmainframe.h 2026/04/29 17:04:53 1.1.1.8 @@ -7,6 +7,7 @@ #pragma once #include "wxheader.h" +#include "wxfitframe.h" #include "vm.h" #include @@ -39,6 +40,7 @@ enum { WinID_MONITOR_CACHE7, WinID_MONITOR_CACHE6, WinID_MONITOR_MEMDUMP, + WinID_MONITOR_INTERRUPT, WinID_MONITOR_SPC, WinID_MONITOR_RTC, WinID_MONITOR_DMAC, @@ -49,7 +51,6 @@ enum { WinID_MONITOR_LUNAKEYBOARD, WinID_MONITOR_LCD, WinID_MONITOR_LANCE, - WinID_MONITOR_SYSCTLR, WinID_MONITOR_BITMAP, WinID_MONITOR_BITMAP0, WinID_MONITOR_HOSTINFO, @@ -62,7 +63,7 @@ enum { // ここからそれ以外の ID ID_FULL_SPEED = WinID_MAX, - ID_RESET_VM, + ID_RESTART_VM, ID_SCALE_START, ID_SCALE_1_00, ID_SCALE_0_75, @@ -80,13 +81,15 @@ enum { ID_MONRATE_1, ID_MONRATE_END, + ID_SHOW_STATPANEL, ID_MOUSEMODE, + ID_RESET_BUTTON, }; class WXMainFrame - : public wxFrame + : public WXFitFrame { - using inherited = wxFrame; + using inherited = WXFitFrame; public: // モニタウィンドウ識別名情報 @@ -97,7 +100,7 @@ class WXMainFrame public: WXMainFrame(wxWindow *); - virtual ~WXMainFrame(); + virtual ~WXMainFrame() override; // ウィンドウをリストから削除する。 // ウィンドウをクローズする際に呼び出すこと。 @@ -126,7 +129,7 @@ class WXMainFrame void OnFullSpeed(wxCommandEvent& event); void OnFullSpeedUI(wxUpdateUIEvent& event); - void OnResetVM(wxCommandEvent& event); + void OnRestartVM(wxCommandEvent& event); void OnExit(wxCommandEvent&); @@ -136,9 +139,12 @@ class WXMainFrame void OnMenuFontSizeUI(wxUpdateUIEvent& event); void OnMenuMonRate(wxCommandEvent& event); void OnMenuMonRateUI(wxUpdateUIEvent& event); + void OnShowStatusPanel(wxCommandEvent& event); + void OnShowStatusPanelUI(wxUpdateUIEvent& event); void OnMouseMode(wxCommandEvent& event); void OnMouseModeUI(wxUpdateUIEvent& event); + void OnResetButton(wxCommandEvent& event); void OnWindow(wxCommandEvent&); void DoWindow(int id, bool enable); @@ -167,3 +173,7 @@ class WXMainFrame }; extern WXMainFrame *gMainFrame; + +// コールバック関数 +extern void wxmainframe_poweroff_callback(); +extern void wxmainframe_halt_callback(void *);