automated ifacecheck fixes

[wxWidgets.git] / interface / wx / vlbox.h

diff --git a/interface/wx/vlbox.h b/interface/wx/vlbox.h
index 2f7ae80506d829425421e583ae991d5cd28b24b1..e1f9ee59042eb257868d5618c179617ea1e52b91 100644 (file)
--- a/interface/wx/vlbox.h
+++ b/interface/wx/vlbox.h
@@ -30,7 +30,7 @@
 
     @library{wxcore}
     @category{ctrl}
 
     @library{wxcore}
     @category{ctrl}

-    <!-- @appearance{vlistbox.png} -->
+    @appearance{vlistbox.png}

 
     @see wxSimpleHtmlListBox, wxHtmlListBox
 */
 
     @see wxSimpleHtmlListBox, wxHtmlListBox
 */


@@ -125,6 +125,15 @@ public:
     */
     wxPoint GetMargins() const;
 
     */
     wxPoint GetMargins() const;
 

+    /**
+        Returns the rectangle occupied by this item in physical coordinates.
+
+        If the item is not currently visible, returns an empty rectangle.
+
+        @since 2.9.0
+     */
+    wxRect GetItemRect(size_t item) const;
+

     /**
         Returns the index of the next selected item or @c wxNOT_FOUND if there
         are no more.
     /**
         Returns the index of the next selected item or @c wxNOT_FOUND if there
         are no more.


@@ -192,23 +201,7 @@ public:
 
         @todo Change this function signature to non-const.
     */
 
         @todo Change this function signature to non-const.
     */

-    void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const;
-
-    /**
-        The derived class must implement this function to actually draw the
-        item with the given index on the provided DC.
-
-        @param dc
-            The device context to use for drawing.
-        @param rect
-            The bounding rectangle for the item being drawn (DC clipping
-            region is set to this rectangle before calling this function).
-        @param n
-            The index of the item to be drawn.
-
-        @todo Change this function signature to non-const.
-    */
-    virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const;
+    virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const;

 
     /**
         This method may be used to draw separators between the lines. The
 
     /**
         This method may be used to draw separators between the lines. The


@@ -228,12 +221,6 @@ public:
     */
     virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const;
 
     */
     virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const;
 

-    /**
-        The derived class must implement this method to return the height of
-        the specified item (in pixels).
-    */
-    virtual wxCoord OnMeasureItem(size_t n) const;
-

     /**
         Selects or deselects the specified item which must be valid (i.e. not
         equal to @c wxNOT_FOUND).
     /**
         Selects or deselects the specified item which must be valid (i.e. not
         equal to @c wxNOT_FOUND).


@@ -277,7 +264,7 @@ public:
 
         This is just a synonym for wxVScrolledWindow::SetRowCount().
     */
 
         This is just a synonym for wxVScrolledWindow::SetRowCount().
     */

-    void SetItemCount(size_t count);
+    virtual void SetItemCount(size_t count);

 
     //@{
     /**
 
     //@{
     /**


@@ -323,5 +310,29 @@ public:
         @see Select()
     */
     void Toggle(size_t item);
         @see Select()
     */
     void Toggle(size_t item);

+
+protected:
+
+    /**
+        The derived class must implement this function to actually draw the
+        item with the given index on the provided DC.
+
+        @param dc
+            The device context to use for drawing.
+        @param rect
+            The bounding rectangle for the item being drawn (DC clipping
+            region is set to this rectangle before calling this function).
+        @param n
+            The index of the item to be drawn.
+
+        @todo Change this function signature to non-const.
+    */
+    virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const = 0;
+
+    /**
+        The derived class must implement this method to return the height of
+        the specified item (in pixels).
+    */
+    virtual wxCoord OnMeasureItem(size_t n) const = 0;

 };
 
 };