projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
COW cleanup patch (1583966):
[wxWidgets.git]
/
include
/
wx
/
vlbox.h
diff --git
a/include/wx/vlbox.h
b/include/wx/vlbox.h
index dde8cbf7ca5393be4f2b065feb5810d24c9524b6..ac1d0286da2cb63d0fa4ae46be1089b67dc28289 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$
// Modified by:
// Created: 31.05.03
// RCS-ID: $Id$
-// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwi
ndow
s.org>
+// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwi
dget
s.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@
-13,6
+13,7
@@
#define _WX_VLBOX_H_
#include "wx/vscroll.h" // base class
#define _WX_VLBOX_H_
#include "wx/vscroll.h" // base class
+#include "wx/bitmap.h"
class WXDLLEXPORT wxSelectionStore;
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; }
// 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
+190,14
@@
public:
void SetSelectionBackground(const wxColour& col);
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
protected:
// the derived class must implement this function to actually draw the item
// with the given index on the provided DC
@@
-275,7
+287,6
@@
private:
// the selection bg colour
wxColour m_colBgSel;
// the selection bg colour
wxColour m_colBgSel;
-
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxVListBox)
DECLARE_ABSTRACT_CLASS(wxVListBox)
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxVListBox)
DECLARE_ABSTRACT_CLASS(wxVListBox)