support for using DIBs for wxBitmap implementation (patch 649866)

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

diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 8de135b8f2c53dc697187d6558c05c48bba29de7..eb2b4bee51822affad6dc98953ba91116c014cf4 100644 (file)
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HTMLCELL_H_
 #define _WX_HTMLCELL_H_
 
 #ifndef _WX_HTMLCELL_H_
 #define _WX_HTMLCELL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "htmlcell.h"
 #endif
 
 #pragma interface "htmlcell.h"
 #endif
 


@@ -51,7 +51,7 @@ public:
     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;}

-    
+

     const wxString& GetId() const { return m_id; }
     void SetId(const wxString& id) { m_id = id; }
 
     const wxString& GetId() const { return m_id; }
     void SetId(const wxString& id) { m_id = id; }
 


@@ -97,7 +97,7 @@ public:
     //
     // Parent is pointer to wxHtmlWindow that generated the event
     // HINT: if this handling is not enough for you you should use
     //
     // Parent is pointer to wxHtmlWindow that generated the event
     // HINT: if this handling is not enough for you you should use

-    //       wxHtmlBinderCell
+    //       wxHtmlWidgetCell

     virtual void OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event);
 
     // This method used to adjust pagebreak position. The parameter is
     virtual void OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event);
 
     // This method used to adjust pagebreak position. The parameter is


@@ -114,7 +114,7 @@ public:
     // is true - the cell can be split on two pages
     void SetCanLiveOnPagebreak(bool can) { m_CanLiveOnPagebreak = can; }
 
     // is true - the cell can be split on two pages
     void SetCanLiveOnPagebreak(bool can) { m_CanLiveOnPagebreak = can; }
 

-    // Returns y-coordinates that contraint the cell, i.e. left is highest 
+    // 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!
     // 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!


@@ -219,6 +219,9 @@ public:
     void SetMinHeight(int h, int align = wxHTML_ALIGN_TOP) {m_MinHeight = h; m_MinHeightAlign = align; m_LastLayout = -1;}
 
     void SetBackgroundColour(const wxColour& clr) {m_UseBkColour = TRUE; m_BkColour = clr;}
     void SetMinHeight(int h, int align = wxHTML_ALIGN_TOP) {m_MinHeight = h; m_MinHeightAlign = align; m_LastLayout = -1;}
 
     void SetBackgroundColour(const wxColour& clr) {m_UseBkColour = TRUE; m_BkColour = clr;}

+    // returns background colour (of wxNullColour if none set), so that widgets can
+    // adapt to it:
+    wxColour GetBackgroundColour();

     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;
     virtual const wxHtmlCell* Find(int condition, const void* param) const;
     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;
     virtual const wxHtmlCell* Find(int condition, const void* param) const;


@@ -229,7 +232,7 @@ public:
     wxHtmlCell* GetFirstCell() const {return m_Cells;}
 
     // see comment in wxHtmlCell about this method
     wxHtmlCell* GetFirstCell() const {return m_Cells;}
 
     // see comment in wxHtmlCell about this method

-    virtual bool IsTerminalCell() const { return false; }
+    virtual bool IsTerminalCell() const { return FALSE; }

 
     virtual wxHtmlCell *FindCellByPos(wxCoord x, wxCoord y) const;
 
 
     virtual wxHtmlCell *FindCellByPos(wxCoord x, wxCoord y) const;