Skip to content

Commit a13fcf5

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

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

TAO/utils/wxNamingViewer/wxViewIORDialog.cpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,19 @@ void WxViewIORDialog::decodeIOR()
220220
}
221221

222222

223-
void WxViewIORDialog::OnApply( wxCommandEvent& event)
223+
#if defined(ANCIENT_WX_WINDOWS)
224+
#define ONLY_ANCIENT_WX_USES(x) (x)
225+
#else
226+
#define ONLY_ANCIENT_WX_USES(x) WXUNUSED(x)
227+
#endif
228+
229+
void WxViewIORDialog::OnApply( wxCommandEvent& ONLY_ANCIENT_WX_USES(event))
224230
{
231+
#if defined(ANCIENT_WX_WINDOWS)
225232
wxDialog::OnApply( event);
233+
#else
234+
wxDialog::EndModal( wxID_APPLY);
235+
#endif
226236
try {
227237
object = orb->string_to_object( ior);
228238
decodeIOR();

0 commit comments

Comments
 (0)