Don't infinitely recurse when setting the child focus. Without

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

diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h
index dde8cbf7ca5393be4f2b065feb5810d24c9524b6..9e5bf64c5b1dc49b753b104ccd4938a186058ebb 100644 (file)
--- a/include/wx/vlbox.h
+++ b/include/wx/vlbox.h
@@ -92,6 +92,9 @@ public:
 
     // is this item the current one?
     bool IsCurrent(size_t item) const { return item == (size_t)m_current; }
 
     // is this item the current one?
     bool IsCurrent(size_t item) const { return item == (size_t)m_current; }

+    #ifdef __WXUNIVERSAL__
+    bool IsCurrent() const { return wxVScrolledWindow::IsCurrent(); }
+    #endif

 
     // is this item selected?
     bool IsSelected(size_t item) const;
 
     // is this item selected?
     bool IsSelected(size_t item) const;


@@ -186,6 +189,10 @@ public:
     void SetSelectionBackground(const wxColour& col);
 
 
     void SetSelectionBackground(const wxColour& col);
 
 

+    virtual void ApplyParentThemeBackground(const wxColour& WXUNUSED(bg))
+        { /* do nothing */ }
+
+    

 protected:
     // the derived class must implement this function to actually draw the item
     // with the given index on the provided DC
 protected:
     // the derived class must implement this function to actually draw the item
     // with the given index on the provided DC