Make wxDataViewCtrl::GetBestSize() return a height of 80 on OSX as per the other...

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

diff --git a/include/wx/osx/carbon/dataview.h b/include/wx/osx/carbon/dataview.h
index 2cdaf00c348c3f4fc99d97e6695fd031ede74d0f..46d065c37e7f3f85a647c27a9b84d8ff35edae20 100644 (file)
--- a/include/wx/osx/carbon/dataview.h
+++ b/include/wx/osx/carbon/dataview.h
@@ -508,6 +508,8 @@ public:
 // implementation
 //
 
+  virtual wxSize DoGetBestSize() const;
+
  // adds all children of the passed parent to the control; if 'parentItem' is invalid the root(s) is/are added:
   void AddChildrenLevel(wxDataViewItem const& parentItem);
 

diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp
index 8eeeac29a91324342375b9863ac261800e31183c..8a35b22c5617f566bab11e236fd6e002cb16a8e1 100644 (file)
--- a/src/osx/carbon/dataview.cpp
+++ b/src/osx/carbon/dataview.cpp
@@ -1027,6 +1027,14 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
   return true;
 }
 
+wxSize wxDataViewCtrl::DoGetBestSize() const
+{
+    wxSize best = wxControl::DoGetBestSize();
+    best.y = 80;
+    
+    return best;
+}
+
 /*static*/
 wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
 {
@@ -1034,7 +1042,7 @@ wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant var
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
-    attr.font.MacCreateFromThemeFont(kThemeViewsFont);
+    //attr.font.MacCreateFromThemeFont(kThemeViewsFont);
 
     return attr;
 }