fix for focus event sending

[wxWidgets.git] / src / generic / calctrl.cpp

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index 40259f8b942492324354d0ebb892089ee8916a09..37a0ab77135e94be97185edaf0bdd7656f0e6a49 100644 (file)
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -36,8 +36,7 @@
     #include "wx/stattext.h"
 #endif //WX_PRECOMP
 
     #include "wx/stattext.h"
 #endif //WX_PRECOMP
 

-// Can only use wxSpinEvent if this is enabled
-#if wxUSE_SPINBTN
+#if wxUSE_CALENDARCTRL

 
 #include "wx/calctrl.h"
 
 
 #include "wx/calctrl.h"
 


@@ -181,14 +180,20 @@ void wxCalendarCtrl::Init()
     m_colHeaderBg = *wxLIGHT_GREY;
 }
 
     m_colHeaderBg = *wxLIGHT_GREY;
 }
 

-bool wxCalendarCtrl::Create(wxWindow * WXUNUSED(parent),
-                            wxWindowID WXUNUSED(id),
+bool wxCalendarCtrl::Create(wxWindow *parent,
+                            wxWindowID id,

                             const wxDateTime& date,
                             const wxDateTime& date,

-                            const wxPoint& WXUNUSED(pos),
+                            const wxPoint& pos,

                             const wxSize& size,
                             long style,
                             const wxSize& size,
                             long style,

-                            const wxString& WXUNUSED(name))
+                            const wxString& name)

 {
 {

+    if ( !wxControl::Create(parent, id, pos, size,
+                            style | wxWANTS_CHARS, wxDefaultValidator, name) )
+    {
+        return FALSE;
+    }
+

     // needed to get the arrow keys normally used for the dialog navigation
     SetWindowStyle(style | wxWANTS_CHARS);
 
     // needed to get the arrow keys normally used for the dialog navigation
     SetWindowStyle(style | wxWANTS_CHARS);
 


@@ -1058,5 +1063,5 @@ wxCalendarEvent::wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type)
     m_date = cal->GetDate();
 }
 
     m_date = cal->GetDate();
 }
 

-#endif // wxUSE_SPINBTN
+#endif // wxUSE_CALENDARCTRL