From a13fcf53ad7e920b8b1cd05ae129030f271c6b49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Cie=C5=9Blak?= <saper@saper.info>
Date: Mon, 27 Nov 2023 03:01:11 +0100
Subject: [PATCH] Use EndModal() for newer wxWindows

---
 TAO/utils/wxNamingViewer/wxViewIORDialog.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
index aada3f6aa0b9b..8a326842b0dd5 100644
--- a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
+++ b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
@@ -220,9 +220,19 @@ void WxViewIORDialog::decodeIOR()
 }
 
 
-void WxViewIORDialog::OnApply( wxCommandEvent& event)
+#if defined(ANCIENT_WX_WINDOWS)
+#define ONLY_ANCIENT_WX_USES(x) (x)
+#else
+#define ONLY_ANCIENT_WX_USES(x) WXUNUSED(x)
+#endif
+
+void WxViewIORDialog::OnApply( wxCommandEvent& ONLY_ANCIENT_WX_USES(event))
 {
+#if defined(ANCIENT_WX_WINDOWS)
   wxDialog::OnApply( event);
+#else
+  wxDialog::EndModal( wxID_APPLY);
+#endif
   try {
     object = orb->string_to_object( ior);
     decodeIOR();