From a2fd8a45eca03f90371a1c41b2f7450df088b07c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 30 Jun 2008 13:40:08 +0000 Subject: [PATCH] VC6 compilation fix: using access declaration can only be used with immediate base class members with this compiler git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/stc/stc.h | 5 ++++- src/stc/stc.h.in | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index abc9f6ac39..5ab192da78 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -3772,7 +3772,10 @@ public: virtual void ShowPosition(long pos) { GotoPos(pos); } - using wxWindow::HitTest; + // FIXME-VC6: can't use wxWindow here because of "error C2603: illegal + // access declaration: 'wxWindow' is not a direct base of + // 'wxStyledTextCtrl'" with VC6 + using wxControl::HitTest; virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const { diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in index 4f313a11e3..2cdc27b3d9 100644 --- a/src/stc/stc.h.in +++ b/src/stc/stc.h.in @@ -405,7 +405,10 @@ public: virtual void ShowPosition(long pos) { GotoPos(pos); } - using wxWindow::HitTest; + // FIXME-VC6: can't use wxWindow here because of "error C2603: illegal + // access declaration: 'wxWindow' is not a direct base of + // 'wxStyledTextCtrl'" with VC6 + using wxControl::HitTest; virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const { -- 2.45.2