use public inheritance when deriving from wxHtmlWindowMouseHelper so that overriden methods can call base versions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -134,7 +134,7 @@ public:
|
|||||||
*/
|
*/
|
||||||
class WXDLLIMPEXP_HTML wxHtmlWindowMouseHelper
|
class WXDLLIMPEXP_HTML wxHtmlWindowMouseHelper
|
||||||
{
|
{
|
||||||
public:
|
protected:
|
||||||
/**
|
/**
|
||||||
Ctor.
|
Ctor.
|
||||||
|
|
||||||
@@ -224,7 +224,7 @@ private:
|
|||||||
|
|
||||||
class WXDLLIMPEXP_HTML wxHtmlWindow : public wxScrolledWindow,
|
class WXDLLIMPEXP_HTML wxHtmlWindow : public wxScrolledWindow,
|
||||||
public wxHtmlWindowInterface,
|
public wxHtmlWindowInterface,
|
||||||
private wxHtmlWindowMouseHelper
|
public wxHtmlWindowMouseHelper
|
||||||
{
|
{
|
||||||
DECLARE_DYNAMIC_CLASS(wxHtmlWindow)
|
DECLARE_DYNAMIC_CLASS(wxHtmlWindow)
|
||||||
friend class wxHtmlWinModule;
|
friend class wxHtmlWinModule;
|
||||||
|
@@ -30,7 +30,7 @@ class WXDLLIMPEXP_HTML wxHtmlListBoxStyle;
|
|||||||
|
|
||||||
class WXDLLIMPEXP_HTML wxHtmlListBox : public wxVListBox,
|
class WXDLLIMPEXP_HTML wxHtmlListBox : public wxVListBox,
|
||||||
public wxHtmlWindowInterface,
|
public wxHtmlWindowInterface,
|
||||||
private wxHtmlWindowMouseHelper
|
public wxHtmlWindowMouseHelper
|
||||||
{
|
{
|
||||||
DECLARE_ABSTRACT_CLASS(wxHtmlListBox)
|
DECLARE_ABSTRACT_CLASS(wxHtmlListBox)
|
||||||
public:
|
public:
|
||||||
|
Reference in New Issue
Block a user