From 10ae0adb5886b84767d762068db65b0e95131868 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 17 Mar 2006 22:50:05 +0000 Subject: [PATCH] Add DoGetBestSize git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/carbon/scrolbar.h | 3 +++ src/mac/carbon/scrolbar.cpp | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/include/wx/mac/carbon/scrolbar.h b/include/wx/mac/carbon/scrolbar.h index 71c711e305..b2538c5548 100644 --- a/include/wx/mac/carbon/scrolbar.h +++ b/include/wx/mac/carbon/scrolbar.h @@ -55,6 +55,9 @@ public: void Command(wxCommandEvent& event); virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) ; + + wxSize DoGetBestSize() const; + protected: int m_pageSize; int m_viewSize; diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp index f6f9bc4cfc..bc2962811b 100644 --- a/src/mac/carbon/scrolbar.cpp +++ b/src/mac/carbon/scrolbar.cpp @@ -219,3 +219,23 @@ wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler, WXEVENTREF mevent return noErr; } + + +wxSize wxScrollBar::DoGetBestSize() const +{ + int w = 100; + int h = 100; + + if ( IsVertical() ) + { + w = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); + } + else + { + h = wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y); + } + + wxSize best(w, h); + CacheBestSize(best); + return best; +} -- 2.50.0