added Get(Class)DefaultAttributes implementation for all controls using DataBrowser native control; fixed wxListBox's to return correct font

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-03-02 10:50:16 +00:00
parent 3863c5ebd9
commit 4bff335abe
5 changed files with 41 additions and 1 deletions

View File

@@ -577,6 +577,14 @@ public:
this->m_Deleting = deleting; this->m_Deleting = deleting;
} }
virtual wxVisualAttributes GetDefaultAttributes() const
{
return GetClassDefaultAttributes(GetWindowVariant());
}
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
protected: protected:
// inherited methods from wxDataViewCtrlBase: // inherited methods from wxDataViewCtrlBase:
virtual void DoSetExpanderColumn(void); virtual void DoSetExpanderColumn(void);

View File

@@ -361,6 +361,14 @@ class WXDLLEXPORT wxListCtrl: public wxControl
void MacSetDrawingContext(void* context) { m_cgContext = context; } void MacSetDrawingContext(void* context) { m_cgContext = context; }
void* MacGetDrawingContext() { return m_cgContext; } void* MacGetDrawingContext() { return m_cgContext; }
virtual wxVisualAttributes GetDefaultAttributes() const
{
return GetClassDefaultAttributes(GetWindowVariant());
}
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
protected: protected:
// protected overrides needed for pimpl approach // protected overrides needed for pimpl approach

View File

@@ -997,6 +997,18 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
return true; return true;
} /* wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator) */ } /* wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator) */
/*static*/
wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
{
wxVisualAttributes attr;
attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
attr.font.MacCreateFromThemeFont(kThemeViewsFont);
return attr;
}
bool wxDataViewCtrl::AssociateModel(wxDataViewModel* model) bool wxDataViewCtrl::AssociateModel(wxDataViewModel* model)
{ {
if (!wxDataViewCtrlBase::AssociateModel(model)) if (!wxDataViewCtrlBase::AssociateModel(model))

View File

@@ -269,7 +269,7 @@ wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ); attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ); attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
attr.font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); attr.font.MacCreateFromThemeFont(kThemeViewsFont);
return attr; return attr;
} }

View File

@@ -772,6 +772,18 @@ wxListCtrl::~wxListCtrl()
delete m_renameTimer; delete m_renameTimer;
} }
/*static*/
wxVisualAttributes wxListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
{
wxVisualAttributes attr;
attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
attr.font.MacCreateFromThemeFont(kThemeViewsFont);
return attr;
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// set/get/change style // set/get/change style
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------