Skip to content

Commit d690c4d

Browse files
committed
Use EndModal() for newer wxWindows
1 parent 4efd832 commit d690c4d

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

TAO/utils/wxNamingViewer/wxViewIORDialog.cpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,15 +214,24 @@ void WxViewIORDialog::decodeIOR()
214214
} catch (const CORBA::Exception& ex) {
215215
wxMessageBox( ex._info().c_str(), "CORBA::Exception");
216216
}
217-
218217
}
219218
profiles->Expand( rootItem);
220219
}
221220

222221

223-
void WxViewIORDialog::OnApply( wxCommandEvent& event)
222+
#if defined(ANCIENT_WX_WINDOWS)
223+
#define ONLY_ANCIENT_WX_USES(x) (x)
224+
#else
225+
#define ONLY_ANCIENT_WX_USES(x) WXUNUSED(x)
226+
#endif
227+
228+
void WxViewIORDialog::OnApply( wxCommandEvent& ONLY_ANCIENT_WX_USES(event))
224229
{
230+
#if defined(ANCIENT_WX_WINDOWS)
225231
wxDialog::OnApply( event);
232+
#else
233+
wxDialog::EndModal( wxID_APPLY);
234+
#endif
226235
try {
227236
object = orb->string_to_object( ior);
228237
decodeIOR();

0 commit comments

Comments
 (0)