Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

[wxWidgets.git] / include / wx / msw / webview_ie.h

diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h
index 020bd7fb8774f9f96366e183d66240809463e477..bc19ee85aee51bde09c9d979d408e4a47f2fd0ab 100644 (file)
--- a/include/wx/msw/webview_ie.h
+++ b/include/wx/msw/webview_ie.h
@@ -2,7 +2,6 @@
 // Name:        include/wx/msw/webview_ie.h
 // Purpose:     wxMSW IE wxWebView backend
 // Author:      Marianne Gagnon
 // Name:        include/wx/msw/webview_ie.h
 // Purpose:     wxMSW IE wxWebView backend
 // Author:      Marianne Gagnon

-// Id:          $Id$

 // Copyright:   (c) 2010 Marianne Gagnon, 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2010 Marianne Gagnon, 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -184,7 +183,7 @@ private:
     bool CanExecCommand(wxString command) const;
     void ExecCommand(wxString command);
     wxCOMPtr<IHTMLDocument2> GetDocument() const;
     bool CanExecCommand(wxString command) const;
     void ExecCommand(wxString command);
     wxCOMPtr<IHTMLDocument2> GetDocument() const;

-    bool IsElementVisible(IHTMLElement* elm);
+    bool IsElementVisible(wxCOMPtr<IHTMLElement> elm);

     //Find helper functions.
     void FindInternal(const wxString& text, int flags, int internal_flag);
     long FindNext(int direction = 1);
     //Find helper functions.
     void FindInternal(const wxString& text, int flags, int internal_flag);
     long FindNext(int direction = 1);


@@ -221,7 +220,7 @@ protected:
 
 public:
     VirtualProtocol(wxSharedPtr<wxWebViewHandler> handler);
 
 public:
     VirtualProtocol(wxSharedPtr<wxWebViewHandler> handler);

-    ~VirtualProtocol() {}
+    virtual ~VirtualProtocol() {}

 
     //IUnknown
     DECLARE_IUNKNOWN_METHODS;
 
     //IUnknown
     DECLARE_IUNKNOWN_METHODS;


@@ -256,7 +255,8 @@ class ClassFactory : public IClassFactory
 {
 public:
     ClassFactory(wxSharedPtr<wxWebViewHandler> handler) : m_handler(handler) 
 {
 public:
     ClassFactory(wxSharedPtr<wxWebViewHandler> handler) : m_handler(handler) 

-    { AddRef(); }
+        { AddRef(); }
+    virtual ~ClassFactory() {}

 
     wxString GetName() { return m_handler->GetName(); }
 
 
     wxString GetName() { return m_handler->GetName(); }
 


@@ -286,7 +286,7 @@ class DocHostUIHandler : public wxIDocHostUIHandler
 {
 public:
     DocHostUIHandler(wxWebView* browser) { m_browser = browser; }
 {
 public:
     DocHostUIHandler(wxWebView* browser) { m_browser = browser; }

-    ~DocHostUIHandler() {};
+    virtual ~DocHostUIHandler() {}

 
     virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt,
                                               IUnknown *pcmdtReserved,
 
     virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt,
                                               IUnknown *pcmdtReserved,