X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38511687af1f6f5500b66978b3c32d9d72ec4f88..9ce05df4bcf937129ca426e5e2937c07a109bde0:/src/generic/datectlg.cpp diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp index ce8fb71cf1..ab5d7448d7 100644 --- a/src/generic/datectlg.cpp +++ b/src/generic/datectlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: generic/datectlg.cpp +// Name: src/generic/datectlg.cpp // Purpose: generic wxDatePickerCtrlGeneric implementation // Author: Andreas Pflug // Modified by: @@ -29,7 +29,8 @@ // 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) +#if !defined(wxHAS_NATIVE_DATEPICKCTRL) || \ + (defined(wxUSE_DATEPICKCTRL_GENERIC) && wxUSE_DATEPICKCTRL_GENERIC) #ifndef WX_PRECOMP #include "wx/bmpbuttn.h" @@ -44,12 +45,10 @@ // this header is not included from wx/datectrl.h if we have a native // version, but we do need it here #include "wx/generic/datectrl.h" -#endif - -// we need to define _WX_DEFINE_DATE_EVENTS_ before including wx/dateevt.h to -// define the event types we use if we're the only date picker control version -// being compiled -- otherwise it's defined in the native version implementation -#ifndef wxHAS_NATIVE_DATEPICKCTRL +#else + // we need to define _WX_DEFINE_DATE_EVENTS_ before including wx/dateevt.h to + // define the event types we use if we're the only date picker control version + // being compiled -- otherwise it's defined in the native version implementation #define _WX_DEFINE_DATE_EVENTS_ #endif @@ -74,10 +73,42 @@ enum #define DEFAULT_ITEM_WIDTH 100 #endif +#if defined(__WXMSW__) + #undef wxUSE_POPUPWIN + #define wxUSE_POPUPWIN 0 // Popup not working + #define TXTCTRL_FLAGS wxNO_BORDER + #define CALBORDER 0 + #define TXTPOSY 1 +#elif defined(__WXGTK__) + #define TXTCTRL_FLAGS 0 + #define CALBORDER 4 + #define TXTPOSY 0 +#else + #define TXTCTRL_FLAGS 0 + #define CALBORDER 4 + #define TXTPOSY 0 +#endif + +// ---------------------------------------------------------------------------- +// global variables +// ---------------------------------------------------------------------------- + +// this should have been a flag in wxDatePickerCtrlGeneric itself but adding it +// there now would break backwards compatibility, so put it here as a global: +// this shouldn't be a big problem as only one (GUI) thread normally can call +// wxDatePickerCtrlGeneric::SetValue() and so it can be only ever used for one +// control at a time +// +// if the value is not NULL, it points to the control which is inside SetValue() +static wxDatePickerCtrlGeneric *gs_inSetValue = NULL; + // ---------------------------------------------------------------------------- // local classes // ---------------------------------------------------------------------------- +// This flag indicates that combo box style drop button is to be created +#define wxBU_COMBO 0x0400 + class wxDropdownButton : public wxBitmapButton { @@ -90,25 +121,75 @@ public: long style=0, const wxValidator& validator = wxDefaultValidator); - void Init() - { - m_borderX = -1; - m_borderY = -1; - } - void Create(wxWindow *parent, + bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = 0, + long style = 0, const wxValidator& validator = wxDefaultValidator); - void DoMoveWindow(int x, int y, int w, int h); - protected: - int m_borderX, m_borderY; + virtual void DoMoveWindow(int x, int y, int w, int h); + + void OnSize(wxSizeEvent& event); + void OnMouseEnter(wxMouseEvent& event); + void OnMouseLeave(wxMouseEvent& event); + + void RecreateBitmaps(int w, int h); + + wxBitmap m_bmpNormal; + wxBitmap m_bmpHot; + + int m_borderX, m_borderY; + + // True if DrawDropArrow should be used instead of DrawComboBoxDropButton + bool m_useDropArrow; + +private: + + void Init() + { + m_borderX = -1; + m_borderY = -1; + } + + DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS_NO_COPY(wxDropdownButton) }; +// Below, macro DROPBUT_USEDROPARROW should return false when +// DrawComboBoxDropButton is to be used to render the entire button. +// COMBOST is non-zero if wxBU_COMBO was set. + +#if defined(__WXMSW__) + + #define DROPBUT_USEDROPARROW(COMBOST) (COMBOST?false:true) + #define DROPBUT_DEFAULT_WIDTH 17 + +#elif defined(__WXGTK__) + + #define DROPBUT_USEDROPARROW(COMBOST) true + #define DROPBUT_DEFAULT_WIDTH 19 + +#else + + #define DROPBUT_USEDROPARROW(COMBOST) true + #define DROPBUT_DEFAULT_WIDTH 17 + +#endif + + +IMPLEMENT_DYNAMIC_CLASS(wxDropdownButton, wxBitmapButton) + + +BEGIN_EVENT_TABLE(wxDropdownButton,wxBitmapButton) + EVT_ENTER_WINDOW(wxDropdownButton::OnMouseEnter) + EVT_LEAVE_WINDOW(wxDropdownButton::OnMouseLeave) + EVT_SIZE(wxDropdownButton::OnSize) +END_EVENT_TABLE() + + wxDropdownButton::wxDropdownButton(wxWindow *parent, wxWindowID id, const wxPoint& pos, @@ -121,61 +202,146 @@ wxDropdownButton::wxDropdownButton(wxWindow *parent, } -void wxDropdownButton::Create(wxWindow *parent, +bool wxDropdownButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator) { - wxBitmap chkBmp(15,15); // arbitrary - wxBitmapButton::Create(parent, id, chkBmp, pos, wxDefaultSize, wxBU_AUTODRAW, validator); + m_marginX = 0; + m_marginY = 0; + + m_useDropArrow = DROPBUT_USEDROPARROW(style & wxBU_COMBO); - int w, h; + wxBitmap chkBmp(15,15); // arbitrary + if ( !wxBitmapButton::Create(parent, id, chkBmp, + pos, wxDefaultSize, + style | (m_useDropArrow ? wxBU_AUTODRAW : wxNO_BORDER), + validator) ) + return false; - w=chkBmp.GetWidth(); - h=chkBmp.GetHeight(); - m_borderX = GetSize().x - m_marginX - w; - m_borderY = GetSize().y - m_marginY - h; + const wxSize sz = GetSize(); + int w = chkBmp.GetWidth(), + h = chkBmp.GetHeight(); + m_borderX = sz.x - m_marginX - w; + m_borderY = sz.y - m_marginY - h; - w = (size.x > 0 ? size.x : GetSize().x); - h = (size.y > 0 ? size.y : GetSize().y); + DoMoveWindow(pos.x, pos.y, size.x, size.y); - DoMoveWindow(pos.x, pos.y, w, h); + return true; } -void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h) +void wxDropdownButton::RecreateBitmaps(int w, int h) { - if (m_borderX >= 0 && m_borderY >= 0 && (w >= 0 || h >= 0)) + wxMemoryDC dc; + + int borderX = m_marginX + m_borderX; + int borderY = m_marginY + m_borderY; + int bw = w - borderX; + int bh = h - borderY; + + wxBitmap bmp(bw, bh); + wxBitmap bmpSel(bw, bh); + wxRect r(0,0,w,h); + + wxRendererNative& renderer = wxRendererNative::Get(); + + dc.SelectObject(bmp); + + if ( m_useDropArrow ) { - wxMemoryDC dc; - if (w < 0) - w = GetSize().x; -#ifdef __WXGTK__ - else - w = m_marginX + m_borderX + 15; // GTK magic size -#endif - if (h < 0) - h = GetSize().y; + // Use DrawDropArrow on transparent background. + + wxColour magic(255,0,255); + wxBrush magicBrush(magic); + r.x = -(borderX/2); + r.y = -(borderY/2); + + dc.SetBrush( magicBrush ); + dc.SetPen( *wxTRANSPARENT_PEN ); + dc.DrawRectangle(0,0,bw,bh); + renderer.DrawDropArrow(this, dc, r); + dc.SelectObject( wxNullBitmap ); + wxMask *mask = new wxMask( bmp, magic ); + bmp.SetMask( mask ); + + dc.SelectObject(bmpSel); + + dc.SetBrush( magicBrush ); + dc.SetPen( *wxTRANSPARENT_PEN ); + dc.DrawRectangle(0,0,bw,bh); + renderer.DrawDropArrow(this, dc, r, wxCONTROL_PRESSED); + dc.SelectObject( wxNullBitmap ); + mask = new wxMask( bmpSel, magic ); + bmpSel.SetMask( mask ); + } + else + { + // Use DrawComboBoxDropButton for the entire button + // (also render extra "hot" button state). + + renderer.DrawComboBoxDropButton(this, dc, r); - int bw = w - m_marginX - m_borderX; - int bh = h - m_marginY - m_borderY; - if (bh < 11) bh=11; - if (bw < 9) bw=9; + dc.SelectObject(bmpSel); - wxBitmap bmp(bw, bh); - dc.SelectObject(bmp); + renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED); - wxRendererNative::Get().DrawComboBoxDropButton(this, dc, wxRect(0,0,bw, bh)); + wxBitmap bmpHot(bw,bh); + dc.SelectObject(bmpHot); + renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_CURRENT); - SetBitmapLabel(bmp); + m_bmpNormal = bmp; + m_bmpHot = bmpHot; } + SetBitmapLabel(bmp); + SetBitmapSelected(bmpSel); +} + + +void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h) +{ + if (w < 0) + w = DROPBUT_DEFAULT_WIDTH; + wxBitmapButton::DoMoveWindow(x, y, w, h); } +void wxDropdownButton::OnSize(wxSizeEvent& event) +{ + if ( m_borderX >= 0 && m_borderY >= 0 ) + { + int w, h; + GetClientSize(&w,&h); + + if ( w > 1 && h > 1 ) + RecreateBitmaps(w,h); + } + event.Skip(); +} + + +void wxDropdownButton::OnMouseEnter(wxMouseEvent& event) +{ + if ( !m_useDropArrow ) + SetBitmapLabel(m_bmpHot); + + event.Skip(); +} + + +void wxDropdownButton::OnMouseLeave(wxMouseEvent& event) +{ + if ( !m_useDropArrow ) + SetBitmapLabel(m_bmpNormal); + + event.Skip(); +} + + #if wxUSE_POPUPWIN #include "wx/popupwin.h" @@ -234,10 +400,11 @@ BEGIN_EVENT_TABLE(wxDatePickerCtrlGeneric, wxDatePickerCtrlBase) EVT_BUTTON(CTRLID_BTN, wxDatePickerCtrlGeneric::OnClick) EVT_TEXT(CTRLID_TXT, wxDatePickerCtrlGeneric::OnText) EVT_CHILD_FOCUS(wxDatePickerCtrlGeneric::OnChildSetFocus) + EVT_SIZE(wxDatePickerCtrlGeneric::OnSize) END_EVENT_TABLE() #ifndef wxHAS_NATIVE_DATEPICKCTRL - IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxDatePickerCtrlBase) + IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl) #endif // ---------------------------------------------------------------------------- @@ -266,7 +433,7 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent, InheritAttributes(); - m_txt = new wxTextCtrl(this, CTRLID_TXT); + m_txt = new wxTextCtrl(this, CTRLID_TXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, TXTCTRL_FLAGS); m_txt->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(wxDatePickerCtrlGeneric::OnEditKey), @@ -275,10 +442,8 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent, wxFocusEventHandler(wxDatePickerCtrlGeneric::OnKillFocus), NULL, this); - const int height = m_txt->GetBestSize().y; + m_btn = new wxDropdownButton(this, CTRLID_BTN, wxDefaultPosition, wxDefaultSize, wxBU_COMBO); - m_btn = new wxDropdownButton(this, CTRLID_BTN, wxDefaultPosition, wxSize(height, height)); - m_popup = new wxDatePopupInternal(this); m_popup->SetFont(GetFont()); @@ -313,7 +478,7 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent, wxFocusEventHandler(wxDatePickerCtrlGeneric::OnSetFocus)); wxClientDC dc(yearControl); - dc.SetFont(m_font); + dc.SetFont(yearControl->GetFont()); wxCoord width, dummy; dc.GetTextExtent(wxT("2000"), &width, &dummy); width += ConvertDialogToPixels(wxSize(20, 0)).x; @@ -326,17 +491,6 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent, SetFormat(wxT("%x")); - -#ifdef __WXMSW__ - #define CALBORDER 0 - #define RIGHTBUTTONBORDER 2 - #define TOPBUTTONBORDER 1 -#else - #define CALBORDER 4 - #define RIGHTBUTTONBORDER 0 - #define TOPBUTTONBORDER 0 -#endif - width = yearPosition.x + yearSize.x+2+CALBORDER/2; if (width < calSize.x-4) width = calSize.x-4; @@ -358,10 +512,11 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent, m_popup->SetClientSize(panel->GetSize()); m_popup->Hide(); - if (!date.IsValid()) - date.Today(); + SetValue(date.IsValid() ? date : wxDateTime::Today()); - SetValue(date); + SetBestFittingSize(size); + + SetBackgroundColour(m_txt->GetBackgroundColour()); return true; } @@ -378,6 +533,13 @@ void wxDatePickerCtrlGeneric::Init() m_ignoreDrop = false; } +wxDatePickerCtrlGeneric::~wxDatePickerCtrlGeneric() +{ + m_popup = NULL; + m_txt = NULL; + m_cal = NULL; + m_btn = NULL; +} bool wxDatePickerCtrlGeneric::Destroy() { @@ -405,21 +567,20 @@ bool wxDatePickerCtrlGeneric::Destroy() void wxDatePickerCtrlGeneric::DoMoveWindow(int x, int y, int w, int h) { wxControl::DoMoveWindow(x, y, w, h); - wxSize bs=m_btn->GetBestSize(); - int eh=m_txt->GetBestSize().y; - - m_txt->SetSize(0, 0, w-bs.x-1, h > eh ? eh : h); - m_btn->SetSize(w - bs.x-RIGHTBUTTONBORDER, TOPBUTTONBORDER, bs.x, h > bs.y ? bs.y : h); if (m_dropped) - DropDown(true); + DropDown(false); } wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const { - int bh=m_btn->GetBestSize().y; - int eh=m_txt->GetBestSize().y; - return wxSize(DEFAULT_ITEM_WIDTH, bh > eh ? bh : eh); + if (m_btn && m_txt) + { + int bh=m_btn->GetBestSize().y; + int eh=m_txt->GetBestSize().y; + return wxSize(DEFAULT_ITEM_WIDTH, bh > eh ? bh : eh); + } + return wxControl::DoGetBestSize(); } @@ -452,8 +613,8 @@ bool wxDatePickerCtrlGeneric::Enable(bool enable) if ( !enable ) { - if ( m_cal ) - m_cal->Hide(); + if ( m_popup ) + m_popup->Hide(); } if ( m_btn ) @@ -475,14 +636,14 @@ wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate, bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt) { + m_format.clear(); + wxDateTime dt; dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d")); - wxString str=dt.Format(fmt); - wxChar *p=(wxChar*)str.c_str(); - - m_format=wxEmptyString; + wxString str(dt.Format(fmt)); - while (*p) + const wxChar *p = str.c_str(); + while ( *p ) { int n=wxAtoi(p); if (n == dt.GetDay()) @@ -512,25 +673,26 @@ bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt) m_format.Append(*p++); } - if (m_txt) + if ( m_txt ) { wxArrayString allowedChars; for ( wxChar c = _T('0'); c <= _T('9'); c++ ) allowedChars.Add(wxString(c, 1)); - const wxChar *p = m_format.c_str(); - while (*p) + const wxChar *p2 = m_format.c_str(); + while ( *p2 ) { - if (*p == '%') - p += 2; + if ( *p2 == '%') + p2 += 2; else - allowedChars.Add(wxString(*p++, 1)); + allowedChars.Add(wxString(*p2++, 1)); } +#if wxUSE_VALIDATORS wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST); tv.SetIncludes(allowedChars); - m_txt->SetValidator(tv); +#endif if (m_currentDate.IsValid()) m_txt->SetValue(m_currentDate.Format(m_format)); @@ -548,20 +710,29 @@ wxDateTime wxDatePickerCtrlGeneric::GetValue() const void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date) { - if (m_cal) - { - if (date.IsValid()) - m_txt->SetValue(date.Format(m_format)); - else - { - wxASSERT_MSG( HasFlag(wxDP_ALLOWNONE), - _T("this control must have a valid date") ); + if ( !m_cal ) + return; - m_txt->SetValue(wxEmptyString); - } + // we need to suppress the event sent from wxTextCtrl as calling our + // SetValue() should not result in an event being sent (wxTextCtrl is + // an exception to this rule) + gs_inSetValue = this; - m_currentDate = date; + if ( date.IsValid() ) + { + m_txt->SetValue(date.Format(m_format)); + } + else // invalid date + { + wxASSERT_MSG( HasFlag(wxDP_ALLOWNONE), + _T("this control must have a valid date") ); + + m_txt->SetValue(wxEmptyString); } + + gs_inSetValue = NULL; + + m_currentDate = date; } @@ -569,7 +740,7 @@ bool wxDatePickerCtrlGeneric::GetRange(wxDateTime *dt1, wxDateTime *dt2) const { if (dt1) *dt1 = m_cal->GetLowerDateLimit(); - if (dt1) + if (dt2) *dt2 = m_cal->GetUpperDateLimit(); return true; } @@ -615,6 +786,23 @@ void wxDatePickerCtrlGeneric::DropDown(bool down) } +void wxDatePickerCtrlGeneric::OnSize(wxSizeEvent& event) +{ + if ( m_btn ) + { + wxSize sz = GetClientSize(); + + wxSize bs=m_btn->GetSize(); + int eh=m_txt->GetBestSize().y; + + m_txt->SetSize(0, TXTPOSY, sz.x-bs.x, sz.y > eh ? eh-TXTPOSY : sz.y-TXTPOSY); + m_btn->SetSize(sz.x - bs.x, 0, bs.x, sz.y); + } + + event.Skip(); +} + + void wxDatePickerCtrlGeneric::OnChildSetFocus(wxChildFocusEvent &ev) { ev.Skip(); @@ -631,7 +819,7 @@ void wxDatePickerCtrlGeneric::OnChildSetFocus(wxChildFocusEvent &ev) if (m_dropped) { DropDown(false); - if (ev.GetEventObject() == m_btn) + if (::wxFindWindowAtPoint(::wxGetMousePosition()) == m_btn) m_ignoreDrop = true; } } @@ -664,6 +852,9 @@ void wxDatePickerCtrlGeneric::OnSetFocus(wxFocusEvent& WXUNUSED(ev)) void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev) { + if (!m_txt) + return; + ev.Skip(); wxDateTime dt; @@ -680,7 +871,7 @@ void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev) m_txt->SetValue(wxEmptyString); // notify that we had to change the date after validation - if ( (dt.IsValid() && m_currentDate != dt) || + if ( (dt.IsValid() && (!m_currentDate.IsValid() || m_currentDate != dt)) || (!dt.IsValid() && m_currentDate.IsValid()) ) { m_currentDate = dt; @@ -713,6 +904,12 @@ void wxDatePickerCtrlGeneric::OnSelChange(wxCalendarEvent &ev) void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev) { + if ( gs_inSetValue ) + { + // artificial event resulting from our own SetValue() call, ignore it + return; + } + ev.SetEventObject(this); ev.SetId(GetId()); GetParent()->ProcessEvent(ev); @@ -760,4 +957,3 @@ void wxDatePickerCtrlGeneric::OnCalKey(wxKeyEvent & ev) #endif // wxUSE_DATEPICKCTRL_GENERIC #endif // wxUSE_DATEPICKCTRL -