undid last 2 commits, there are many more cases like this so it's better to fix this...

[wxWidgets.git] / include / wx / html / htmlwin.h

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 1a250ff73711b605b2ce65dcca8f50bed1187f27..f8338ab280bfaea6d8a6c419cbc5613bbec9d453 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -134,7 +134,7 @@ public:
  */
 class WXDLLIMPEXP_HTML wxHtmlWindowMouseHelper
 {
-public:
+protected:
     /**
         Ctor.
 
@@ -142,6 +142,14 @@ public:
      */
     wxHtmlWindowMouseHelper(wxHtmlWindowInterface *iface);
 
+    /**
+        Virtual dtor.
+
+        It is not really needed in this case but at leats it prevents gcc from
+        complaining about its absence.
+     */
+    virtual ~wxHtmlWindowMouseHelper() { }
+
     /// Returns true if the mouse moved since the last call to HandleIdle
     bool DidMouseMove() const { return m_tmpMouseMoved; }
 
@@ -224,7 +232,7 @@ private:
 
 class WXDLLIMPEXP_HTML wxHtmlWindow : public wxScrolledWindow,
                                       public wxHtmlWindowInterface,
-                                      private wxHtmlWindowMouseHelper
+                                      public wxHtmlWindowMouseHelper
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlWindow)
     friend class wxHtmlWinModule;
@@ -241,7 +249,7 @@ public:
         Init();
         Create(parent, id, pos, size, style, name);
     }
-    ~wxHtmlWindow();
+    virtual ~wxHtmlWindow();
 
     bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
                 const wxPoint& pos = wxDefaultPosition,
@@ -401,6 +409,7 @@ protected:
     void OnCopy(wxCommandEvent& event);
     void OnMouseEnter(wxMouseEvent& event);
     void OnMouseLeave(wxMouseEvent& event);
+    void OnMouseCaptureLost(wxMouseCaptureLostEvent& event);
 #endif // wxUSE_CLIPBOARD
 
     // Returns new filter (will be stored into m_DefaultFilter variable)
@@ -479,8 +488,6 @@ protected:
     // defaults to 10 pixels.
     int m_Borders;
 
-    int m_Style;
-
     // current text selection or NULL
     wxHtmlSelection *m_selection;