diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index 0732fd4520..4c526f81b5 100644
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -28,6 +28,7 @@
 #include "wx/numformatter.h"
 #include "wx/tokenzr.h"
 #include "wx/renderer.h"
+#include "wx/uilocale.h"
 
 #include "wx/generic/private/grid.h"
 #include "wx/private/window.h"
@@ -160,7 +161,7 @@ wxGridCellDateRenderer::wxGridCellDateRenderer(const wxString& outformat)
 {
     if ( outformat.empty() )
     {
-        m_oformat = "%x"; // Localized date representation.
+        m_oformat = wxGetUIDateFormat();
     }
     else
     {
diff --git a/src/generic/grideditors.cpp b/src/generic/grideditors.cpp
index b4fcbce48b..96832ee9de 100644
--- a/src/generic/grideditors.cpp
+++ b/src/generic/grideditors.cpp
@@ -36,6 +36,7 @@
 #include "wx/tokenzr.h"
 #include "wx/renderer.h"
 #include "wx/datectrl.h"
+#include "wx/uilocale.h"
 
 #include "wx/generic/gridsel.h"
 #include "wx/generic/grideditors.h"
@@ -1852,7 +1853,7 @@ wxGridCellDateEditor::wxGridCellDateEditor(const wxString& format)
 void wxGridCellDateEditor::SetParameters(const wxString& params)
 {
     if ( params.empty() )
-        m_format = "%x";
+        m_format = wxGetUIDateFormat();
     else
         m_format = params;
 }