update button style to include BS_MULTILINE when a multiline label is set

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

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index fbdbdb8bb6503a5257b0896dab42668275f6d665..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)


@@ -181,7 +181,7 @@ public:
 
         if ( !s.empty() )
         {
 
         if ( !s.empty() )
         {

-            pDt->ParseFormat(s, m_format);
+            pDt->ParseFormat(s.c_str(), m_format);

             if ( !pDt->IsValid() )
                 return false;
         }
             if ( !pDt->IsValid() )
                 return false;
         }


@@ -199,10 +199,10 @@ public:
         cev.SetEventObject(datePicker);
         cev.SetId(datePicker->GetId());
         cev.SetDate(dt);
         cev.SetEventObject(datePicker);
         cev.SetId(datePicker->GetId());
         cev.SetDate(dt);

-        GetParent()->ProcessEvent(cev);
+        datePicker->GetEventHandler()->ProcessEvent(cev);

 
         wxDateEvent event(datePicker, dt, wxEVT_DATE_CHANGED);
 
         wxDateEvent event(datePicker, dt, wxEVT_DATE_CHANGED);

-        datePicker->GetParent()->ProcessEvent(event);
+        datePicker->GetEventHandler()->ProcessEvent(event);

     }
 
 private:
     }
 
 private:


@@ -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();
 


@@ -515,7 +515,7 @@ void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev)
 {
     ev.SetEventObject(this);
     ev.SetId(GetId());
 {
     ev.SetEventObject(this);
     ev.SetId(GetId());

-    GetParent()->ProcessEvent(ev);
+    GetParent()->GetEventHandler()->ProcessEvent(ev);

 
     // We'll create an additional event if the date is valid.
     // If the date isn't valid, the user's probably in the middle of typing
 
     // We'll create an additional event if the date is valid.
     // If the date isn't valid, the user's probably in the middle of typing