More work on getting wxLisBox events right

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

diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h
index 72c6170bc2aeb215c72a2311ee27e5d87bd8c4c0..c6235d98b57ece587257822b4e99b2a411266d99 100644 (file)
--- a/include/wx/vlbox.h
+++ b/include/wx/vlbox.h
@@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxSelectionStore;
     It emits the same events as wxListBox and the same event macros may be used
     with it.
  */
     It emits the same events as wxListBox and the same event macros may be used
     with it.
  */

-class WXDLLEXPORT wxVListBox : public wxVScrolledWindow
+class WXDLLIMPEXP_CORE wxVListBox : public wxVScrolledWindow

 {
 public:
     // constructors and such
 {
 public:
     // constructors and such


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

-       virtual wxBorder GetDefaultBorder() const { return GetDefaultBorderForControl(); }
+    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
 
     // the derived class must implement this function to actually draw the item
     // with the given index on the provided DC


@@ -269,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
     //