Better fix

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

diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h
index ac1d0286da2cb63d0fa4ae46be1089b67dc28289..aa894553e5b8a35f1df232312684d00691794323 100644 (file)
--- a/include/wx/vlbox.h
+++ b/include/wx/vlbox.h
@@ -15,7 +15,7 @@
 #include "wx/vscroll.h"         // base class
 #include "wx/bitmap.h"
 
 #include "wx/vscroll.h"         // base class
 #include "wx/bitmap.h"
 

-class WXDLLEXPORT wxSelectionStore;
+class WXDLLIMPEXP_FWD_CORE wxSelectionStore;

 
 #define wxVListBoxNameStr _T("wxVListBox")
 
 
 #define wxVListBoxNameStr _T("wxVListBox")
 


@@ -75,7 +75,7 @@ public:
     // ---------
 
     // get the number of items in the control
     // ---------
 
     // get the number of items in the control

-    size_t GetItemCount() const { return GetLineCount(); }
+    size_t GetItemCount() const { return GetRowCount(); }

 
     // does this control use multiple selection?
     bool HasMultipleSelection() const { return m_selStore != NULL; }
 
     // does this control use multiple selection?
     bool HasMultipleSelection() const { return m_selStore != NULL; }


@@ -133,7 +133,7 @@ public:
 
     // set the number of items to be shown in the control
     //
 
     // set the number of items to be shown in the control
     //

-    // this is just a synonym for wxVScrolledWindow::SetLineCount()
+    // this is just a synonym for wxVScrolledWindow::SetRowCount()

     virtual void SetItemCount(size_t count);
 
     // delete all items from the control
     virtual void SetItemCount(size_t count);
 
     // delete all items from the control


@@ -189,6 +189,9 @@ public:
     // change the background colour of the selected cells
     void SetSelectionBackground(const wxColour& col);
 
     // change the background colour of the selected cells
     void SetSelectionBackground(const wxColour& col);
 

+    // refreshes only the selected items
+    void RefreshSelected();
+

 
     virtual wxVisualAttributes GetDefaultAttributes() const
     {
 
     virtual wxVisualAttributes GetDefaultAttributes() const
     {


@@ -199,6 +202,8 @@ public:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 protected:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_THEME; }
+

     // the derived class must implement this function to actually draw the item
     // with the given index on the provided DC
     virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const = 0;
     // the derived class must implement this function to actually draw the item
     // with the given index on the provided DC
     virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const = 0;


@@ -223,11 +228,11 @@ protected:
     // current
     virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const;
 
     // current
     virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const;
 

-    // we implement OnGetLineHeight() in terms of OnMeasureItem() because this
+    // we implement OnGetRowHeight() in terms of OnMeasureItem() because this

     // allows us to add borders to the items easily
     //
     // this function is not supposed to be overridden by the derived classes
     // allows us to add borders to the items easily
     //
     // this function is not supposed to be overridden by the derived classes

-    virtual wxCoord OnGetLineHeight(size_t line) const;
+    virtual wxCoord OnGetRowHeight(size_t line) const;

 
 
     // event handlers
 
 
     // event handlers


@@ -235,7 +240,7 @@ protected:
     void OnKeyDown(wxKeyEvent& event);
     void OnLeftDown(wxMouseEvent& event);
     void OnLeftDClick(wxMouseEvent& event);
     void OnKeyDown(wxKeyEvent& event);
     void OnLeftDown(wxMouseEvent& event);
     void OnLeftDClick(wxMouseEvent& event);

-
+    void OnSetOrKillFocus(wxFocusEvent& event);

 
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();


@@ -264,6 +269,14 @@ protected:
     // common part of keyboard and mouse handling processing code
     void DoHandleItemClick(int item, int flags);
 
     // common part of keyboard and mouse handling processing code
     void DoHandleItemClick(int item, int flags);
 

+    // paint the background of the given item using the provided colour if it's
+    // valid, otherwise just return false and do nothing (this is used by
+    // OnDrawBackground())
+    bool DoDrawSolidBackground(const wxColour& col,
+                               wxDC& dc,
+                               const wxRect& rect,
+                               size_t n) const;
+

 private:
     // the current item or wxNOT_FOUND
     //
 private:
     // the current item or wxNOT_FOUND
     //