correct access specifier for virtuals

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

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index 7e97116a902b0dad5c66cc2077eecd6191cecac4..9302752b23cdab704b4a8a9291b38e1d5be2df15 100644 (file)
--- 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 4775724ba32a027c0e6be61cd88d2c97880cac38..c27b7fa8307d5f705e3d05b02fbed3cc2968599d 100644 (file)
--- 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)                               \