added Get(Class)DefaultAttributes implementation for all controls using DataBrowser...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/dataview.h b/include/wx/mac/carbon/dataview.h
index 7a8fbeffaae04b450d1ba7d8ff367236d4a00afb..01bcffc4fe72b140f755ca36ee0daa2227757129 100644 (file)
--- a/include/wx/mac/carbon/dataview.h
+++ b/include/wx/mac/carbon/dataview.h
@@ -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:
  // inherited methods from wxDataViewCtrlBase:
   virtual void DoSetExpanderColumn(void);
 protected:
  // inherited methods from wxDataViewCtrlBase:
   virtual void DoSetExpanderColumn(void);

diff --git a/include/wx/mac/carbon/listctrl.h b/include/wx/mac/carbon/listctrl.h
index a3949e50d8f7f827c751b97c7eaaf8d765f3b946..f9c3e4201adb78c8bf07b092e4b2a13164390c3c 100644 (file)
--- a/include/wx/mac/carbon/listctrl.h
+++ b/include/wx/mac/carbon/listctrl.h
@@ -361,6 +361,14 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   void MacSetDrawingContext(void* context) { m_cgContext = context; }
   void* MacGetDrawingContext() { return m_cgContext; }
 
   void MacSetDrawingContext(void* context) { m_cgContext = context; }
   void* MacGetDrawingContext() { return m_cgContext; }
 

+  virtual wxVisualAttributes GetDefaultAttributes() const
+  {
+      return GetClassDefaultAttributes(GetWindowVariant());
+  }
+
+  static wxVisualAttributes
+  GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+

 protected:
 
   // protected overrides needed for pimpl approach
 protected:
 
   // protected overrides needed for pimpl approach

diff --git a/src/mac/carbon/dataview.cpp b/src/mac/carbon/dataview.cpp
index 0d334b6d7361c8bd530311d54548ae145842a958..e8b8a9374adec435c856f74cf9835f65e71b92a0 100644 (file)
--- a/src/mac/carbon/dataview.cpp
+++ b/src/mac/carbon/dataview.cpp
@@ -997,6 +997,18 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
   return true;
 } /* wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator) */
 
   return true;
 } /* 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)
 {
   if (!wxDataViewCtrlBase::AssociateModel(model))
 bool wxDataViewCtrl::AssociateModel(wxDataViewModel* model)
 {
   if (!wxDataViewCtrlBase::AssociateModel(model))

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index ee803cb95878aa1af8192f6ac3b547d9be0661a8..7a21c3bc8f461fa983c19c41564ec2d0880ba38a 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -269,7 +269,7 @@ wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );

-    attr.font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
+    attr.font.MacCreateFromThemeFont(kThemeViewsFont);

 
     return attr;
 }
 
     return attr;
 }

diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp
index fc27f289ef8027153d57b8e1843f485b8f7edf0a..ed4e0dbc2af487793c32b2df47c84f37d4bf077e 100644 (file)
--- a/src/mac/carbon/listctrl_mac.cpp
+++ b/src/mac/carbon/listctrl_mac.cpp
@@ -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
 // ----------------------------------------------------------------------------