renamed wxComboControl to wxComboCtrl and related wxUSE_XXX and configure switches...

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

diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h
index 6b30ac122e3938afe3acbc456c58aec8d4f27388..bc61c0d542268cc19f90aeda857ba4947323222d 100644 (file)
--- a/include/wx/vlbox.h
+++ b/include/wx/vlbox.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     31.05.03
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -13,6 +13,7 @@
 #define _WX_VLBOX_H_
 
 #include "wx/vscroll.h"         // base class
+#include "wx/bitmap.h"
 
 class WXDLLEXPORT wxSelectionStore;
 
@@ -92,6 +93,9 @@ public:
 
     // 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;
@@ -186,6 +190,14 @@ public:
     void SetSelectionBackground(const wxColour& col);
 
 
+    virtual wxVisualAttributes GetDefaultAttributes() const
+    {
+        return GetClassDefaultAttributes(GetWindowVariant());
+    }
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
 protected:
     // the derived class must implement this function to actually draw the item
     // with the given index on the provided DC
@@ -214,7 +226,7 @@ protected:
     // we implement OnGetLineHeight() in terms of OnMeasureItem() because this
     // allows us to add borders to the items easily
     //
-    // this function is not upposed to be overridden by the derived classes
+    // this function is not supposed to be overridden by the derived classes
     virtual wxCoord OnGetLineHeight(size_t line) const;
 
 
@@ -275,9 +287,12 @@ private:
     // the selection bg colour
     wxColour m_colBgSel;
 
+    // double buffer
+    wxBitmap* m_doubleBuffer;
 
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxVListBox)
+    DECLARE_ABSTRACT_CLASS(wxVListBox)
 };
 
 #endif // _WX_VLBOX_H_