Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/html/htmlcell.h b/interface/wx/html/htmlcell.h
index 38c7223b321914b48781cd7035057d5c2ff7ef62..ece319d281be35a4038334ce25cc5b7392cca745 100644 (file)
--- a/interface/wx/html/htmlcell.h
+++ b/interface/wx/html/htmlcell.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxHtml*Cell
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxHtml*Cell
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -245,9 +245,11 @@ public:
     int GetWidth() const;
 
     /**
     int GetWidth() const;
 
     /**

+        Layouts the cell.
+

         This method performs two actions:
         -# adjusts the cell's width according to the fact that maximal possible
         This method performs two actions:
         -# adjusts the cell's width according to the fact that maximal possible

-           width is @e w. (this has sense when working with horizontal lines, tables etc.)
+           width is @e w (this has sense when working with horizontal lines, tables etc.)

         -# prepares layout (=fill-in m_PosX, m_PosY (and sometimes m_Height) members)
            based on actual width @e w
 
         -# prepares layout (=fill-in m_PosX, m_PosY (and sometimes m_Height) members)
            based on actual width @e w
 


@@ -260,7 +262,7 @@ public:
         This function is simple event handler.
         Each time the user clicks mouse button over a cell within wxHtmlWindow
         this method of that cell is called.
         This function is simple event handler.
         Each time the user clicks mouse button over a cell within wxHtmlWindow
         this method of that cell is called.

-        Default behavior is to call wxHtmlWindow::LoadPage.
+        Default behaviour is to call wxHtmlWindow::LoadPage.

 
         @param window
             interface to the parent HTML window
 
         @param window
             interface to the parent HTML window


@@ -411,8 +413,10 @@ public:
             Colour of top and left lines
         @param clr2
             Colour of bottom and right lines
             Colour of top and left lines
         @param clr2
             Colour of bottom and right lines

+        @param border
+            Size of the border in pixels

     */
     */

-    void SetBorder(const wxColour& clr1, const wxColour& clr2);
+    void SetBorder(const wxColour& clr1, const wxColour& clr2, int border = 1);

 
     /**
         Sets the indentation (free space between borders of container and subcells).
 
     /**
         Sets the indentation (free space between borders of container and subcells).