Use EndModal() for newer wxWindows

DOCGroup · Nov 27, 2023 · a13fcf5 · a13fcf5
1 parent 4efd832
commit a13fcf5
Showing 1 changed file with 11 additions and 1 deletion.
diff --git 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();