Use DeafultAttributes instead of hard coded defaults

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-07-17 23:22:26 +00:00
parent 35ee3288c6
commit dc5960727c
2 changed files with 24 additions and 7 deletions

View File

@@ -193,6 +193,14 @@ public:
{ /* do nothing */ } { /* do nothing */ }
virtual wxVisualAttributes GetDefaultAttributes() const
{
return GetClassDefaultAttributes(GetWindowVariant());
}
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
protected: protected:
// the derived class must implement this function to actually draw the item // the derived class must implement this function to actually draw the item
// with the given index on the provided DC // with the given index on the provided DC

View File

@@ -75,13 +75,9 @@ bool wxVListBox::Create(wxWindow *parent,
if ( style & wxLB_MULTIPLE ) if ( style & wxLB_MULTIPLE )
m_selStore = new wxSelectionStore; m_selStore = new wxSelectionStore;
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX)); // make sure the native widget has the right colour since we do
SetForegroundColour(parent->GetForegroundColour()); // transparent drawing by default
SetBackgroundColour(GetBackgroundColour());
// ensure that the font actually changes and is set.
SetFont(wxNullFont);
SetFont(parent->GetFont());
m_colBgSel = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); m_colBgSel = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
return true; return true;
@@ -612,3 +608,16 @@ void wxVListBox::OnLeftDClick(wxMouseEvent& event)
} }
} }
// ----------------------------------------------------------------------------
// use the same default attributes as wxListBox
// ----------------------------------------------------------------------------
#include "wx/listbox.h"
//static
wxVisualAttributes
wxVListBox::GetClassDefaultAttributes(wxWindowVariant variant)
{
return wxListBox::GetClassDefaultAttributes(variant);
}