X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d5ae99f5e8dca72f160d7002576a3736dccb6f65..2376eee2483911ac454f16313a48da5740457765:/src/generic/datectlg.cpp?ds=inline diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp index 1fb696c719..587506f537 100644 --- a/src/generic/datectlg.cpp +++ b/src/generic/datectlg.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: generic/datectlg.cpp -// Purpose: generic wxDatePickerCtrl implementation +// Purpose: generic wxDatePickerCtrlGeneric implementation // Author: Andreas Pflug // Modified by: // Created: 2005-01-19 @@ -23,6 +23,14 @@ #pragma hdrstop #endif +#if wxUSE_DATEPICKCTRL + +#include "wx/datectrl.h" + +// use this version if we're explicitly requested to do it or if it's the only +// one we have +#if wxUSE_DATEPICKCTRL_GENERIC || !defined(wxHAS_NATIVE_DATEPICKCTRL) + #ifndef WX_PRECOMP #include "wx/bmpbuttn.h" #include "wx/dialog.h" @@ -32,11 +40,18 @@ #include "wx/valtext.h" #endif -#define _WX_DEFINE_DATE_EVENTS_ +// otherwise it's defined in the native version implementation +#ifndef wxHAS_NATIVE_DATEPICKCTRL + #define _WX_DEFINE_DATE_EVENTS_ +#endif + #include "wx/dateevt.h" +#include "wx/generic/datectrl.h" -#include "wx/datectrl.h" +#include "wx/arrstr.h" #include "wx/calctrl.h" +#include "wx/popupwin.h" +#include "wx/renderer.h" // ---------------------------------------------------------------------------- // constants @@ -55,81 +70,75 @@ enum #endif // ============================================================================ -// wxDatePickerCtrl implementation +// wxDatePickerCtrlGeneric implementation // ============================================================================ -BEGIN_EVENT_TABLE(wxDatePickerCtrl, wxDatePickerCtrlBase) - EVT_BUTTON(CTRLID_BTN, wxDatePickerCtrl::OnClick) - EVT_TEXT(CTRLID_TXT, wxDatePickerCtrl::OnText) - EVT_CHILD_FOCUS(wxDatePickerCtrl::OnChildSetFocus) +BEGIN_EVENT_TABLE(wxDatePickerCtrlGeneric, wxDatePickerCtrlBase) + EVT_BUTTON(CTRLID_BTN, wxDatePickerCtrlGeneric::OnClick) + EVT_TEXT(CTRLID_TXT, wxDatePickerCtrlGeneric::OnText) + EVT_CHILD_FOCUS(wxDatePickerCtrlGeneric::OnChildSetFocus) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxDatePickerCtrlBase) +#ifndef wxHAS_NATIVE_DATEPICKCTRL + IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxDatePickerCtrlBase) +#endif // ---------------------------------------------------------------------------- // creation // ---------------------------------------------------------------------------- -wxDatePickerCtrl::wxDatePickerCtrl(wxWindow *parent, - wxWindowID id, - const wxDateTime& date, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - Init(); - Create(parent, id, date, pos, size, style, name); -} - - -bool wxDatePickerCtrl::Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& date, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) +bool wxDatePickerCtrlGeneric::Create(wxWindow *parent, + wxWindowID id, + const wxDateTime& date, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) { wxASSERT_MSG( !(style & wxDP_SPIN), _T("wxDP_SPIN style not supported, use wxDP_DEFAULT") ); if ( !wxControl::Create(parent, id, pos, size, style | wxCLIP_CHILDREN | wxWANTS_CHARS, - wxDefaultValidator, name) ) + validator, name) ) { return false; } - SetWindowStyle(style | wxWANTS_CHARS); InheritAttributes(); - wxBitmap bmp(8, 4); - { - wxMemoryDC dc; - - dc.SelectObject(bmp); - dc.SetBrush(wxBrush(GetBackgroundColour())); - dc.SetPen(wxPen(GetBackgroundColour())); - dc.DrawRectangle(0,0, 8,4); - - dc.SetBrush(wxBrush(GetForegroundColour())); - dc.SetPen(wxPen(GetForegroundColour())); - wxPoint pt[3] = { wxPoint(0,0), wxPoint(6,0), wxPoint(3,3) }; - dc.DrawPolygon(3, pt); - dc.SelectObject(wxNullBitmap); - } - - m_txt=new wxTextCtrl(this, CTRLID_TXT); + m_txt = new wxTextCtrl(this, CTRLID_TXT); m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN, - (wxObjectEventFunction)&wxDatePickerCtrl::OnEditKey, + (wxObjectEventFunction) + (wxEventFunction) + (wxCharEventFunction) + &wxDatePickerCtrlGeneric::OnEditKey, 0, this); m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KILL_FOCUS, - (wxObjectEventFunction)&wxDatePickerCtrl::OnKillFocus, + (wxObjectEventFunction) + (wxEventFunction) + (wxFocusEventFunction) + &wxDatePickerCtrlGeneric::OnKillFocus, 0, this); - m_btn = new wxBitmapButton(this, CTRLID_BTN, bmp); + const int height = m_txt->GetBestSize().y - 4; // FIXME: fudge + wxBitmap bmp(height, height); + { + wxMemoryDC dc; + dc.SelectObject(bmp); + wxRendererNative::Get().DrawComboBoxDropButton + ( + this, + dc, + wxRect(0, 0, height, height) + ); + } + + wxBitmapButton *btn = new wxBitmapButton(this, CTRLID_BTN, bmp); + btn->SetMargins(0, 0); + m_btn = btn; m_popup = new wxPopupWindow(this); m_popup->SetFont(GetFont()); @@ -141,28 +150,49 @@ bool wxDatePickerCtrl::Create(wxWindow *parent, wxPoint(0,0), wxDefaultSize, wxCAL_SHOW_HOLIDAYS | wxSUNKEN_BORDER); m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_SEL_CHANGED, - (wxObjectEventFunction)&wxDatePickerCtrl::OnSelChange, + (wxObjectEventFunction) + (wxEventFunction) + (wxCalendarEventFunction) + &wxDatePickerCtrlGeneric::OnSelChange, 0, this); m_cal->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN, - (wxObjectEventFunction)&wxDatePickerCtrl::OnCalKey, + (wxObjectEventFunction) + (wxEventFunction) + (wxCharEventFunction) + &wxDatePickerCtrlGeneric::OnCalKey, 0, this); m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DOUBLECLICKED, - (wxObjectEventFunction)&wxDatePickerCtrl::OnSelChange, + (wxObjectEventFunction) + (wxEventFunction) + (wxCalendarEventFunction) + &wxDatePickerCtrlGeneric::OnSelChange, 0, this); m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DAY_CHANGED, - (wxObjectEventFunction)&wxDatePickerCtrl::OnSelChange, + (wxObjectEventFunction) + (wxEventFunction) + (wxCalendarEventFunction) + &wxDatePickerCtrlGeneric::OnSelChange, 0, this); m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_MONTH_CHANGED, - (wxObjectEventFunction)&wxDatePickerCtrl::OnSelChange, + (wxObjectEventFunction) + (wxEventFunction) + (wxCalendarEventFunction) + &wxDatePickerCtrlGeneric::OnSelChange, 0, this); m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_YEAR_CHANGED, - (wxObjectEventFunction)&wxDatePickerCtrl::OnSelChange, + (wxObjectEventFunction) + (wxEventFunction) + (wxCalendarEventFunction) + &wxDatePickerCtrlGeneric::OnSelChange, 0, this); wxWindow *yearControl = m_cal->GetYearControl(); Connect(wxID_ANY, wxID_ANY, wxEVT_SET_FOCUS, - (wxObjectEventFunction)&wxDatePickerCtrl::OnSetFocus); + (wxObjectEventFunction) + (wxEventFunction) + (wxFocusEventFunction) + &wxDatePickerCtrlGeneric::OnSetFocus); wxClientDC dc(yearControl); dc.SetFont(m_font); @@ -209,11 +239,11 @@ bool wxDatePickerCtrl::Create(wxWindow *parent, m_popup->SetClientSize(panel->GetSize()); m_popup->Hide(); - return TRUE; + return true; } -void wxDatePickerCtrl::Init() +void wxDatePickerCtrlGeneric::Init() { m_popup = NULL; m_txt = NULL; @@ -225,7 +255,7 @@ void wxDatePickerCtrl::Init() } -bool wxDatePickerCtrl::Destroy() +bool wxDatePickerCtrlGeneric::Destroy() { if (m_cal) m_cal->Destroy(); @@ -248,7 +278,7 @@ bool wxDatePickerCtrl::Destroy() // overridden base class methods // ---------------------------------------------------------------------------- -void wxDatePickerCtrl::DoMoveWindow(int x, int y, int w, int h) +void wxDatePickerCtrlGeneric::DoMoveWindow(int x, int y, int w, int h) { wxControl::DoMoveWindow(x, y, w, h); wxSize bs=m_btn->GetBestSize(); @@ -261,7 +291,7 @@ void wxDatePickerCtrl::DoMoveWindow(int x, int y, int w, int h) DropDown(); } -wxSize wxDatePickerCtrl::DoGetBestSize() const +wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const { int bh=m_btn->GetBestSize().y; int eh=m_txt->GetBestSize().y; @@ -269,11 +299,11 @@ wxSize wxDatePickerCtrl::DoGetBestSize() const } -bool wxDatePickerCtrl::Show(bool show) +bool wxDatePickerCtrlGeneric::Show(bool show) { if ( !wxControl::Show(show) ) { - return FALSE; + return false; } if (!show) @@ -285,15 +315,15 @@ bool wxDatePickerCtrl::Show(bool show) } } - return TRUE; + return true; } -bool wxDatePickerCtrl::Enable(bool enable) +bool wxDatePickerCtrlGeneric::Enable(bool enable) { if ( !wxControl::Enable(enable) ) { - return FALSE; + return false; } if (!enable) @@ -303,28 +333,28 @@ bool wxDatePickerCtrl::Enable(bool enable) } if (m_btn) m_btn->Enable(enable); - return TRUE; + return true; } // ---------------------------------------------------------------------------- -// wxDatePickerCtrl API +// wxDatePickerCtrlGeneric API // ---------------------------------------------------------------------------- bool -wxDatePickerCtrl::SetDateRange(const wxDateTime& lowerdate, - const wxDateTime& upperdate) +wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate, + const wxDateTime& upperdate) { return m_cal->SetDateRange(lowerdate, upperdate); } -bool wxDatePickerCtrl::SetFormat(const wxChar *fmt) +bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt) { wxString currentText; wxDateTime currentDate; if (m_txt) { currentText = m_txt->GetValue(); - if (!currentText.IsEmpty()) + if (!currentText.empty()) currentDate.ParseFormat(currentText, m_format); } wxDateTime dt; @@ -363,7 +393,7 @@ bool wxDatePickerCtrl::SetFormat(const wxChar *fmt) if (m_txt) { - wxStringList valList; + wxArrayString valList; wxChar c; for (c='0'; c <= '9'; c++) valList.Add(wxString(c, 1)); @@ -376,30 +406,30 @@ bool wxDatePickerCtrl::SetFormat(const wxChar *fmt) valList.Add(wxString(*p++, 1)); } wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST); - tv.SetIncludeList(valList); + tv.SetIncludes(valList); m_txt->SetValidator(tv); - if (!currentText.IsEmpty()) + if (!currentText.empty()) m_txt->SetValue(currentDate.Format(m_format)); } return true; } -wxDateTime wxDatePickerCtrl::GetValue() const +wxDateTime wxDatePickerCtrlGeneric::GetValue() const { wxDateTime dt; wxString txt=m_txt->GetValue(); - if (!txt.IsEmpty()) + if (!txt.empty()) dt.ParseFormat(txt, m_format); return dt; } -void wxDatePickerCtrl::SetValue(const wxDateTime& date) +void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date) { if (m_cal) { @@ -411,7 +441,7 @@ void wxDatePickerCtrl::SetValue(const wxDateTime& date) } -bool wxDatePickerCtrl::GetRange(wxDateTime *dt1, wxDateTime *dt2) const +bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const { if (dt1) *dt1 = m_cal->GetLowerDateLimit(); @@ -421,7 +451,8 @@ bool wxDatePickerCtrl::GetRange(wxDateTime *dt1, wxDateTime *dt2) const } -void wxDatePickerCtrl::SetRange(const wxDateTime &dt1, const wxDateTime &dt2) +void +wxDatePickerCtrlGeneric::SetRange(const wxDateTime &dt1, const wxDateTime &dt2) { m_cal->SetDateRange(dt1, dt2); } @@ -430,14 +461,14 @@ void wxDatePickerCtrl::SetRange(const wxDateTime &dt1, const wxDateTime &dt2) // event handlers // ---------------------------------------------------------------------------- -void wxDatePickerCtrl::DropDown(bool down) +void wxDatePickerCtrlGeneric::DropDown(bool down) { if (m_popup) { if (down) { wxDateTime dt; - if (!m_txt->GetValue().IsEmpty()) + if (!m_txt->GetValue().empty()) dt.ParseFormat(m_txt->GetValue(), m_format); if (dt.IsValid()) @@ -460,7 +491,7 @@ void wxDatePickerCtrl::DropDown(bool down) } -void wxDatePickerCtrl::OnChildSetFocus(wxChildFocusEvent &ev) +void wxDatePickerCtrlGeneric::OnChildSetFocus(wxChildFocusEvent &ev) { ev.Skip(); m_ignoreDrop = false; @@ -482,7 +513,7 @@ void wxDatePickerCtrl::OnChildSetFocus(wxChildFocusEvent &ev) } -void wxDatePickerCtrl::OnClick(wxCommandEvent& event) +void wxDatePickerCtrlGeneric::OnClick(wxCommandEvent& WXUNUSED(event)) { if (m_ignoreDrop) { @@ -497,7 +528,7 @@ void wxDatePickerCtrl::OnClick(wxCommandEvent& event) } -void wxDatePickerCtrl::OnSetFocus(wxFocusEvent &ev) +void wxDatePickerCtrlGeneric::OnSetFocus(wxFocusEvent& WXUNUSED(ev)) { if (m_txt) { @@ -507,7 +538,7 @@ void wxDatePickerCtrl::OnSetFocus(wxFocusEvent &ev) } -void wxDatePickerCtrl::OnKillFocus(wxFocusEvent &ev) +void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev) { ev.Skip(); @@ -520,7 +551,7 @@ void wxDatePickerCtrl::OnKillFocus(wxFocusEvent &ev) } -void wxDatePickerCtrl::OnSelChange(wxCalendarEvent &ev) +void wxDatePickerCtrlGeneric::OnSelChange(wxCalendarEvent &ev) { if (m_cal) { @@ -537,7 +568,7 @@ void wxDatePickerCtrl::OnSelChange(wxCalendarEvent &ev) } -void wxDatePickerCtrl::OnText(wxCommandEvent &ev) +void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev) { ev.SetEventObject(this); ev.SetId(GetId()); @@ -547,7 +578,7 @@ void wxDatePickerCtrl::OnText(wxCommandEvent &ev) // If the date isn't valid, the user's probable in the middle of typing wxString txt=m_txt->GetValue(); wxDateTime dt; - if (!txt.IsEmpty()) + if (!txt.empty()) { dt.ParseFormat(txt, m_format); if (!dt.IsValid()) @@ -563,7 +594,7 @@ void wxDatePickerCtrl::OnText(wxCommandEvent &ev) } -void wxDatePickerCtrl::OnEditKey(wxKeyEvent & ev) +void wxDatePickerCtrlGeneric::OnEditKey(wxKeyEvent & ev) { if (ev.GetKeyCode() == WXK_DOWN && !ev.HasModifiers()) DropDown(); @@ -572,7 +603,7 @@ void wxDatePickerCtrl::OnEditKey(wxKeyEvent & ev) } -void wxDatePickerCtrl::OnCalKey(wxKeyEvent & ev) +void wxDatePickerCtrlGeneric::OnCalKey(wxKeyEvent & ev) { if (ev.GetKeyCode() == WXK_ESCAPE && !ev.HasModifiers()) DropDown(false); @@ -580,3 +611,7 @@ void wxDatePickerCtrl::OnCalKey(wxKeyEvent & ev) ev.Skip(); } +#endif // wxUSE_DATEPICKCTRL_GENERIC + +#endif // wxUSE_DATEPICKCTRL +