// 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 4
+ #define TOPBUTTONBORDER 0
+ #define BUTTONBORDER 4
+ #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
// ----------------------------------------------------------------------------
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);
}
-void wxDropdownButton::Create(wxWindow *parent,
+bool wxDropdownButton::Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
- long style,
+ long WXUNUSED(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;
- int w, h;
+ wxBitmap chkBmp(15,15); // arbitrary
+ if ( !wxBitmapButton::Create(parent, id, chkBmp,
+ pos, wxDefaultSize, BTN_FLAGS, 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);
+ 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;
}
if (h < 0)
h = GetSize().y;
- int bw = w - m_marginX - m_borderX;
- int bh = h - m_marginY - m_borderY;
+ int borderX = m_marginX + m_borderX;
+ int borderY = m_marginY + m_borderY;
+ int bw = w - borderX;
+ int bh = h - borderY;
if (bh < 11) bh=11;
if (bw < 9) bw=9;
wxBitmap bmp(bw, bh);
dc.SelectObject(bmp);
- wxRendererNative::Get().DrawComboBoxDropButton(this, dc, wxRect(0,0,bw, bh));
+ wxRendererNative& renderer = wxRendererNative::Get();
+#ifdef __WXGTK__
+ wxRect r(-(borderX/2),-(borderY/2),w,h);
+ wxColour magic(255,0,255);
+ dc.SetBrush( wxBrush( magic ) );
+ dc.SetPen( *wxTRANSPARENT_PEN );
+ dc.DrawRectangle(0,0,bw,bh);
+ renderer.DrawDropArrow(this, dc, r);
+ wxMask *mask = new wxMask( bmp, magic );
+ bmp.SetMask( mask );
+#else
+ wxRect r(0,0,bw,bh);
+ 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.DrawDropArrow(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);
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 = new wxTextCtrl(this, CTRLID_TXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, TXTCTRL_FLAGS);
m_txt->Connect(wxEVT_KEY_DOWN,
wxKeyEventHandler(wxDatePickerCtrlGeneric::OnEditKey),
wxFocusEventHandler(wxDatePickerCtrlGeneric::OnKillFocus),
NULL, this);
- const int height = m_txt->GetBestSize().y;
+ 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());
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 )
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));
projects / wxWidgets.git / blobdiff