Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxUILocale for date formatting in wxDataViewDateRenderer

Browse Source 
Use the appropriate format for the dates by using the UI, rather than C,
locale, similarly to wxGrid.
This commit is contained in:
Vadim Zeitlin
2021-08-14 19:08:43 +01:00
parent 8373b14280
commit c746953f9b
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dvrenderers.h
View File

@@ -527,6 +527,8 @@ public:
virtual wxSize GetSize() const wxOVERRIDE; virtual wxSize GetSize() const wxOVERRIDE;
private: private:
wxString FormatDate() const;
wxDateTime m_date; wxDateTime m_date;
}; };
#else // !wxUSE_DATEPICKCTRL #else // !wxUSE_DATEPICKCTRL

13
src/common/datavcmn.cpp
View File

@@ -28,6 +28,8 @@
#include "wx/choice.h" #include "wx/choice.h"
#include "wx/imaglist.h" #include "wx/imaglist.h"
#include "wx/renderer.h" #include "wx/renderer.h"
#include "wx/uilocale.h"
#if wxUSE_ACCESSIBILITY #if wxUSE_ACCESSIBILITY
#include "wx/access.h" #include "wx/access.h"
#endif // wxUSE_ACCESSIBILITY #endif // wxUSE_ACCESSIBILITY
@@ -1986,23 +1988,28 @@ bool wxDataViewDateRenderer::GetValue(wxVariant& value) const
return true; return true;
} }
wxString wxDataViewDateRenderer::FormatDate() const
{
return m_date.Format(wxGetUIDateFormat());
}
#if wxUSE_ACCESSIBILITY #if wxUSE_ACCESSIBILITY
wxString wxDataViewDateRenderer::GetAccessibleDescription() const wxString wxDataViewDateRenderer::GetAccessibleDescription() const
{ {
return m_date.FormatDate(); return FormatDate();
} }
#endif // wxUSE_ACCESSIBILITY #endif // wxUSE_ACCESSIBILITY
bool wxDataViewDateRenderer::Render(wxRect cell, wxDC* dc, int state) bool wxDataViewDateRenderer::Render(wxRect cell, wxDC* dc, int state)
{ {
wxString tmp = m_date.FormatDate(); wxString tmp = FormatDate();
RenderText( tmp, 0, cell, dc, state ); RenderText( tmp, 0, cell, dc, state );
return true; return true;
} }
wxSize wxDataViewDateRenderer::GetSize() const wxSize wxDataViewDateRenderer::GetSize() const
{ {
return GetTextExtent(m_date.FormatDate()); return GetTextExtent(FormatDate());
} }
#endif // (defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXGTK__)) && wxUSE_DATEPICKCTRL #endif // (defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXGTK__)) && wxUSE_DATEPICKCTRL