VC6 compilation fix: using access declaration can only be used with immediate base...

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

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index abc9f6ac398ec006524beae6d020fc5d58b97619..5ab192da78aad44f27e3b8a2b21dc82581a4ea93 100644 (file)
--- 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 4f313a11e3bdfdc4a3d6b610c5597aff98b5addd..2cdc27b3d9dda81f91f342298115fb494294697a 100644 (file)
--- 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
     {