// 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
#define DEFAULT_ITEM_WIDTH 100
#endif
+#ifdef __WXMSW__
+ #undef wxUSE_POPUPWIN
+ #define wxUSE_POPUPWIN 0 // Popup not working
+ #define TXTCTRL_FLAGS wxNO_BORDER
+ #define BTN_FLAGS wxNO_BORDER
+ #define CALBORDER 0
+ #define RIGHTBUTTONBORDER 3
+ #define TOPBUTTONBORDER 0
+ #define BUTTONBORDER 3
+ #define TXTPOSY 1
+#else
+ #define TXTCTRL_FLAGS 0
+ #define BTN_FLAGS wxBU_AUTODRAW
+ #define CALBORDER 4
+ #define RIGHTBUTTONBORDER 0
+ #define TOPBUTTONBORDER 0
+ #define BUTTONBORDER 0
+ #define TXTPOSY 0
+#endif
+
+
// ----------------------------------------------------------------------------
// local classes
// ----------------------------------------------------------------------------
+
+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);
+
+ void Init()
+ {
+ m_borderX = -1;
+ m_borderY = -1;
+ }
+ bool Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxValidator& validator = wxDefaultValidator);
+
+ void DoMoveWindow(int x, int y, int w, int h);
+
+protected:
+ int m_borderX, m_borderY;
+};
+
+
+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 WXUNUSED(style),
+ const wxValidator& validator)
+{
+ m_marginX = 0;
+ m_marginY = 0;
+
+ wxBitmap chkBmp(15,15); // arbitrary
+ if ( !wxBitmapButton::Create(parent, id, chkBmp,
+ pos, wxDefaultSize, BTN_FLAGS, 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;
+
+ w = size.x > 0 ? size.x : sz.x;
+ h = size.y > 0 ? size.y : sz.y;
+
+ DoMoveWindow(pos.x, pos.y, w, h);
+
+ return true;
+}
+
+
+void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h)
+{
+ if (m_borderX >= 0 && m_borderY >= 0 && (w >= 0 || h >= 0))
+ {
+ 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;
+
+ int bw = w - m_marginX - m_borderX;
+ int bh = h - m_marginY - m_borderY;
+ if (bh < 11) bh=11;
+ if (bw < 9) bw=9;
+
+ wxBitmap bmp(bw, bh);
+ dc.SelectObject(bmp);
+
+ wxRect r(0,0,bw, bh);
+ wxRendererNative& renderer = wxRendererNative::Get();
+
+#ifdef __WXGTK__
+ wxColour magic(255,0,255);
+ dc.SetBrush( wxBrush( magic ) );
+ dc.SetPen( *wxTRANSPARENT_PEN );
+ dc.DrawRectangle(0,0,bw,bh);
+ renderer.DrawComboBoxDropButton(this, dc, r);
+ wxMask *mask = new wxMask( bmp, magic );
+ bmp.SetMask( mask );
+#else
+ renderer.DrawComboBoxDropButton(this, dc, r);
+#endif
+ SetBitmapLabel(bmp);
+
+ wxBitmap bmpSel(bw, bh);
+ dc.SelectObject(bmpSel);
+
+#ifdef __WXGTK__
+ dc.SetBrush( wxBrush( magic ) );
+ dc.SetPen( *wxTRANSPARENT_PEN );
+ dc.DrawRectangle(0,0,bw,bh);
+ renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED);
+ mask = new wxMask( bmpSel, magic );
+ bmpSel.SetMask( mask );
+#else
+ renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED);
+#endif
+ SetBitmapSelected(bmpSel);
+ }
+
+ wxBitmapButton::DoMoveWindow(x, y, w, h);
+}
+
+
#if wxUSE_POPUPWIN
#include "wx/popupwin.h"
END_EVENT_TABLE()
#ifndef wxHAS_NATIVE_DATEPICKCTRL
- IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxDatePickerCtrlBase)
+ IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl)
#endif
// ----------------------------------------------------------------------------
InheritAttributes();
- m_txt = new wxTextCtrl(this, CTRLID_TXT);
- m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN,
- (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnEditKey,
- 0, this);
- m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KILL_FOCUS,
- (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnKillFocus,
- 0, this);
+ m_txt = new wxTextCtrl(this, CTRLID_TXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, TXTCTRL_FLAGS);
- 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->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;
+ const int height = m_txt->GetBestSize().y - BUTTONBORDER;
+
+ m_btn = new wxDropdownButton(this, CTRLID_BTN, wxDefaultPosition, wxSize(height, height));
m_popup = new wxDatePopupInternal(this);
m_popup->SetFont(GetFont());
m_cal = new wxCalendarCtrl(panel, CTRLID_CAL, wxDefaultDateTime,
wxPoint(0, 0), wxDefaultSize,
wxCAL_SHOW_HOLIDAYS | wxSUNKEN_BORDER);
- m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_SEL_CHANGED,
- (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange,
- 0, this);
- m_cal->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN,
- (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnCalKey,
- 0, this);
- m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DOUBLECLICKED,
- (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange,
- 0, this);
- m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DAY_CHANGED,
- (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange,
- 0, this);
- m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_MONTH_CHANGED,
- (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange,
- 0, this);
- m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_YEAR_CHANGED,
- (wxObjectEventFunction)&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)&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;
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;
m_popup->SetClientSize(panel->GetSize());
m_popup->Hide();
- if (!date.IsValid())
- date.Today();
+ SetValue(date.IsValid() ? date : wxDateTime::Today());
- SetValue(date);
+ SetBestFittingSize(size);
return true;
}
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_txt->SetSize(0, TXTPOSY, w-bs.x-RIGHTBUTTONBORDER, h > eh ? eh-TXTPOSY : h-TXTPOSY);
m_btn->SetSize(w - bs.x-RIGHTBUTTONBORDER, TOPBUTTONBORDER, bs.x, h > bs.y ? bs.y : h);
if (m_dropped)
if ( !enable )
{
- if ( m_cal )
- m_cal->Hide();
+ if ( m_popup )
+ m_popup->Hide();
}
if ( m_btn )
if (down)
{
wxDateTime dt;
- if (!m_txt->GetValue().IsEmpty())
+ if (!m_txt->GetValue().empty())
dt.ParseFormat(m_txt->GetValue(), m_format);
if (dt.IsValid())
wxDateTime dt;
dt.ParseFormat(m_txt->GetValue(), m_format);
- if (!dt.IsValid())
+ if ( !dt.IsValid() )
{
if ( !HasFlag(wxDP_ALLOWNONE) )
dt = m_currentDate;
}
- if (!dt.IsValid())
- m_txt->SetValue(wxEmptyString);
- else
+ 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 (m_currentDate != dt)
+ if ( (dt.IsValid() && m_currentDate != dt) ||
+ (!dt.IsValid() && m_currentDate.IsValid()) )
{
m_currentDate = dt;
wxDateEvent event(this, dt, wxEVT_DATE_CHANGED);
// We'll create an additional event if the date is valid.
// If the date isn't valid, the user's probably in the middle of typing
- wxString txt=m_txt->GetValue();
+ wxString txt = m_txt->GetValue();
wxDateTime dt;
- if (!txt.IsEmpty())
+ if (!txt.empty())
{
dt.ParseFormat(txt, m_format);
if (!dt.IsValid())
projects / wxWidgets.git / blobdiff