fixing toolbar repositioning (iOS)

[wxWidgets.git] / src / html / htmlcell.cpp

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index ac6f92f93fec918db05eb470f00077c9bcf1370c..e1f495e0a00ba65006b968d1b7890530c3728293 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -150,7 +150,7 @@ bool wxHtmlCell::ProcessMouseClick(wxHtmlWindowInterface *window,
                                    const wxPoint& pos,
                                    const wxMouseEvent& event)
 {
                                    const wxPoint& pos,
                                    const wxMouseEvent& event)
 {

-    wxCHECK_MSG( window, false, _T("window interface must be provided") );
+    wxCHECK_MSG( window, false, wxT("window interface must be provided") );

 
 #if WXWIN_COMPATIBILITY_2_6
     // NB: this hack puts the body of ProcessMouseClick() into OnMouseClick()
 
 #if WXWIN_COMPATIBILITY_2_6
     // NB: this hack puts the body of ProcessMouseClick() into OnMouseClick()


@@ -164,7 +164,7 @@ bool wxHtmlCell::ProcessMouseClick(wxHtmlWindowInterface *window,
 
 void wxHtmlCell::OnMouseClick(wxWindow *, int, int, const wxMouseEvent& event)
 {
 
 void wxHtmlCell::OnMouseClick(wxWindow *, int, int, const wxMouseEvent& event)
 {

-    wxCHECK_RET( gs_helperOnMouseClick, _T("unexpected call to OnMouseClick") );
+    wxCHECK_RET( gs_helperOnMouseClick, wxT("unexpected call to OnMouseClick") );

     wxHtmlWindowInterface *window = gs_helperOnMouseClick->window;
     const wxPoint& pos = gs_helperOnMouseClick->pos;
 #endif // WXWIN_COMPATIBILITY_2_6
     wxHtmlWindowInterface *window = gs_helperOnMouseClick->window;
     const wxPoint& pos = gs_helperOnMouseClick->pos;
 #endif // WXWIN_COMPATIBILITY_2_6


@@ -237,8 +237,7 @@ bool wxHtmlCell::AdjustPagebreak(int *pagebreak,
 
 void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link)
 {
 
 void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link)
 {

-    if (m_Link) delete m_Link;
-    m_Link = NULL;
+    wxDELETE(m_Link);

     if (link.GetHref() != wxEmptyString)
         m_Link = new wxHtmlLinkInfo(link);
 }
     if (link.GetHref() != wxEmptyString)
         m_Link = new wxHtmlLinkInfo(link);
 }


@@ -342,7 +341,7 @@ bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const
         }
     }
 
         }
     }
 

-    wxFAIL_MSG(_T("Cells are in different trees"));
+    wxFAIL_MSG(wxT("Cells are in different trees"));

     return false;
 }
 
     return false;
 }
 


@@ -1126,7 +1125,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
 
     if (m_Border == 1)
     {
 
     if (m_Border == 1)
     {

-        // draw thin border using lines 
+        // draw thin border using lines

         wxPen mypen1(m_BorderColour1, 1, wxPENSTYLE_SOLID);
         wxPen mypen2(m_BorderColour2, 1, wxPENSTYLE_SOLID);
 
         wxPen mypen1(m_BorderColour1, 1, wxPENSTYLE_SOLID);
         wxPen mypen2(m_BorderColour2, 1, wxPENSTYLE_SOLID);
 


@@ -1138,10 +1137,10 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
         dc.DrawLine(xlocal, ylocal + m_Height - 1, xlocal + m_Width, ylocal + m_Height - 1);
     }
     else if (m_Border> 0)
         dc.DrawLine(xlocal, ylocal + m_Height - 1, xlocal + m_Width, ylocal + m_Height - 1);
     }
     else if (m_Border> 0)

-    {     
+    {

         wxBrush mybrush1(m_BorderColour1, wxBRUSHSTYLE_SOLID);
         wxBrush mybrush2(m_BorderColour2, wxBRUSHSTYLE_SOLID);
         wxBrush mybrush1(m_BorderColour1, wxBRUSHSTYLE_SOLID);
         wxBrush mybrush2(m_BorderColour2, wxBRUSHSTYLE_SOLID);

-        
+

         // draw upper left corner
         // 0---------------5
         // |              /
         // draw upper left corner
         // 0---------------5
         // |              /


@@ -1149,7 +1148,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
         // | |
         // | 2
         // |/
         // | |
         // | 2
         // |/

-        // 1 
+        // 1

 
         wxPoint poly[6];
         poly[0].x =m_PosX; poly[0].y = m_PosY ;
 
         wxPoint poly[6];
         poly[0].x =m_PosX; poly[0].y = m_PosY ;


@@ -1162,7 +1161,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
         dc.SetBrush(mybrush1);
         dc.SetPen(*wxTRANSPARENT_PEN);
         dc.DrawPolygon(6, poly, x, y);
         dc.SetBrush(mybrush1);
         dc.SetPen(*wxTRANSPARENT_PEN);
         dc.DrawPolygon(6, poly, x, y);

-        
+

         // draw lower right corner reusing point 1,2,4 and 5
         //                 5
         //                /|
         // draw lower right corner reusing point 1,2,4 and 5
         //                 5
         //                /|


@@ -1176,11 +1175,11 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
         poly[3].x = poly[4].x; poly[3].y = poly[2].y;
         dc.DrawPolygon(6, poly, x, y);
 
         poly[3].x = poly[4].x; poly[3].y = poly[2].y;
         dc.DrawPolygon(6, poly, x, y);
 

-        // smooth color transition like firefox 
+        // smooth color transition like firefox

         wxColour borderMediumColour(
             (m_BorderColour1.Red() + m_BorderColour2.Red()) /2 ,
             (m_BorderColour1.Green() + m_BorderColour2.Green()) /2 ,
         wxColour borderMediumColour(
             (m_BorderColour1.Red() + m_BorderColour2.Red()) /2 ,
             (m_BorderColour1.Green() + m_BorderColour2.Green()) /2 ,

-            (m_BorderColour1.Blue() + m_BorderColour2.Blue()) /2 
+            (m_BorderColour1.Blue() + m_BorderColour2.Blue()) /2

             );
         wxPen mypen3(borderMediumColour, 1, wxPENSTYLE_SOLID);
         dc.SetPen(mypen3);
             );
         wxPen mypen3(borderMediumColour, 1, wxPENSTYLE_SOLID);
         dc.SetPen(mypen3);


@@ -1392,7 +1391,7 @@ bool wxHtmlContainerCell::ProcessMouseClick(wxHtmlWindowInterface *window,
 void wxHtmlContainerCell::OnMouseClick(wxWindow*,
                                        int, int, const wxMouseEvent& event)
 {
 void wxHtmlContainerCell::OnMouseClick(wxWindow*,
                                        int, int, const wxMouseEvent& event)
 {

-    wxCHECK_RET( gs_helperOnMouseClick, _T("unexpected call to OnMouseClick") );
+    wxCHECK_RET( gs_helperOnMouseClick, wxT("unexpected call to OnMouseClick") );

     wxHtmlWindowInterface *window = gs_helperOnMouseClick->window;
     const wxPoint& pos = gs_helperOnMouseClick->pos;
 #endif // WXWIN_COMPATIBILITY_2_6
     wxHtmlWindowInterface *window = gs_helperOnMouseClick->window;
     const wxPoint& pos = gs_helperOnMouseClick->pos;
 #endif // WXWIN_COMPATIBILITY_2_6


@@ -1639,7 +1638,7 @@ void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc),
     wxScrolledWindow *scrolwin =
         wxDynamicCast(m_Wnd->GetParent(), wxScrolledWindow);
     wxCHECK_RET( scrolwin,
     wxScrolledWindow *scrolwin =
         wxDynamicCast(m_Wnd->GetParent(), wxScrolledWindow);
     wxCHECK_RET( scrolwin,

-                 _T("widget cells can only be placed in wxHtmlWindow") );
+                 wxT("widget cells can only be placed in wxHtmlWindow") );

 
     scrolwin->GetViewStart(&stx, &sty);
     m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx,
 
     scrolwin->GetViewStart(&stx, &sty);
     m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx,