From 8b64a7e24b3bc5f51bbe8569e46e691ca231ce57 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Tue, 2 May 2006 17:23:04 +0000 Subject: [PATCH] correct access specifier for virtuals git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/carbon/private.h | 15 ++++++++------- include/wx/scrolwin.h | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h index 7e97116a90..9302752b23 100644 --- a/include/wx/mac/carbon/private.h +++ b/include/wx/mac/carbon/private.h @@ -870,7 +870,14 @@ public : const wxMacDataItem* itemID, DataBrowserItemNotification message, DataBrowserItemDataRef itemData); - + + // as we are getting the same events for human and API selection we have to suppress + // events in the latter case, since this will be used from many subclasses we keep it here + + bool IsSelectionSuppressed() const { return m_suppressSelection; } + bool SuppressSelection( bool suppress ); + +protected: // ID aware base methods, should be 'final' ie not changed in subclasses virtual Boolean CompareItems(DataBrowserItemID itemOneID, @@ -887,12 +894,6 @@ public : DataBrowserItemNotification message, DataBrowserItemDataRef itemData); - // as we are getting the same events for human and API selection we have to suppress - // events in the latter case, since this will be used from many subclasses we keep it here - - bool IsSelectionSuppressed() const { return m_suppressSelection; } - bool SuppressSelection( bool suppress ); - private : bool m_suppressSelection; diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index 4775724ba3..c27b7fa830 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -235,6 +235,7 @@ protected: // this macro can be used in a wxScrollHelper-derived class to forward wxWindow // methods to corresponding wxScrollHelper methods #define WX_FORWARD_TO_SCROLL_HELPER() \ +public: \ virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); } \ virtual bool Layout() { return ScrollLayout(); } \ virtual void DoSetVirtualSize(int x, int y) \ -- 2.45.2