From b6292ff062e5f80564a365661afe07836076d07c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 21 Jan 2005 15:08:19 +0000 Subject: [PATCH] compilation fix when used together with native control git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/datectlg.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp index 27331850dd..87b22e80a0 100644 --- a/src/generic/datectlg.cpp +++ b/src/generic/datectlg.cpp @@ -46,6 +46,7 @@ #endif #include "wx/dateevt.h" +#include "wx/generic/datectrl.h" #include "wx/calctrl.h" #include "wx/popupwin.h" @@ -76,7 +77,9 @@ BEGIN_EVENT_TABLE(wxDatePickerCtrlGeneric, wxDatePickerCtrlBase) EVT_CHILD_FOCUS(wxDatePickerCtrlGeneric::OnChildSetFocus) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxDatePickerCtrlBase) +#ifndef wxHAS_NATIVE_DATEPICKCTRL + IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxDatePickerCtrlBase) +#endif // ---------------------------------------------------------------------------- // creation @@ -482,7 +485,7 @@ void wxDatePickerCtrlGeneric::OnChildSetFocus(wxChildFocusEvent &ev) } -void wxDatePickerCtrlGeneric::OnClick(wxCommandEvent& event) +void wxDatePickerCtrlGeneric::OnClick(wxCommandEvent& WXUNUSED(event)) { if (m_ignoreDrop) { @@ -497,7 +500,7 @@ void wxDatePickerCtrlGeneric::OnClick(wxCommandEvent& event) } -void wxDatePickerCtrlGeneric::OnSetFocus(wxFocusEvent &ev) +void wxDatePickerCtrlGeneric::OnSetFocus(wxFocusEvent& WXUNUSED(ev)) { if (m_txt) { -- 2.45.2