SendSizeEvent() method moved from wxWindow to wxFrame, as that is the only place...

[wxWidgets.git] / include / wx / html / htmlcell.h

diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index b99ca14a96e49bb45148070c31492722c23bd74e..ef3c6952a88e0779710e99d9cbba8ba37df92377 100644 (file)
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -64,29 +64,29 @@ class WXDLLEXPORT wxHtmlCell : public wxObject
         void SetNext(wxHtmlCell *cell) {m_Next = cell;}
                 // members writin methods
 
         void SetNext(wxHtmlCell *cell) {m_Next = cell;}
                 // members writin methods
 

-        virtual void Layout(int w) {SetPos(0, 0); if (m_Next) m_Next -> Layout(w);};
+        virtual void Layout(int w);

                 // 1. adjust cell's width according to the fact that maximal possible width is w.
                 //    (this has sense when working with horizontal lines, tables etc.)
                 // 2. prepare layout (=fill-in m_PosX, m_PosY (and sometime m_Height) members)
                 //    = place items to fit window, according to the width w
 
                 // 1. adjust cell's width according to the fact that maximal possible width is w.
                 //    (this has sense when working with horizontal lines, tables etc.)
                 // 2. prepare layout (=fill-in m_PosX, m_PosY (and sometime m_Height) members)
                 //    = place items to fit window, according to the width w
 

-        virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) {if (m_Next) m_Next -> Draw(dc, x, y, view_y1, view_y2);}
+        virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);

                 // renders the cell
 
                 // renders the cell
 

-        virtual void DrawInvisible(wxDC& dc, int x, int y) {if (m_Next) m_Next -> DrawInvisible(dc, x, y);};
+        virtual void DrawInvisible(wxDC& dc, int x, int y);

                 // proceed drawing actions in case the cell is not visible (scrolled out of screen).
                 // This is needed to change fonts, colors and so on
 
                 // proceed drawing actions in case the cell is not visible (scrolled out of screen).
                 // This is needed to change fonts, colors and so on
 

-        virtual const wxHtmlCell* Find(int condition, const void* param) const {if (m_Next) return m_Next -> Find(condition, param); else return NULL;}
+        virtual const wxHtmlCell* Find(int condition, const void* param) const;

                 // This method returns pointer to the FIRST cell for that
                 // the condition
                 // is true. It first checks if the condition is true for this
                 // This method returns pointer to the FIRST cell for that
                 // the condition
                 // is true. It first checks if the condition is true for this

-                // cell and then calls m_Next -> Find(). (Note: it checks
+                // cell and then calls m_Next->Find(). (Note: it checks

                 // all subcells if the cell is container)
                 // Condition is unique condition identifier (see htmldefs.h)
                 // (user-defined condition IDs should start from 10000)
                 // and param is optional parameter
                 // all subcells if the cell is container)
                 // Condition is unique condition identifier (see htmldefs.h)
                 // (user-defined condition IDs should start from 10000)
                 // and param is optional parameter

-                // Example : m_Cell -> Find(wxHTML_COND_ISANCHOR, "news");
+                // Example : m_Cell->Find(wxHTML_COND_ISANCHOR, "news");

                 //   returns pointer to anchor news
 
         virtual void OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event);
                 //   returns pointer to anchor news
 
         virtual void OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event);


@@ -165,7 +165,7 @@ class WXDLLEXPORT wxHtmlContainerCell : public wxHtmlCell
 {
     public:
         wxHtmlContainerCell(wxHtmlContainerCell *parent);
 {
     public:
         wxHtmlContainerCell(wxHtmlContainerCell *parent);

-        ~wxHtmlContainerCell() {if (m_Cells) delete m_Cells;}
+        ~wxHtmlContainerCell();

 
         virtual void Layout(int w);
         virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
 
         virtual void Layout(int w);
         virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);


@@ -195,10 +195,6 @@ class WXDLLEXPORT wxHtmlContainerCell : public wxHtmlCell
                 // -15 pixels percent (this means 100 % - 15 pixels)
         void SetMinHeight(int h, int align = wxHTML_ALIGN_TOP) {m_MinHeight = h; m_MinHeightAlign = align; m_LastLayout = -1;}
                 // sets minimal height of this container.
                 // -15 pixels percent (this means 100 % - 15 pixels)
         void SetMinHeight(int h, int align = wxHTML_ALIGN_TOP) {m_MinHeight = h; m_MinHeightAlign = align; m_LastLayout = -1;}
                 // sets minimal height of this container.

-        int GetMaxLineWidth() const {return m_MaxLineWidth;}
-            // returns maximal line width in this container.
-            // Call to this method is valid only after calling
-            // Layout()

         void SetBackgroundColour(const wxColour& clr) {m_UseBkColour = TRUE; m_BkColour = clr;}
         void SetBorder(const wxColour& clr1, const wxColour& clr2) {m_UseBorder = TRUE; m_BorderColour1 = clr1, m_BorderColour2 = clr2;}
         virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const;
         void SetBackgroundColour(const wxColour& clr) {m_UseBkColour = TRUE; m_BkColour = clr;}
         void SetBorder(const wxColour& clr1, const wxColour& clr2) {m_UseBorder = TRUE; m_BorderColour1 = clr1, m_BorderColour2 = clr2;}
         virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const;


@@ -215,8 +211,6 @@ class WXDLLEXPORT wxHtmlContainerCell : public wxHtmlCell
                 // it m_Indent < 0 it is in PERCENTS, otherwise it is in pixels
         int m_MinHeight, m_MinHeightAlign;
             // minimal height.
                 // it m_Indent < 0 it is in PERCENTS, otherwise it is in pixels
         int m_MinHeight, m_MinHeightAlign;
             // minimal height.

-        int m_MaxLineWidth;
-            // maximal widht of line. Filled during Layout()

         wxHtmlCell *m_Cells, *m_LastCell;
                 // internal cells, m_Cells points to the first of them, m_LastCell to the last one.
                 // (LastCell is needed only to speed-up InsertCell)
         wxHtmlCell *m_Cells, *m_LastCell;
                 // internal cells, m_Cells points to the first of them, m_LastCell to the last one.
                 // (LastCell is needed only to speed-up InsertCell)


@@ -295,7 +289,7 @@ class WXDLLEXPORT wxHtmlWidgetCell : public wxHtmlCell
                 // if w != 0 then the m_Wnd has 'floating' width - it adjust
                 // it's width according to parent container's width
                 // (w is percent of parent's width)
                 // if w != 0 then the m_Wnd has 'floating' width - it adjust
                 // it's width according to parent container's width
                 // (w is percent of parent's width)

-        ~wxHtmlWidgetCell() {if (m_Wnd) m_Wnd -> Destroy(); }
+        ~wxHtmlWidgetCell() { m_Wnd->Destroy(); }

         virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
         virtual void DrawInvisible(wxDC& dc, int x, int y);
         virtual void Layout(int w);
         virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
         virtual void DrawInvisible(wxDC& dc, int x, int y);
         virtual void Layout(int w);


@@ -320,7 +314,7 @@ class WXDLLEXPORT wxHtmlLinkInfo : public wxObject
                 { m_Href = m_Target = wxEmptyString; m_Event = NULL, m_Cell = NULL; }
         wxHtmlLinkInfo(const wxString& href, const wxString& target = wxEmptyString) : wxObject()
                 { m_Href = href; m_Target = target; m_Event = NULL, m_Cell = NULL; }
                 { m_Href = m_Target = wxEmptyString; m_Event = NULL, m_Cell = NULL; }
         wxHtmlLinkInfo(const wxString& href, const wxString& target = wxEmptyString) : wxObject()
                 { m_Href = href; m_Target = target; m_Event = NULL, m_Cell = NULL; }

-        wxHtmlLinkInfo(const wxHtmlLinkInfo& l)
+        wxHtmlLinkInfo(const wxHtmlLinkInfo& l) : wxObject()

                 { m_Href = l.m_Href, m_Target = l.m_Target, m_Event = l.m_Event, m_Cell = l.m_Cell; }
         wxHtmlLinkInfo& operator=(const wxHtmlLinkInfo& l)
                 { m_Href = l.m_Href, m_Target = l.m_Target, m_Event = l.m_Event, m_Cell = l.m_Cell; return *this; }
                 { m_Href = l.m_Href, m_Target = l.m_Target, m_Event = l.m_Event, m_Cell = l.m_Cell; }
         wxHtmlLinkInfo& operator=(const wxHtmlLinkInfo& l)
                 { m_Href = l.m_Href, m_Target = l.m_Target, m_Event = l.m_Event, m_Cell = l.m_Cell; return *this; }