Fixed a rare wxAuiFloatingFrame dtor crash on MSW using a registration mechanism...

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

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index cac86b2505b693281315b1f801b2cd0cedad02a7..6527a991b64b17b482d919d0c17c4031e09327b5 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -113,7 +113,7 @@ public:
 
         wxPoint yearPosition = yearControl->GetPosition();
 
 
         wxPoint yearPosition = yearControl->GetPosition();
 

-        SetFormat(wxT("%x"));
+        SetFormat("%x");

 
         width = yearPosition.x + yearSize.x+2+CALBORDER/2;
         if (width < calSize.x-4)
 
         width = yearPosition.x + yearSize.x+2+CALBORDER/2;
         if (width < calSize.x-4)


@@ -259,7 +259,7 @@ private:
         return m_combo->GetParent()->HasFlag(flag);
     }
 
         return m_combo->GetParent()->HasFlag(flag);
     }
 

-    bool SetFormat(const wxChar *fmt)
+    bool SetFormat(const wxString& fmt)

     {
         m_format.clear();
 
     {
         m_format.clear();