X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8b49350e619b38ed70ee632ebe7c00f683b15c7..25bb0f8980e997b6146aedbb4deba225b8107f8f:/src/generic/datectlg.cpp diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp index 043733c3a6..a8f65fe981 100644 --- a/src/generic/datectlg.cpp +++ b/src/generic/datectlg.cpp @@ -44,12 +44,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 +72,30 @@ 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 + + // ---------------------------------------------------------------------------- // 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 +108,76 @@ public: 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, + long style = 0, const wxValidator& validator = wxDefaultValidator); - void DoMoveWindow(int x, int y, int w, int h); + virtual void DoMoveWindow(int x, int y, int w, int h); protected: - int m_borderX, m_borderY; + + 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, @@ -125,12 +194,19 @@ bool wxDropdownButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - long WXUNUSED(style), + 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, wxBU_AUTODRAW, validator) ) + pos, wxDefaultSize, + style | (m_useDropArrow ? wxBU_AUTODRAW : wxNO_BORDER), + validator) ) return false; const wxSize sz = GetSize(); @@ -139,46 +215,121 @@ bool wxDropdownButton::Create(wxWindow *parent, 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); + DoMoveWindow(pos.x, pos.y, size.x, size.y); 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" @@ -237,6 +388,7 @@ 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 @@ -269,7 +421,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), @@ -278,10 +430,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()); @@ -316,7 +466,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; @@ -329,17 +479,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; @@ -361,13 +500,12 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent, m_popup->SetClientSize(panel->GetSize()); m_popup->Hide(); - if (!date.IsValid()) - SetValue(wxDateTime::Today()); - else - SetValue(date); + SetValue(date.IsValid() ? date : wxDateTime::Today()); SetBestFittingSize(size); - + + SetBackgroundColour(m_txt->GetBackgroundColour()); + return true; } @@ -383,6 +521,13 @@ void wxDatePickerCtrlGeneric::Init() m_ignoreDrop = false; } +wxDatePickerCtrlGeneric::~wxDatePickerCtrlGeneric() +{ + m_popup = NULL; + m_txt = NULL; + m_cal = NULL; + m_btn = NULL; +} bool wxDatePickerCtrlGeneric::Destroy() { @@ -410,11 +555,6 @@ 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); @@ -457,8 +597,8 @@ bool wxDatePickerCtrlGeneric::Enable(bool enable) if ( !enable ) { - if ( m_cal ) - m_cal->Hide(); + if ( m_popup ) + m_popup->Hide(); } if ( m_btn ) @@ -532,10 +672,11 @@ bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt) allowedChars.Add(wxString(*p++, 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)); @@ -620,6 +761,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(); @@ -636,7 +794,7 @@ void wxDatePickerCtrlGeneric::OnChildSetFocus(wxChildFocusEvent &ev) if (m_dropped) { DropDown(false); - if (ev.GetEventObject() == m_btn) + if (::wxFindWindowAtPoint(::wxGetMousePosition()) == m_btn) m_ignoreDrop = true; } } @@ -669,6 +827,9 @@ void wxDatePickerCtrlGeneric::OnSetFocus(wxFocusEvent& WXUNUSED(ev)) void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev) { + if (!m_txt) + return; + ev.Skip(); wxDateTime dt;