Sort of autoresize if only 1 column is there

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

diff --git a/src/mac/carbon/dataview.cpp b/src/mac/carbon/dataview.cpp
index e54cc745f71638565192bb6993716d2b27819214..0d334b6d7361c8bd530311d54548ae145842a958 100644 (file)
--- a/src/mac/carbon/dataview.cpp
+++ b/src/mac/carbon/dataview.cpp
@@ -992,6 +992,8 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
 
   ::SetDataBrowserTableViewHiliteStyle( this->m_peer->GetControlRef(), kDataBrowserTableViewFillHilite );
 
 
   ::SetDataBrowserTableViewHiliteStyle( this->m_peer->GetControlRef(), kDataBrowserTableViewFillHilite );
 

+  ::SetDataBrowserTableViewGeometry( this->m_peer->GetControlRef(), true, false );
+  

   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) */
 


@@ -1456,6 +1458,19 @@ void wxDataViewCtrl::OnSize(wxSizeEvent& event)
         dataViewCustomRendererPtr->SetDC(NULL); // reset DC because DC has changed
     } /* if */
   } /* for */
         dataViewCustomRendererPtr->SetDC(NULL); // reset DC because DC has changed
     } /* if */
   } /* for */

+  
+  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
+  ControlRef ref = MacDataViewListCtrlPtr->GetControlRef();
+  if (NoOfColumns == 1)
+  {
+     ::SetDataBrowserHasScrollBars( ref, false, true );
+     ::AutoSizeDataBrowserListViewColumns( ref );
+  }
+  if (NoOfColumns > 1)
+  {
+     ::SetDataBrowserHasScrollBars( ref, true, true );
+  }
+  

   event.Skip();
 } /* wxDataViewCtrl::OnSize(wxSizeEvent&) */
 
   event.Skip();
 } /* wxDataViewCtrl::OnSize(wxSizeEvent&) */