--- nono/wx/wxuimessage.cpp	2026/04/29 17:05:16	1.1.1.3
+++ nono/wx/wxuimessage.cpp	2026/04/29 17:05:48	1.1.1.5
@@ -9,53 +9,52 @@
 //
 
 #include "wxuimessage.h"
+#include <array>
+#include <mutex>
 
 // イベントタイプの定義
 wxDEFINE_EVENT(NONO_EVT_UIMESSAGE, wxCommandEvent);
 
-/*static*/
-std::array<std::vector<wxEvtHandler *>, UIMessage::ID_MAX>
-	WXUIMessage::dest_table;
+static std::array<std::vector<wxEvtHandler *>, UIMessage::ID_MAX> table;
+static std::mutex mtx;
 
 // UIMessage を wxWidgets のイベントハンドラに接続する
 /*static*/ void
-WXUIMessage::Connect(UIMessage::ID id, wxEvtHandler *dest,
-		wxObjectEventFunction function)
+WXUIMessage::Connect(UIMessage::ID id, wxEvtHandler *win,
+	wxObjectEventFunction function)
 {
-	dest->Connect(id, NONO_EVT_UIMESSAGE, function);
-	dest_table[id].push_back(dest);
+	std::lock_guard<std::mutex> lock(mtx);
+	win->Connect(id, NONO_EVT_UIMESSAGE, function);
+	table[id].push_back(win);
 }
 
 // イベントハンドラの接続を解除する
 /*static*/ void
-WXUIMessage::Disconnect(UIMessage::ID id, wxEvtHandler *dest,
-		wxObjectEventFunction function)
+WXUIMessage::Disconnect(UIMessage::ID id, wxEvtHandler *win,
+	wxObjectEventFunction function)
 {
-	dest->Disconnect(NONO_EVT_UIMESSAGE, function);
-	for (auto it = dest_table[id].begin(); it != dest_table[id].end(); ++it) {
-		if (*it == dest) {
-			dest_table[id].erase(it);
+	std::lock_guard<std::mutex> lock(mtx);
+	win->Disconnect(NONO_EVT_UIMESSAGE, function);
+	for (auto it = table[id].begin(); it != table[id].end(); ++it) {
+		if (*it == win) {
+			table[id].erase(it);
 			break;
 		}
 	}
 }
 
-// UIMessage を処理する
+// UIMessage::Post() で呼ばれるコールバック関数。
 /*static*/ void
-WXUIMessage::Process(UIMessage::Queue& queue)
+WXUIMessage::Process(uint id, int arg)
 {
-	UIMessage m;
-
-	while (queue.Dequeue(&m)) {
-		UIMessage::ID id = m.GetID();
-		if (id < 0 || id >= UIMessage::ID_MAX) {
-			PANIC("Invalid UIMessage %d", id);
-		}
-		for (auto dest : dest_table[id]) {
-			wxCommandEvent ev(NONO_EVT_UIMESSAGE, id);
-			ev.SetInt(m.GetArg());
-			wxPostEvent(dest, ev);
-		}
+	if (id >= UIMessage::ID_MAX) {
+		PANIC("Invalid UIMessage %u", id);
+	}
+	std::lock_guard<std::mutex> lock(mtx);
+	for (auto win : table[id]) {
+		wxCommandEvent ev(NONO_EVT_UIMESSAGE, id);
+		ev.SetInt(arg);
+		wxPostEvent(win, ev);
 	}
 }
 
@@ -63,8 +62,8 @@ WXUIMessage::Process(UIMessage::Queue& q
 /*static*/ void
 WXUIMessage::AssertAllDisconnected()
 {
-	for (int i = 0; i < dest_table.size(); i++) {
-		if (dest_table[i].empty() == false) {
+	for (int i = 0; i < table.size(); i++) {
+		if (table[i].empty() == false) {
 			warnx("UIMessage ID=%d not disconnected", i);
 		}
 	}