From 1f457376b478257b88d4a857f5ec1b6155442dd7 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 20 Sep 2020 03:03:26 +0000 Subject: CTAN sync 202009200303 --- support/dktools/DkWxTraceOptionsDialog.wxc | 34 +++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 10 deletions(-) (limited to 'support/dktools/DkWxTraceOptionsDialog.wxc') diff --git a/support/dktools/DkWxTraceOptionsDialog.wxc b/support/dktools/DkWxTraceOptionsDialog.wxc index 348b9008cb..a79fdfc16d 100644 --- a/support/dktools/DkWxTraceOptionsDialog.wxc +++ b/support/dktools/DkWxTraceOptionsDialog.wxc @@ -2,7 +2,7 @@ copyright owner = Dirk Krause copyright year = 2011-xxxx -license = bsd +SPDX-License-Identifier: BSD-3-Clause %% wx-gui @@ -120,7 +120,11 @@ class DkWxTraceOptionsDialog : public wxDialog /** Event table. */ +#if wxCHECK_VERSION(3,0,0) + wxDECLARE_EVENT_TABLE(); +#else DECLARE_EVENT_TABLE() +#endif protected: @@ -165,22 +169,22 @@ class DkWxTraceOptionsDialog : public wxDialog /** Handler for OK button. @param event Event to process. */ - void OnOK(wxCommandEvent& WXUNUSED(event)); + void OnOK(wxCommandEvent& event); /** Handler for Cancel button. @param event Event to process. */ - void OnCancel(wxCommandEvent& WXUNUSED(event)); + void OnCancel(wxCommandEvent& event); /** Handler for clicking the debug checkbox. @param event Event to process. */ - void OnChangeDebug(wxCommandEvent & WXUNUSED(event)); + void OnChangeDebug(wxCommandEvent & event); /** Handler for changing the use splint option. @param event Event to process. */ - void OnChangeUseSplint(wxCommandEvent & WXUNUSED(event)); + void OnChangeUseSplint(wxCommandEvent & event); public: @@ -201,18 +205,28 @@ class DkWxTraceOptionsDialog : public wxDialog %% module start +#include "dk3conf.h" #include "dkwxtrace.h" $!trace-include -BEGIN_EVENT_TABLE(DkWxTraceOptionsDialog, wxDialog) + +#if wxCHECK_VERSION(3,0,0) +wxBEGIN_EVENT_TABLE(DkWxTraceOptionsDialog,wxDialog) +#else +BEGIN_EVENT_TABLE(DkWxTraceOptionsDialog,wxDialog) +#endif EVT_BUTTON(wxID_OK, DkWxTraceOptionsDialog::OnOK) EVT_BUTTON(wxID_CANCEL, DkWxTraceOptionsDialog::OnCancel) EVT_CHECKBOX(DkWxTrace_Debug, DkWxTraceOptionsDialog::OnChangeDebug) EVT_CHECKBOX(DkWxTrace_UseSplint, DkWxTraceOptionsDialog::OnChangeUseSplint) +#if wxCHECK_VERSION(3,0,0) +wxEND_EVENT_TABLE() +#else END_EVENT_TABLE() +#endif %% constructor start DkWxTraceOptionsDialog::DkWxTraceOptionsDialog( @@ -266,7 +280,7 @@ cRed(0x7F, 0x00, 0x00) void DkWxTraceOptionsDialog::OnOK( - wxCommandEvent & event + wxCommandEvent & WXUNUSED(event) ) { dataOut(); @@ -281,7 +295,7 @@ DkWxTraceOptionsDialog::OnOK( void DkWxTraceOptionsDialog::OnCancel( - wxCommandEvent & event + wxCommandEvent & WXUNUSED(event) ) { if(IsModal()) { @@ -296,7 +310,7 @@ DkWxTraceOptionsDialog::OnCancel( void DkWxTraceOptionsDialog::OnChangeDebug( - wxCommandEvent & event + wxCommandEvent & WXUNUSED(event) ) { correctGUI(); @@ -306,7 +320,7 @@ DkWxTraceOptionsDialog::OnChangeDebug( void DkWxTraceOptionsDialog::OnChangeUseSplint( - wxCommandEvent & event + wxCommandEvent & WXUNUSED(event) ) { correctGUI(); -- cgit v1.2.3