Watford C++ related changes. Unfortunately, the linker now gives a GPF.

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

diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 7d725e29e170db30f2dcb59f560e5cb609de89f9..72f78c844b5f4a2cad1ff377ae07d79b932d43fa 100644 (file)
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -24,6 +24,8 @@
 #include "wx/html/htmldefs.h"
 #include "wx/window.h"
 
 #include "wx/html/htmldefs.h"
 #include "wx/window.h"
 

+
+class wxHtmlLinkInfo;

 class wxHtmlCell;
 class wxHtmlContainerCell;
 
 class wxHtmlCell;
 class wxHtmlContainerCell;
 


@@ -38,8 +40,8 @@ class wxHtmlContainerCell;
 class WXDLLEXPORT wxHtmlCell : public wxObject
 {
     public:
 class WXDLLEXPORT wxHtmlCell : public wxObject
 {
     public:

-        wxHtmlCell() : wxObject() {m_Next = NULL; m_Parent = NULL; m_Width = m_Height = m_Descent = 0;};
-        virtual ~wxHtmlCell() {if (m_Next) delete m_Next;};
+        wxHtmlCell();
+        virtual ~wxHtmlCell();

 
         void SetParent(wxHtmlContainerCell *p) {m_Parent = p;}
         wxHtmlContainerCell *GetParent() const {return m_Parent;}
 
         void SetParent(wxHtmlContainerCell *p) {m_Parent = p;}
         wxHtmlContainerCell *GetParent() const {return m_Parent;}


@@ -49,7 +51,7 @@ class WXDLLEXPORT wxHtmlCell : public wxObject
         int GetWidth() const {return m_Width;}
         int GetHeight() const {return m_Height;}
         int GetDescent() const {return m_Descent;}
         int GetWidth() const {return m_Width;}
         int GetHeight() const {return m_Height;}
         int GetDescent() const {return m_Descent;}

-        virtual wxString GetLink(int WXUNUSED(x) = 0,
+        virtual wxHtmlLinkInfo* GetLink(int WXUNUSED(x) = 0,

                                  int WXUNUSED(y) = 0) const
             { return m_Link; }
                 // returns the link associated with this cell. The position is position within
                                  int WXUNUSED(y) = 0) const
             { return m_Link; }
                 // returns the link associated with this cell. The position is position within


@@ -58,7 +60,7 @@ class WXDLLEXPORT wxHtmlCell : public wxObject
                 // members access methods
 
         virtual void SetPos(int x, int y) {m_PosX = x, m_PosY = y;}
                 // members access methods
 
         virtual void SetPos(int x, int y) {m_PosX = x, m_PosY = y;}

-        void SetLink(const wxString& link) {m_Link = link;}
+        void SetLink(const wxHtmlLinkInfo& link);

         void SetNext(wxHtmlCell *cell) {m_Next = cell;}
                 // members writin methods
 
         void SetNext(wxHtmlCell *cell) {m_Next = cell;}
                 // members writin methods
 


@@ -84,7 +86,7 @@ class WXDLLEXPORT wxHtmlCell : public wxObject
                 // Condition is unique condition identifier (see htmldefs.h)
                 // (user-defined condition IDs should start from 10000)
                 // and param is optional parameter
                 // 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(HTML_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, bool left, bool middle, bool right);
                 //   returns pointer to anchor news
 
         virtual void OnMouseClick(wxWindow *parent, int x, int y, bool left, bool middle, bool right);


@@ -94,6 +96,20 @@ class WXDLLEXPORT wxHtmlCell : public wxObject
                 // Parent is pointer to wxHtmlWindow that generated the event
                 // HINT: if this handling is not enough for you you should use
                 //       wxHtmlBinderCell
                 // Parent is pointer to wxHtmlWindow that generated the event
                 // HINT: if this handling is not enough for you you should use
                 //       wxHtmlBinderCell

+                
+        virtual bool AdjustPagebreak(int *pagebreak);
+                // This method used to adjust pagebreak position. The parameter is
+                // variable that contains y-coordinate of page break (= horizontal line that
+                // should not be crossed by words, images etc.). If this cell cannot be divided
+                // into two pieces (each one on another page) then it moves the pagebreak
+                // few pixels up.
+                //
+                // Returned value : true if pagebreak was modified, false otherwise
+                // Usage : while (container->AdjustPagebreak(&p)) {}
+                
+        void SetCanLiveOnPagebreak(bool can) {m_CanLiveOnPagebreak = can;}
+                // Sets cell's behaviour on pagebreaks (see AdjustPagebreak). Default
+                // is true - the cell can be split on two pages

 
 
     protected:
 
 
     protected:


@@ -106,8 +122,10 @@ class WXDLLEXPORT wxHtmlCell : public wxObject
                 // m_Descent is used to position text&images..
         long m_PosX, m_PosY;
                 // position where the fragment is drawn
                 // m_Descent is used to position text&images..
         long m_PosX, m_PosY;
                 // position where the fragment is drawn

-        wxString m_Link;
+        wxHtmlLinkInfo *m_Link;

                 // destination address if this fragment is hypertext link, "" otherwise
                 // destination address if this fragment is hypertext link, "" otherwise

+        bool m_CanLiveOnPagebreak;
+                // true if this cell can be placed on pagebreak, false otherwise

 
 };
 
 
 };
 


@@ -175,6 +193,7 @@ class WXDLLEXPORT wxHtmlContainerCell : public wxHtmlCell
         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);
         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 bool AdjustPagebreak(int *pagebreak);

 
         void InsertCell(wxHtmlCell *cell);
                 // insert cell at the end of m_Cells list
 
         void InsertCell(wxHtmlCell *cell);
                 // insert cell at the end of m_Cells list


@@ -183,21 +202,21 @@ class WXDLLEXPORT wxHtmlContainerCell : public wxHtmlCell
         void SetAlignVer(int al) {m_AlignVer = al;}
                 // sets horizontal/vertical alignment
         int GetAlignVer() const {return m_AlignVer;}
         void SetAlignVer(int al) {m_AlignVer = al;}
                 // sets horizontal/vertical alignment
         int GetAlignVer() const {return m_AlignVer;}

-        void SetIndent(int i, int what, int units = HTML_UNITS_PIXELS);
-                // sets left-border indentation. units is one of HTML_UNITS_* constants
-                // what is combination of HTML_INDENT_*
+        void SetIndent(int i, int what, int units = wxHTML_UNITS_PIXELS);
+                // sets left-border indentation. units is one of wxHTML_UNITS_* constants
+                // what is combination of wxHTML_INDENT_*

         int GetIndent(int ind) const;
         int GetIndent(int ind) const;

-                // returns the indentation. ind is one of HTML_INDENT_* constants
+                // returns the indentation. ind is one of wxHTML_INDENT_* constants

         int GetIndentUnits(int ind) const;
                 // returns type of value returned by GetIndent(ind)
         void SetAlign(const wxHtmlTag& tag);
                 // sets alignment info based on given tag's params
         void SetWidthFloat(int w, int units) {m_WidthFloat = w; m_WidthFloatUnits = units;}
         int GetIndentUnits(int ind) const;
                 // returns type of value returned by GetIndent(ind)
         void SetAlign(const wxHtmlTag& tag);
                 // sets alignment info based on given tag's params
         void SetWidthFloat(int w, int units) {m_WidthFloat = w; m_WidthFloatUnits = units;}

-        void SetWidthFloat(const wxHtmlTag& tag);
+        void SetWidthFloat(const wxHtmlTag& tag, double pixel_scale = 1.0);

                 // sets floating width adjustment
                 // (examples : 32 percent of parent container,
                 // -15 pixels percent (this means 100 % - 15 pixels)
                 // sets floating width adjustment
                 // (examples : 32 percent of parent container,
                 // -15 pixels percent (this means 100 % - 15 pixels)

-        void SetMinHeight(int h, int align = HTML_ALIGN_TOP) {m_MinHeight = h; m_MinHeightAlign = align;}
+        void SetMinHeight(int h, int align = wxHTML_ALIGN_TOP) {m_MinHeight = h; m_MinHeightAlign = align;}

                 // sets minimal height of this container.
         int GetMaxLineWidth() const {return m_MaxLineWidth;}
             // returns maximal line width in this container.
                 // sets minimal height of this container.
         int GetMaxLineWidth() const {return m_MaxLineWidth;}
             // returns maximal line width in this container.


@@ -205,7 +224,7 @@ class WXDLLEXPORT wxHtmlContainerCell : public wxHtmlCell
             // 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;}
             // 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 wxString GetLink(int x = 0, int y = 0) const;
+        virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const;

         virtual const wxHtmlCell* Find(int condition, const void* param) const;
         virtual void OnMouseClick(wxWindow *parent, int x, int y, bool left, bool middle, bool right);
 
         virtual const wxHtmlCell* Find(int condition, const void* param) const;
         virtual void OnMouseClick(wxWindow *parent, int x, int y, bool left, bool middle, bool right);
 


@@ -228,7 +247,7 @@ class WXDLLEXPORT wxHtmlColourCell : public wxHtmlCell
         wxColour m_Colour;
         unsigned m_Flags;
 
         wxColour m_Colour;
         unsigned m_Flags;
 

-        wxHtmlColourCell(wxColour clr, int flags = HTML_CLR_FOREGROUND) : wxHtmlCell() {m_Colour = clr; m_Flags = flags;}
+        wxHtmlColourCell(wxColour clr, int flags = wxHTML_CLR_FOREGROUND) : wxHtmlCell() {m_Colour = clr; m_Flags = flags;}

         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 Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
         virtual void DrawInvisible(wxDC& dc, int x, int y);
 };


@@ -244,9 +263,9 @@ class WXDLLEXPORT wxHtmlColourCell : public wxHtmlCell
 class WXDLLEXPORT wxHtmlFontCell : public wxHtmlCell
 {
     public:
 class WXDLLEXPORT wxHtmlFontCell : public wxHtmlCell
 {
     public:

-        wxFont *m_Font;
+        wxFont m_Font;

 
 

-        wxHtmlFontCell(wxFont *font) : wxHtmlCell() {m_Font = font;};
+        wxHtmlFontCell(wxFont *font) : wxHtmlCell() { m_Font = (*font); }

         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 Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
         virtual void DrawInvisible(wxDC& dc, int x, int y);
 };


@@ -284,7 +303,34 @@ class WXDLLEXPORT wxHtmlWidgetCell : public wxHtmlCell
 
 
 
 
 
 

-#endif
+//--------------------------------------------------------------------------------
+// wxHtmlLinkInfo
+//                  Internal data structure. It represents hypertext link
+//--------------------------------------------------------------------------------
+
+class wxHtmlLinkInfo : public wxObject
+{
+    public:
+        wxHtmlLinkInfo() : wxObject()
+                { m_Href = m_Target = wxEmptyString; }
+        wxHtmlLinkInfo(const wxString& href, const wxString& target = wxEmptyString) : wxObject()
+                { m_Href = href; m_Target = target; }    
+        wxHtmlLinkInfo(const wxHtmlLinkInfo& l) 
+                { m_Href = l.m_Href, m_Target = l.m_Target; }
+        wxHtmlLinkInfo& operator=(const wxHtmlLinkInfo& l) 
+                { m_Href = l.m_Href, m_Target = l.m_Target; return *this; }
+
+        wxString GetHref() const { return m_Href; }
+        wxString GetTarget() const { return m_Target; }
+        
+    private:
+        wxString m_Href, m_Target;
+};
+
+
+
+
+#endif // wxUSE_HTML

 
 #endif // _WX_HTMLCELL_H_
 
 
 #endif // _WX_HTMLCELL_H_