Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct access specifier for virtuals

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-05-02 17:23:04 +00:00
parent 27ed553558
commit 8b64a7e24b
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/wx/mac/carbon/private.h
View File

@@ -870,7 +870,14 @@ public :
const wxMacDataItem* itemID, const wxMacDataItem* itemID,
DataBrowserItemNotification message, DataBrowserItemNotification message,
DataBrowserItemDataRef itemData); 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 // ID aware base methods, should be 'final' ie not changed in subclasses
virtual Boolean CompareItems(DataBrowserItemID itemOneID, virtual Boolean CompareItems(DataBrowserItemID itemOneID,
@@ -887,12 +894,6 @@ public :
DataBrowserItemNotification message, DataBrowserItemNotification message,
DataBrowserItemDataRef itemData); 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 : private :
bool m_suppressSelection; bool m_suppressSelection;

1
include/wx/scrolwin.h
View File

@@ -235,6 +235,7 @@ protected:
// this macro can be used in a wxScrollHelper-derived class to forward wxWindow // this macro can be used in a wxScrollHelper-derived class to forward wxWindow
// methods to corresponding wxScrollHelper methods // methods to corresponding wxScrollHelper methods
#define WX_FORWARD_TO_SCROLL_HELPER() \ #define WX_FORWARD_TO_SCROLL_HELPER() \
public: \
virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); } \ virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); } \
virtual bool Layout() { return ScrollLayout(); } \ virtual bool Layout() { return ScrollLayout(); } \
virtual void DoSetVirtualSize(int x, int y) \ virtual void DoSetVirtualSize(int x, int y) \