// 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"
#include "wx/valtext.h"
#endif
-// otherwise it's defined in the native version implementation
-#ifndef wxHAS_NATIVE_DATEPICKCTRL
+#ifdef wxHAS_NATIVE_DATEPICKCTRL
+ // 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"
+#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
#include "wx/dateevt.h"
-#include "wx/generic/datectrl.h"
#include "wx/calctrl.h"
-#include "wx/popupwin.h"
#include "wx/renderer.h"
// ----------------------------------------------------------------------------
#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
+{
+public:
+ wxDropdownButton() { Init(); }
+ wxDropdownButton(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style=0,
+ const wxValidator& validator = wxDefaultValidator);
+
+ bool Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxValidator& validator = wxDefaultValidator);
+
+protected:
+ 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,
+ const wxSize& size,
+ long style,
+ const wxValidator& validator)
+{
+ Init();
+ Create(parent, id, pos, size, style, validator);
+}
+
+
+bool wxDropdownButton::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator& validator)
+{
+ m_marginX = 0;
+ m_marginY = 0;
+
+ m_useDropArrow = DROPBUT_USEDROPARROW(style & wxBU_COMBO);
+
+ wxBitmap chkBmp(15,15); // arbitrary
+ if ( !wxBitmapButton::Create(parent, id, chkBmp,
+ pos, wxDefaultSize,
+ style | (m_useDropArrow ? wxBU_AUTODRAW : wxNO_BORDER),
+ validator) )
+ return false;
+
+ 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;
+
+ DoMoveWindow(pos.x, pos.y, size.x, size.y);
+
+ return true;
+}
+
+
+void wxDropdownButton::RecreateBitmaps(int w, int h)
+{
+ 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 )
+ {
+ // 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);
+
+ dc.SelectObject(bmpSel);
+
+ renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED);
+
+ wxBitmap bmpHot(bw,bh);
+ dc.SelectObject(bmpHot);
+ renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_CURRENT);
+
+ 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"
+
+class wxDatePopupInternal : public wxPopupTransientWindow
+{
+public:
+ wxDatePopupInternal(wxWindow *parent) : wxPopupTransientWindow(parent) { }
+
+ void ShowAt(int x, int y)
+ {
+ Position(wxPoint(x, y), wxSize(0, 0));
+ Popup();
+ }
+
+ void Hide()
+ {
+ Dismiss();
+ }
+};
+
+#else // !wxUSE_POPUPWIN
+
+class wxDatePopupInternal : public wxDialog
+{
+public:
+ wxDatePopupInternal(wxWindow *parent)
+ : wxDialog(parent,
+ wxID_ANY,
+ wxEmptyString,
+ wxDefaultPosition,
+ wxDefaultSize,
+ wxSIMPLE_BORDER)
+ {
+ }
+
+ void ShowAt(int x, int y)
+ {
+ Show();
+ Move(x, y);
+ }
+
+ void Hide()
+ {
+ wxDialog::Hide();
+ }
+};
+
+#endif // wxUSE_POPUPWIN/!wxUSE_POPUPWIN
+
// ============================================================================
// wxDatePickerCtrlGeneric implementation
// ============================================================================
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
// ----------------------------------------------------------------------------
const wxPoint& pos,
const wxSize& size,
long style,
+ const wxValidator& validator,
const wxString& name)
{
wxASSERT_MSG( !(style & wxDP_SPIN),
if ( !wxControl::Create(parent, id, pos, size,
style | wxCLIP_CHILDREN | wxWANTS_CHARS,
- wxDefaultValidator, name) )
+ validator, name) )
{
return false;
InheritAttributes();
- m_txt = new wxTextCtrl(this, CTRLID_TXT);
- m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxCharEventFunction)
- &wxDatePickerCtrlGeneric::OnEditKey,
- 0, this);
- m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KILL_FOCUS,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxFocusEventFunction)
- &wxDatePickerCtrlGeneric::OnKillFocus,
- 0, this);
-
- 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)
- );
- }
+ m_txt = new wxTextCtrl(this, CTRLID_TXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, TXTCTRL_FLAGS);
+
+ m_txt->Connect(wxEVT_KEY_DOWN,
+ wxKeyEventHandler(wxDatePickerCtrlGeneric::OnEditKey),
+ NULL, this);
+ m_txt->Connect(wxEVT_KILL_FOCUS,
+ wxFocusEventHandler(wxDatePickerCtrlGeneric::OnKillFocus),
+ NULL, this);
- wxBitmapButton *btn = new wxBitmapButton(this, CTRLID_BTN, bmp);
- btn->SetMargins(0, 0);
- m_btn = btn;
+ m_btn = new wxDropdownButton(this, CTRLID_BTN, wxDefaultPosition, wxDefaultSize, wxBU_COMBO);
- m_popup = new wxPopupWindow(this);
+ m_popup = new wxDatePopupInternal(this);
m_popup->SetFont(GetFont());
wxPanel *panel=new wxPanel(m_popup, CTRLID_PAN,
wxPoint(0, 0), wxDefaultSize,
wxSUNKEN_BORDER);
m_cal = new wxCalendarCtrl(panel, CTRLID_CAL, wxDefaultDateTime,
- wxPoint(0,0), wxDefaultSize,
+ wxPoint(0, 0), wxDefaultSize,
wxCAL_SHOW_HOLIDAYS | wxSUNKEN_BORDER);
- m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_SEL_CHANGED,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxCalendarEventFunction)
- &wxDatePickerCtrlGeneric::OnSelChange,
- 0, this);
- m_cal->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxCharEventFunction)
- &wxDatePickerCtrlGeneric::OnCalKey,
- 0, this);
- m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DOUBLECLICKED,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxCalendarEventFunction)
- &wxDatePickerCtrlGeneric::OnSelChange,
- 0, this);
- m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DAY_CHANGED,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxCalendarEventFunction)
- &wxDatePickerCtrlGeneric::OnSelChange,
- 0, this);
- m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_MONTH_CHANGED,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxCalendarEventFunction)
- &wxDatePickerCtrlGeneric::OnSelChange,
- 0, this);
- m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_YEAR_CHANGED,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxCalendarEventFunction)
- &wxDatePickerCtrlGeneric::OnSelChange,
- 0, this);
+ m_cal->Connect(wxEVT_CALENDAR_SEL_CHANGED,
+ wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange),
+ NULL, this);
+ m_cal->Connect(wxEVT_KEY_DOWN,
+ wxKeyEventHandler(wxDatePickerCtrlGeneric::OnCalKey),
+ NULL, this);
+ m_cal->Connect(wxEVT_CALENDAR_DOUBLECLICKED,
+ wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange),
+ NULL, this);
+ m_cal->Connect(wxEVT_CALENDAR_DAY_CHANGED,
+ wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange),
+ NULL, this);
+ m_cal->Connect(wxEVT_CALENDAR_MONTH_CHANGED,
+ wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange),
+ NULL, this);
+ m_cal->Connect(wxEVT_CALENDAR_YEAR_CHANGED,
+ wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange),
+ NULL, this);
wxWindow *yearControl = m_cal->GetYearControl();
- Connect(wxID_ANY, wxID_ANY, wxEVT_SET_FOCUS,
- (wxObjectEventFunction)
- (wxEventFunction)
- (wxFocusEventFunction)
- &wxDatePickerCtrlGeneric::OnSetFocus);
+ Connect(wxEVT_SET_FOCUS,
+ 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;
+ width += ConvertDialogToPixels(wxSize(20, 0)).x;
wxSize calSize = m_cal->GetBestSize();
wxSize yearSize = yearControl->GetSize();
SetFormat(wxT("%x"));
- if (date.IsValid())
- m_txt->SetValue(date.Format(m_format));
-
-
-#ifdef __WXMSW__
-#define CALBORDER 0
-#else
-#define CALBORDER 4
-#endif
-
width = yearPosition.x + yearSize.x+2+CALBORDER/2;
if (width < calSize.x-4)
width = calSize.x-4;
m_popup->SetClientSize(panel->GetSize());
m_popup->Hide();
+ SetValue(date.IsValid() ? date : wxDateTime::Today());
+
+ SetBestFittingSize(size);
+
+ SetBackgroundColour(m_txt->GetBackgroundColour());
+
return true;
}
m_ignoreDrop = false;
}
+wxDatePickerCtrlGeneric::~wxDatePickerCtrlGeneric()
+{
+ m_popup = NULL;
+ m_txt = NULL;
+ m_cal = NULL;
+ m_btn = NULL;
+}
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, 0, bs.x, h > bs.y ? bs.y : h);
if (m_dropped)
- DropDown();
+ DropDown(true);
}
wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const
return false;
}
- if (!show)
+ if ( !show )
{
- if (m_popup)
+ if ( m_popup )
{
m_popup->Hide();
m_dropped = false;
return false;
}
- if (!enable)
+ if ( !enable )
{
- if (m_cal)
- m_cal->Hide();
+ if ( m_popup )
+ m_popup->Hide();
}
- if (m_btn)
+
+ if ( m_btn )
m_btn->Enable(enable);
+
return true;
}
bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
{
- wxString currentText;
- wxDateTime currentDate;
- if (m_txt)
- {
- currentText = m_txt->GetValue();
- if (!currentText.empty())
- currentDate.ParseFormat(currentText, m_format);
- }
+ 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())
}
else if (n == (dt.GetYear() % 100))
{
- m_format.Append(wxT("%y"));
+ if (GetWindowStyle() & wxDP_SHOWCENTURY)
+ m_format.Append(wxT("%Y"));
+ else
+ m_format.Append(wxT("%y"));
p += 2;
}
else
m_format.Append(*p++);
}
- if (m_txt)
+ if ( m_txt )
{
- wxStringList valList;
- wxChar c;
- for (c='0'; c <= '9'; c++)
- valList.Add(wxString(c, 1));
- wxChar *p=(wxChar*)m_format.c_str();
- while (*p)
+ wxArrayString allowedChars;
+ for ( wxChar c = _T('0'); c <= _T('9'); c++ )
+ allowedChars.Add(wxString(c, 1));
+
+ const wxChar *p2 = m_format.c_str();
+ while ( *p2 )
{
- if (*p == '%')
- p += 2;
+ if ( *p2 == '%')
+ p2 += 2;
else
- valList.Add(wxString(*p++, 1));
+ allowedChars.Add(wxString(*p2++, 1));
}
- wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST);
- tv.SetIncludeList(valList);
+#if wxUSE_VALIDATORS
+ wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST);
+ tv.SetIncludes(allowedChars);
m_txt->SetValidator(tv);
+#endif
- if (!currentText.empty())
- m_txt->SetValue(currentDate.Format(m_format));
+ if (m_currentDate.IsValid())
+ m_txt->SetValue(m_currentDate.Format(m_format));
}
+
return true;
}
wxDateTime wxDatePickerCtrlGeneric::GetValue() const
{
- wxDateTime dt;
- wxString txt=m_txt->GetValue();
-
- if (!txt.empty())
- dt.ParseFormat(txt, m_format);
-
- return dt;
+ return m_currentDate;
}
void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date)
{
- if (m_cal)
+ if ( !m_cal )
+ return;
+
+ // 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;
+
+ if ( date.IsValid() )
{
- if (date.IsValid())
- m_txt->SetValue(date.Format(m_format));
- else
- m_txt->SetValue(wxEmptyString);
+ 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;
}
m_cal->SetDate(wxDateTime::Today());
wxPoint pos=GetParent()->ClientToScreen(GetPosition());
- m_popup->Move(pos.x, pos.y + GetSize().y);
- m_popup->Show();
+ m_popup->ShowAt(pos.x, pos.y + GetSize().y);
m_dropped = true;
+ m_cal->SetFocus();
}
else
{
}
+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();
if (m_dropped)
{
DropDown(false);
- if (ev.GetEventObject() == m_btn)
+ if (::wxFindWindowAtPoint(::wxGetMousePosition()) == m_btn)
m_ignoreDrop = true;
}
}
if (m_txt)
{
m_txt->SetFocus();
- m_txt->SetSelection(0, 100);
+ m_txt->SetSelection(-1, -1); // select everything
}
}
void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev)
{
+ if (!m_txt)
+ return;
+
ev.Skip();
wxDateTime dt;
dt.ParseFormat(m_txt->GetValue(), m_format);
- if (!dt.IsValid())
- m_txt->SetValue(wxEmptyString);
- else
+ if ( !dt.IsValid() )
+ {
+ if ( !HasFlag(wxDP_ALLOWNONE) )
+ dt = m_currentDate;
+ }
+
+ if(dt.IsValid())
m_txt->SetValue(dt.Format(m_format));
+ else
+ m_txt->SetValue(wxEmptyString);
+
+ // notify that we had to change the date after validation
+ if ( (dt.IsValid() && (!m_currentDate.IsValid() || m_currentDate != dt)) ||
+ (!dt.IsValid() && m_currentDate.IsValid()) )
+ {
+ m_currentDate = dt;
+ wxDateEvent event(this, dt, wxEVT_DATE_CHANGED);
+ GetEventHandler()->ProcessEvent(event);
+ }
}
{
if (m_cal)
{
- m_txt->SetValue(m_cal->GetDate().Format(m_format));
+ m_currentDate = m_cal->GetDate();
+ m_txt->SetValue(m_currentDate.Format(m_format));
if (ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED)
{
DropDown(false);
ev.SetEventObject(this);
ev.SetId(GetId());
GetParent()->ProcessEvent(ev);
+
+ wxDateEvent dev(this, ev.GetDate(), wxEVT_DATE_CHANGED);
+ GetParent()->ProcessEvent(dev);
}
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);
// We'll create an additional event if the date is valid.
- // If the date isn't valid, the user's probable in the middle of typing
- wxString txt=m_txt->GetValue();
+ // If the date isn't valid, the user's probably in the middle of typing
+ wxString txt = m_txt->GetValue();
wxDateTime dt;
if (!txt.empty())
{
cev.SetDate(dt);
GetParent()->ProcessEvent(cev);
+
+ wxDateEvent dev(this, dt, wxEVT_DATE_CHANGED);
+ GetParent()->ProcessEvent(dev);
}
void wxDatePickerCtrlGeneric::OnEditKey(wxKeyEvent & ev)
{
if (ev.GetKeyCode() == WXK_DOWN && !ev.HasModifiers())
- DropDown();
+ DropDown(true);
else
ev.Skip();
}
projects / wxWidgets.git / blobdiff