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

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 27331850dd09c83bd3637de2c2a79484917a6eb8..87b22e80a0b01b8555b33a7983e035a6a31a73f3 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -46,6 +46,7 @@
 #endif
 
 #include "wx/dateevt.h"
 #endif
 
 #include "wx/dateevt.h"

+#include "wx/generic/datectrl.h"

 
 #include "wx/calctrl.h"
 #include "wx/popupwin.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()
 
     EVT_CHILD_FOCUS(wxDatePickerCtrlGeneric::OnChildSetFocus)
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxDatePickerCtrlBase)
+#ifndef wxHAS_NATIVE_DATEPICKCTRL
+    IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxDatePickerCtrlBase)
+#endif

 
 // ----------------------------------------------------------------------------
 // creation
 
 // ----------------------------------------------------------------------------
 // creation


@@ -482,7 +485,7 @@ void wxDatePickerCtrlGeneric::OnChildSetFocus(wxChildFocusEvent &ev)
 }
 
 
 }
 
 

-void wxDatePickerCtrlGeneric::OnClick(wxCommandEvent& event)
+void wxDatePickerCtrlGeneric::OnClick(wxCommandEvent& WXUNUSED(event))

 {
     if (m_ignoreDrop)
     {
 {
     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)
     {
 {
     if (m_txt)
     {