Explicitly use _stati64() with MinGW-W64.

[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 bcc823ac23d4eddbd0ff3ec2fcf7de54e9c66e0e..ce784c9be0902332e2b4cc0525fc04c81e61bd26 100644 (file)
--- a/include/wx/msw/webview_ie.h
+++ b/include/wx/msw/webview_ie.h
@@ -12,17 +12,19 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if wxUSE_WEBVIEW_IE && defined(__WXMSW__)
+#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE && defined(__WXMSW__)

 
 #include "wx/control.h"
 #include "wx/webview.h"
 #include "wx/msw/ole/automtn.h"
 #include "wx/msw/ole/activex.h"
 
 #include "wx/control.h"
 #include "wx/webview.h"
 #include "wx/msw/ole/automtn.h"
 #include "wx/msw/ole/activex.h"

+#include "wx/msw/missing.h"

 #include "wx/sharedptr.h"
 #include "wx/vector.h"
 
 struct IHTMLDocument2;
 class wxFSFile;
 #include "wx/sharedptr.h"
 #include "wx/vector.h"
 
 struct IHTMLDocument2;
 class wxFSFile;

+class ClassFactory;

 
 class WXDLLIMPEXP_WEBVIEW wxWebViewIE : public wxWebView
 {
 
 class WXDLLIMPEXP_WEBVIEW wxWebViewIE : public wxWebView
 {


@@ -41,6 +43,8 @@ public:
        Create(parent, id, url, pos, size, style, name);
    }
 
        Create(parent, id, url, pos, size, style, name);
    }
 

+    ~wxWebViewIE();
+

     bool Create(wxWindow* parent,
            wxWindowID id,
            const wxString& url = wxWebViewDefaultURLStr,
     bool Create(wxWindow* parent,
            wxWindowID id,
            const wxString& url = wxWebViewDefaultURLStr,


@@ -148,6 +152,7 @@ private:
     //an item from the history. The position is stored as an int, and reflects
     //where we are in the history list.
     wxVector<wxSharedPtr<wxWebViewHistoryItem> > m_historyList;
     //an item from the history. The position is stored as an int, and reflects
     //where we are in the history list.
     wxVector<wxSharedPtr<wxWebViewHistoryItem> > m_historyList;

+    wxVector<ClassFactory*> m_factories;

     int m_historyPosition;
     bool m_historyLoadingFromList;
     bool m_historyEnabled;
     int m_historyPosition;
     bool m_historyLoadingFromList;
     bool m_historyEnabled;


@@ -208,10 +213,8 @@ public:
 
 class ClassFactory : public IClassFactory
 {
 
 class ClassFactory : public IClassFactory
 {

-private:
-    ULONG m_refCount;

 public:
 public:

-    ClassFactory(wxSharedPtr<wxWebViewHandler> handler) : m_handler(handler) {}
+    ClassFactory(wxSharedPtr<wxWebViewHandler> handler) : m_refCount(0), m_handler(handler) {}

     //IUnknown
     ULONG STDMETHODCALLTYPE AddRef();
     HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject);
     //IUnknown
     ULONG STDMETHODCALLTYPE AddRef();
     HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject);


@@ -222,9 +225,10 @@ public:
                                              REFIID riid, void** ppvObject);
     HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock);
 private:
                                              REFIID riid, void** ppvObject);
     HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock);
 private:

+    ULONG m_refCount;

     wxSharedPtr<wxWebViewHandler> m_handler;
 };
 
     wxSharedPtr<wxWebViewHandler> m_handler;
 };
 

-#endif // wxUSE_WEBVIEW_IE && defined(__WXMSW__)
+#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE && defined(__WXMSW__)

 
 #endif // wxWebViewIE_H
 
 #endif // wxWebViewIE_H