From d690c4d038a98a7f62a1cf8f3dcda2d23e29ee2a 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 | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
index aada3f6aa0b9b..209a57eb1f919 100644
--- a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
+++ b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
@@ -214,15 +214,24 @@ void WxViewIORDialog::decodeIOR()
     } catch (const CORBA::Exception& ex) {
       wxMessageBox( ex._info().c_str(), "CORBA::Exception");
     }
-
   }
   profiles->Expand( rootItem);
 }
 
 
-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();