no changes, just mention gtk_paint_expander() in comment

[wxWidgets.git] / src / generic / datectlg.cpp

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 87b22e80a0b01b8555b33a7983e035a6a31a73f3..3ccd9d0553621f24266fd2ff34252ac31d56c142 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -40,16 +40,23 @@
     #include "wx/valtext.h"
 #endif
 
     #include "wx/valtext.h"
 #endif
 

-// otherwise it's defined in the native version implementation
+#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"
+#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
     #define _WX_DEFINE_DATE_EVENTS_
 #endif
 
 #include "wx/dateevt.h"
 #ifndef wxHAS_NATIVE_DATEPICKCTRL
     #define _WX_DEFINE_DATE_EVENTS_
 #endif
 
 #include "wx/dateevt.h"

-#include "wx/generic/datectrl.h"

 
 #include "wx/calctrl.h"
 
 #include "wx/calctrl.h"

-#include "wx/popupwin.h"
+#include "wx/renderer.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -67,6 +74,60 @@ enum
     #define DEFAULT_ITEM_WIDTH 100
 #endif
 
     #define DEFAULT_ITEM_WIDTH 100
 #endif
 

+// ----------------------------------------------------------------------------
+// local classes
+// ----------------------------------------------------------------------------
+
+#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
 // ============================================================================
 // ============================================================================
 // wxDatePickerCtrlGeneric implementation
 // ============================================================================


@@ -91,6 +152,7 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
                                      const wxPoint& pos,
                                      const wxSize& size,
                                      long style,
                                      const wxPoint& pos,
                                      const wxSize& size,
                                      long style,

+                                     const wxValidator& validator,

                                      const wxString& name)
 {
     wxASSERT_MSG( !(style & wxDP_SPIN),
                                      const wxString& name)
 {
     wxASSERT_MSG( !(style & wxDP_SPIN),


@@ -98,32 +160,15 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
 
     if ( !wxControl::Create(parent, id, pos, size,
                             style | wxCLIP_CHILDREN | wxWANTS_CHARS,
 
     if ( !wxControl::Create(parent, id, pos, size,
                             style | wxCLIP_CHILDREN | wxWANTS_CHARS,

-                            wxDefaultValidator, name) )
+                            validator, name) )

 
     {
         return false;
     }
 
 
     {
         return false;
     }
 

-    SetWindowStyle(style | wxWANTS_CHARS);

     InheritAttributes();
 
     InheritAttributes();
 

-    wxBitmap bmp(8, 4);
-    {
-        wxMemoryDC dc;
-
-        dc.SelectObject(bmp);
-        dc.SetBrush(wxBrush(GetBackgroundColour()));
-        dc.SetPen(wxPen(GetBackgroundColour()));
-        dc.DrawRectangle(0,0, 8,4);
-
-        dc.SetBrush(wxBrush(GetForegroundColour()));
-        dc.SetPen(wxPen(GetForegroundColour()));
-        wxPoint pt[3] = { wxPoint(0,0), wxPoint(6,0), wxPoint(3,3) };
-        dc.DrawPolygon(3, pt);
-        dc.SelectObject(wxNullBitmap);
-    }
-
-    m_txt=new wxTextCtrl(this, CTRLID_TXT);
+    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_KEY_DOWN,
                    (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnEditKey,
                    0, this);


@@ -131,16 +176,31 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
                    (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnKillFocus,
                    0, this);
 
                    (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnKillFocus,
                    0, this);
 

-    m_btn = new wxBitmapButton(this, CTRLID_BTN, bmp);
+    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)
+                                );
+    }
+
+    wxBitmapButton *btn = new wxBitmapButton(this, CTRLID_BTN, bmp);
+    btn->SetMargins(0, 0);
+    m_btn = btn;

 
 

-    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,
     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)&wxDatePickerCtrlGeneric::OnSelChange,
                                wxCAL_SHOW_HOLIDAYS | wxSUNKEN_BORDER);
     m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_SEL_CHANGED,
                    (wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange,


@@ -170,7 +230,7 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
     dc.SetFont(m_font);
     wxCoord width, dummy;
     dc.GetTextExtent(wxT("2000"), &width, &dummy);
     dc.SetFont(m_font);
     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();
 
     wxSize calSize = m_cal->GetBestSize();
     wxSize yearSize = yearControl->GetSize();


@@ -180,14 +240,15 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
 
     SetFormat(wxT("%x"));
 
 
     SetFormat(wxT("%x"));
 

-    if (date.IsValid())
-        m_txt->SetValue(date.Format(m_format));
-

 
 #ifdef __WXMSW__
 
 #ifdef __WXMSW__

-#define CALBORDER   0
+    #define CALBORDER         0
+    #define RIGHTBUTTONBORDER 2
+    #define TOPBUTTONBORDER   1

 #else
 #else

-#define CALBORDER   4
+    #define CALBORDER         4
+    #define RIGHTBUTTONBORDER 0
+    #define TOPBUTTONBORDER   0

 #endif
 
     width = yearPosition.x + yearSize.x+2+CALBORDER/2;
 #endif
 
     width = yearPosition.x + yearSize.x+2+CALBORDER/2;


@@ -211,7 +272,12 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
     m_popup->SetClientSize(panel->GetSize());
     m_popup->Hide();
 
     m_popup->SetClientSize(panel->GetSize());
     m_popup->Hide();
 

-    return TRUE;
+    if (!date.IsValid())
+        date.Today();
+
+    SetValue(date);
+
+    return true;

 }
 
 
 }
 
 


@@ -257,10 +323,10 @@ void wxDatePickerCtrlGeneric::DoMoveWindow(int x, int y, int w, int h)
     int eh=m_txt->GetBestSize().y;
 
     m_txt->SetSize(0, 0, w-bs.x-1, h > eh ? eh : h);
     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);
+    m_btn->SetSize(w - bs.x-RIGHTBUTTONBORDER, TOPBUTTONBORDER, bs.x, h > bs.y ? bs.y : h);

 
     if (m_dropped)
 
     if (m_dropped)

-        DropDown();
+        DropDown(true);

 }
 
 wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const
 }
 
 wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const


@@ -275,19 +341,19 @@ bool wxDatePickerCtrlGeneric::Show(bool show)
 {
     if ( !wxControl::Show(show) )
     {
 {
     if ( !wxControl::Show(show) )
     {

-        return FALSE;
+        return false;

     }
 
     }
 

-    if (!show)
+    if ( !show )

     {
     {

-        if (m_popup)
+        if ( m_popup )

         {
             m_popup->Hide();
             m_dropped = false;
         }
     }
 
         {
             m_popup->Hide();
             m_dropped = false;
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -295,17 +361,19 @@ bool wxDatePickerCtrlGeneric::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )
     {
 {
     if ( !wxControl::Enable(enable) )
     {

-        return FALSE;
+        return false;

     }
 
     }
 

-    if (!enable)
+    if ( !enable )

     {
     {

-        if (m_cal)
+        if ( m_cal )

             m_cal->Hide();
     }
             m_cal->Hide();
     }

-    if (m_btn)
+
+    if ( m_btn )

         m_btn->Enable(enable);
         m_btn->Enable(enable);

-    return TRUE;
+
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -321,14 +389,6 @@ wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate,
 
 bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
 {
 
 bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
 {

-    wxString currentText;
-    wxDateTime currentDate;
-    if (m_txt)
-    {
-        currentText = m_txt->GetValue();
-        if (!currentText.IsEmpty())
-            currentDate.ParseFormat(currentText, m_format);
-    }

     wxDateTime dt;
     dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d"));
     wxString str=dt.Format(fmt);
     wxDateTime dt;
     dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d"));
     wxString str=dt.Format(fmt);


@@ -356,7 +416,10 @@ bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
         }
         else if (n == (dt.GetYear() % 100))
         {
         }
         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
             p += 2;
         }
         else


@@ -365,39 +428,35 @@ bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
 
     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();
+        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)
         {
             if (*p == '%')
                 p += 2;
             else
         while (*p)
         {
             if (*p == '%')
                 p += 2;
             else

-                valList.Add(wxString(*p++, 1));
+                allowedChars.Add(wxString(*p++, 1));

         }
         }

+

         wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST);
         wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST);

-        tv.SetIncludeList(valList);
+        tv.SetIncludes(allowedChars);

 
         m_txt->SetValidator(tv);
 
 
         m_txt->SetValidator(tv);
 

-        if (!currentText.IsEmpty())
-            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
 {
     return true;
 }
 
 
 wxDateTime wxDatePickerCtrlGeneric::GetValue() const
 {

-    wxDateTime dt;
-    wxString txt=m_txt->GetValue();
-
-    if (!txt.IsEmpty())
-        dt.ParseFormat(txt, m_format);
-
-    return dt;
+    return m_currentDate;

 }
 
 
 }
 
 


@@ -408,7 +467,14 @@ void wxDatePickerCtrlGeneric::SetValue(const wxDateTime& date)
         if (date.IsValid())
             m_txt->SetValue(date.Format(m_format));
         else
         if (date.IsValid())
             m_txt->SetValue(date.Format(m_format));
         else

+        {
+            wxASSERT_MSG( HasFlag(wxDP_ALLOWNONE),
+                            _T("this control must have a valid date") );
+

             m_txt->SetValue(wxEmptyString);
             m_txt->SetValue(wxEmptyString);

+        }
+
+        m_currentDate = date;

     }
 }
 
     }
 }
 


@@ -449,9 +515,9 @@ void wxDatePickerCtrlGeneric::DropDown(bool down)
                 m_cal->SetDate(wxDateTime::Today());
 
             wxPoint pos=GetParent()->ClientToScreen(GetPosition());
                 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_dropped = true;

+            m_cal->SetFocus();

         }
         else
         {
         }
         else
         {


@@ -505,7 +571,7 @@ void wxDatePickerCtrlGeneric::OnSetFocus(wxFocusEvent& WXUNUSED(ev))
     if (m_txt)
     {
         m_txt->SetFocus();
     if (m_txt)
     {
         m_txt->SetFocus();

-        m_txt->SetSelection(0, 100);
+        m_txt->SetSelection(-1, -1); // select everything

     }
 }
 
     }
 }
 


@@ -516,10 +582,22 @@ void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev)
 
     wxDateTime dt;
     dt.ParseFormat(m_txt->GetValue(), m_format);
 
     wxDateTime dt;
     dt.ParseFormat(m_txt->GetValue(), m_format);

-    if (!dt.IsValid())
-        m_txt->SetValue(wxEmptyString);
-    else
-        m_txt->SetValue(dt.Format(m_format));
+    if ( !dt.IsValid() )
+    {
+        if ( !HasFlag(wxDP_ALLOWNONE) )
+            dt = m_currentDate;
+    }
+
+    m_txt->SetValue(dt.IsValid()? dt.Format(m_format) : wxString());
+
+    // notify that we had to change the date after validation
+    if ( (dt.IsValid() && m_currentDate != dt) ||
+            (!dt.IsValid() && m_currentDate.IsValid()) )
+    {
+        m_currentDate = dt;
+        wxDateEvent event(this, dt, wxEVT_DATE_CHANGED);
+        GetEventHandler()->ProcessEvent(event);
+    }

 }
 
 
 }
 
 


@@ -527,7 +605,8 @@ void wxDatePickerCtrlGeneric::OnSelChange(wxCalendarEvent &ev)
 {
     if (m_cal)
     {
 {
     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);
         if (ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED)
         {
             DropDown(false);


@@ -537,6 +616,9 @@ void wxDatePickerCtrlGeneric::OnSelChange(wxCalendarEvent &ev)
     ev.SetEventObject(this);
     ev.SetId(GetId());
     GetParent()->ProcessEvent(ev);
     ev.SetEventObject(this);
     ev.SetId(GetId());
     GetParent()->ProcessEvent(ev);

+
+    wxDateEvent dev(this, ev.GetDate(), wxEVT_DATE_CHANGED);
+    GetParent()->ProcessEvent(dev);

 }
 
 
 }
 
 


@@ -547,7 +629,7 @@ void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev)
     GetParent()->ProcessEvent(ev);
 
     // We'll create an additional event if the date is valid.
     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
+    // If the date isn't valid, the user's probably in the middle of typing

     wxString txt=m_txt->GetValue();
     wxDateTime dt;
     if (!txt.IsEmpty())
     wxString txt=m_txt->GetValue();
     wxDateTime dt;
     if (!txt.IsEmpty())


@@ -563,13 +645,16 @@ void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev)
     cev.SetDate(dt);
 
     GetParent()->ProcessEvent(cev);
     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())
 }
 
 
 void wxDatePickerCtrlGeneric::OnEditKey(wxKeyEvent & ev)
 {
     if (ev.GetKeyCode() == WXK_DOWN && !ev.HasModifiers())

-        DropDown();
+        DropDown(true);

     else
         ev.Skip();
 }
     else
         ev.Skip();
 }