added wxStaticCast, moved wxConstCast from wx/object.h to wx/defs.h for consistency

[wxWidgets.git] / wxPython / contrib / iewin / IEHtmlWin.h

diff --git a/wxPython/contrib/iewin/IEHtmlWin.h b/wxPython/contrib/iewin/IEHtmlWin.h
index c62f1d7b8ddf1dd6381c9f488e4f7509f11cf4d6..b4c7eea2a1d56ffb85408ed32f499d6e65a453b1 100644 (file)
--- a/wxPython/contrib/iewin/IEHtmlWin.h
+++ b/wxPython/contrib/iewin/IEHtmlWin.h
@@ -15,13 +15,14 @@ using namespace std;
 class wxMSHTMLEvent : public wxNotifyEvent
 {
 public:
 class wxMSHTMLEvent : public wxNotifyEvent
 {
 public:

-    wxMSHTMLEvent(wxEventType commandType = wxEVT_NULL, int id = 0)
-        : wxNotifyEvent(commandType, id)
-    {}
+       wxMSHTMLEvent(wxEventType commandType = wxEVT_NULL, int id = 0)
+               : wxNotifyEvent(commandType, id)
+       {}
+
+       wxString GetText1() { return m_text1; }
+       long GetLong1() { return m_long1; }
+       long GetLong2() { return m_long2; }

 
 

-    wxString GetText() { return m_text1; }
-    long GetLong1() { return m_long1; }
-    long GetLong2() { return m_long2; }

 
        wxString        m_text1;
        long            m_long1, m_long2;
 
        wxString        m_text1;
        long            m_long1, m_long2;


@@ -29,7 +30,8 @@ public:
        virtual wxEvent *Clone() const { return new wxMSHTMLEvent(*this); }
 
 private:
        virtual wxEvent *Clone() const { return new wxMSHTMLEvent(*this); }
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxMSHTMLEvent)
+       DECLARE_DYNAMIC_CLASS(wxMSHTMLEvent)
+

 };
 
 BEGIN_DECLARE_EVENT_TYPES()
 };
 
 BEGIN_DECLARE_EVENT_TYPES()


@@ -51,41 +53,50 @@ typedef void (wxEvtHandler::*wxMSHTMLEventFunction)(wxMSHTMLEvent&);
 #define EVT_MSHTML_TITLECHANGE(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_COMMAND_MSHTML_TITLECHANGE, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxMSHTMLEventFunction) & fn, NULL ),
 
 
 #define EVT_MSHTML_TITLECHANGE(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_COMMAND_MSHTML_TITLECHANGE, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxMSHTMLEventFunction) & fn, NULL ),
 
 

-enum wxIEHtmlRefreshLevel {
-    wxIEHTML_REFRESH_NORMAL = 0,
-    wxIEHTML_REFRESH_IFEXPIRED = 1,
-    wxIEHTML_REFRESH_CONTINUE = 2,
-    wxIEHTML_REFRESH_COMPLETELY = 3
+enum wxIEHtmlRefreshLevel 
+{
+       wxIEHTML_REFRESH_NORMAL = 0,
+       wxIEHTML_REFRESH_IFEXPIRED = 1,
+       wxIEHTML_REFRESH_CONTINUE = 2,
+       wxIEHTML_REFRESH_COMPLETELY = 3

 };
 
 };
 

+class IStreamAdaptorBase;

 
 class wxIEHtmlWin : public wxActiveX
 {
 
 class wxIEHtmlWin : public wxActiveX
 {

-public:
-    wxIEHtmlWin(wxWindow * parent, wxWindowID id = -1);
-    virtual ~wxIEHtmlWin();

 
 

-    void LoadUrl(const wxString&);
+public:
+    wxIEHtmlWin(wxWindow * parent, wxWindowID id = -1,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = 0,
+        const wxString& name = wxPanelNameStr);
+       virtual ~wxIEHtmlWin();
+
+       void LoadUrl(const wxString&);

     bool LoadString(wxString html);
     bool LoadStream(istream *strm);
     bool LoadString(wxString html);
     bool LoadStream(istream *strm);

+    bool LoadStream(wxInputStream *is);

 
 

-    void SetCharset(wxString charset);
+       void SetCharset(wxString charset);

     void SetEditMode(bool seton);
     bool GetEditMode();
     wxString GetStringSelection(bool asHTML = false);
     void SetEditMode(bool seton);
     bool GetEditMode();
     wxString GetStringSelection(bool asHTML = false);

-    wxString GetText(bool asHTML = false);
+       wxString GetText(bool asHTML = false);

 
 

-    bool GoBack();
-    bool GoForward();
-    bool GoHome();
-    bool GoSearch();
-    bool Refresh(wxIEHtmlRefreshLevel level);
-    bool Stop();
+       bool GoBack();
+       bool GoForward();
+       bool GoHome();
+       bool GoSearch();
+       bool Refresh(wxIEHtmlRefreshLevel level);
+       bool Stop();

 
 

-    DECLARE_EVENT_TABLE();
+       DECLARE_EVENT_TABLE();

 
 protected:
     void SetupBrowser();
 
 protected:
     void SetupBrowser();

+    bool LoadStream(IStreamAdaptorBase *pstrm);

 
        wxAutoOleInterface<IWebBrowser2>                m_webBrowser;
 };
 
        wxAutoOleInterface<IWebBrowser2>                m_webBrowser;
 };