split wxBase into wxBase and wxNet libraries

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

diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 80f49c23e1479d34467fd74132a5623331d5f1bd..06a553cf2a2ff23838ff7f2cd4da04e0072fdc58 100644 (file)
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -259,12 +259,6 @@ public:
     virtual bool IsLinebreakAllowed() const
         { return !IsFormattingCell(); }
 
-    // Returns y-coordinates that contraint the cell, i.e. left is highest
-    // and right lowest coordinate such that the cell lays between then.
-    // Note: this method does not return meaningful values if you haven't
-    //       called Layout() before!
-    virtual void GetHorizontalConstraints(int *left, int *right) const;
-
     // Returns true for simple == terminal cells, i.e. not composite ones.
     // This if for internal usage only and may disappear in future versions!
     virtual bool IsTerminalCell() const { return TRUE; }
@@ -354,6 +348,8 @@ protected:
     
     wxString m_Word;
     bool     m_allowLinebreak;
+
+    DECLARE_NO_COPY_CLASS(wxHtmlWordCell)
 };
 
 
@@ -410,7 +406,6 @@ public:
     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, const wxMouseEvent& event);
-    virtual void GetHorizontalConstraints(int *left, int *right) const;
 
     virtual wxHtmlCell* GetFirstChild() const { return m_Cells; }
 #if WXWIN_COMPATIBILITY_2_4
@@ -425,6 +420,11 @@ public:
     
     virtual wxHtmlCell *GetFirstTerminal() const;
     virtual wxHtmlCell *GetLastTerminal() const;
+    
+    
+    // Removes indentation on top or bottom of the container (i.e. above or
+    // below first/last terminal cell). For internal use only.
+    void RemoveExtraSpacing(bool top, bool bottom);
 
 protected:
     void UpdateRenderingStatePre(wxHtmlRenderingInfo& info,
@@ -484,6 +484,8 @@ public:
 protected:
     wxColour m_Colour;
     unsigned m_Flags;
+
+    DECLARE_NO_COPY_CLASS(wxHtmlColourCell)
 };
 
 
@@ -505,6 +507,8 @@ public:
 
 protected:
     wxFont m_Font;
+
+    DECLARE_NO_COPY_CLASS(wxHtmlFontCell)
 };