This should make the GTK statictext control wrap

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

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index 6e6bf645b0066c9f377799cf6d227133531ed28c..f7ee6134f4490bd28721d3b7fbe780950b98df47 100644 (file)
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -322,7 +322,7 @@ bool wxCalendarCtrl::Create(wxWindow *parent,
     // Since we don't paint the whole background make sure that the platform
     // will use the right one.
     SetBackgroundColour(GetBackgroundColour());
     // Since we don't paint the whole background make sure that the platform
     // will use the right one.
     SetBackgroundColour(GetBackgroundColour());

-    
+

     SetHolidayAttrs();
 
     return true;
     SetHolidayAttrs();
 
     return true;


@@ -801,7 +801,7 @@ wxSize wxCalendarCtrl::DoGetBestSize() const
 
     wxSize best(width, height);
     CacheBestSize(best);
 
     wxSize best(width, height);
     CacheBestSize(best);

-    return best;   
+    return best;

 }
 
 void wxCalendarCtrl::DoSetSize(int x, int y,
 }
 
 void wxCalendarCtrl::DoSetSize(int x, int y,


@@ -975,7 +975,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         leftarrow[1] = wxPoint(arrowheight / 2, 0);
         leftarrow[2] = wxPoint(arrowheight / 2, arrowheight - 1);
 
         leftarrow[1] = wxPoint(arrowheight / 2, 0);
         leftarrow[2] = wxPoint(arrowheight / 2, arrowheight - 1);
 

-        rightarrow[0] = wxPoint(0, 0);
+        rightarrow[0] = wxPoint(0,0);

         rightarrow[1] = wxPoint(arrowheight / 2, arrowheight / 2);
         rightarrow[2] = wxPoint(0, arrowheight - 1);
 
         rightarrow[1] = wxPoint(arrowheight / 2, arrowheight / 2);
         rightarrow[2] = wxPoint(0, arrowheight - 1);
 


@@ -984,8 +984,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         wxCoord arrowy = (m_heightRow - arrowheight) / 2;
         wxCoord larrowx = (m_widthCol - (arrowheight / 2)) / 2;
         wxCoord rarrowx = ((m_widthCol - (arrowheight / 2)) / 2) + m_widthCol*6;
         wxCoord arrowy = (m_heightRow - arrowheight) / 2;
         wxCoord larrowx = (m_widthCol - (arrowheight / 2)) / 2;
         wxCoord rarrowx = ((m_widthCol - (arrowheight / 2)) / 2) + m_widthCol*6;

-        m_leftArrowRect = wxRect(0, 0, 0, 0);
-        m_rightArrowRect = wxRect(0, 0, 0, 0);
+        m_leftArrowRect = m_rightArrowRect = wxRect(0,0,0,0);

 
         if ( AllowMonthChange() )
         {
 
         if ( AllowMonthChange() )
         {