diff --git a/build/bakefiles/build_cfg.bkl b/build/bakefiles/build_cfg.bkl
index 00b2d33f5c..b9e973b09e 100644
--- a/build/bakefiles/build_cfg.bkl
+++ b/build/bakefiles/build_cfg.bkl
@@ -39,6 +39,7 @@
@echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
+ @echo USE_WEB=$(USE_WEB) >>$(BUILD_CFG_FILE)
@echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
@echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 8948042f2b..8de09ff2a7 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -161,7 +161,9 @@
$(mk.evalExpr(wxwin.mkLibName('stc')))
-
+
+ $(mk.evalExpr(wxwin.mkLibName('web')))
+
$(mk.evalExpr(wxwin.mkLibName('mono')))
diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index ee14b32871..4d57319cce 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -200,6 +200,14 @@ Default is to use debug CRT if and only if BUILD==debug.
+
+
+
@@ -432,6 +441,7 @@ it if SHARED=1 unless you know what you are doing.
+
@@ -480,6 +490,7 @@ Set the version of your Mingw installation here.
1
1
1
+ 1
1
1
1
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 3c575fa16c..bfda5997fe 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3309,6 +3309,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/htmllbox.cpp
+
+
+ src/msw/webview.cpp
+
+
+ src/gtk/webview.cpp
+
+
+ src/osx/webview.mm
+
+
+
+ $(WEB_SRC_PLATFORM)
+ src/common/webview.cpp
+
wx/msw/helpbest.h
@@ -3334,7 +3349,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/htmllbox.h
$(MSW_HTML_HDR)
-
+
+
+ wx/msw/webviewie.h
+
+
+ wx/gtk/webview.h
+
+
+ wx/osx/webview.h
+
+
+
+ $(PLATFORM_WEB_HDR)
+ wx/webview.h
+
diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 1ad6d4af02..f02411eab1 100644
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -4,7 +4,7 @@
- $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(QA_SRC)
+ $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(WEB_SRC) $(QA_SRC)
$(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RIBBON_SRC) $(RICHTEXT_SRC)
$(STC_SRC)
@@ -25,6 +25,7 @@
WXMAKINGDLL
$(EXTRALIBS_XML)
$(EXTRALIBS_HTML)
+ $(EXTRALIBS_WEB)
$(EXTRALIBS_MEDIA)
$(PLUGIN_MONOLIB_EXTRALIBS)
$(wxscintilla_library_link)
diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 2217008017..6c5ffd7c7f 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -173,6 +173,36 @@
html=htmllib+htmldll
+
+
+
+
+
+ WXUSINGDLL
+ WXMAKINGDLL_WEB
+ $(WEB_SRC)
+ coredll
+ basedll
+ $(EXTRALIBS_WEB)
+ $(WEB_HDR)
+
+
+
+
+ webdll
+
+
+
+ $(WEB_SRC)
+ $(WEB_HDR)
+
+
+
+
+ web=weblib+webdll
+
diff --git a/build/bakefiles/wxpresets/presets/wx.bkl b/build/bakefiles/wxpresets/presets/wx.bkl
index ec262c9e09..ca51a0deeb 100644
--- a/build/bakefiles/wxpresets/presets/wx.bkl
+++ b/build/bakefiles/wxpresets/presets/wx.bkl
@@ -104,6 +104,7 @@
xml
core
base
+ web
-->
@@ -124,7 +125,7 @@
tag definitions.
-->
- base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc
+ base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc web
+
+
+
+
+
+
+ web.cpp
+
+
+ core
+ base
+ web
+ stc
+ ../sample.rc
+
+
+
diff --git a/samples/web/web.cpp b/samples/web/web.cpp
new file mode 100644
index 0000000000..befae13521
--- /dev/null
+++ b/samples/web/web.cpp
@@ -0,0 +1,640 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: wxiepanel.cpp
+// Purpose: wxBetterHTMLControl test
+// Author: Marianne Gagnon
+// Id: $Id$
+// Copyright: (c) 2010 Marianne Gagnon
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include
+#include
+#include
+#include
+
+#if wxUSE_STC
+#include
+#else
+#error "wxStyledTextControl is needed by this sample"
+#endif
+
+#include "wx/webview.h"
+#include "wxlogo.xpm"
+#include "back.xpm"
+#include "forward.xpm"
+#include "stop.xpm"
+#include "refresh.xpm"
+
+// --------------------------------------------------------------------------------------------------
+// SOURCE VIEW FRAME
+// --------------------------------------------------------------------------------------------------
+enum
+{
+ MARGIN_LINE_NUMBERS,
+ //MARGIN_DIVIDER,
+ //MARGIN_FOLDING
+};
+
+class SourceViewDialog : public wxDialog
+{
+public:
+
+ void onClose(wxCloseEvent& evt)
+ {
+ EndModal( GetReturnCode() );
+ }
+
+ SourceViewDialog(wxWindow* parent, wxString source) :
+ wxDialog(parent, wxID_ANY, "Source Code",
+ wxDefaultPosition, wxSize(700,500),
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+ {
+ wxStyledTextCtrl* text = new wxStyledTextCtrl(this, wxID_ANY);
+
+ //text->SetLexer(wxSTC_LEX_HTML);
+ text->SetMarginWidth (MARGIN_LINE_NUMBERS, 50);
+ text->StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColour (75, 75, 75) );
+ text->StyleSetBackground (wxSTC_STYLE_LINENUMBER, wxColour (220, 220, 220));
+ text->SetMarginType (MARGIN_LINE_NUMBERS, wxSTC_MARGIN_NUMBER);
+
+ text->SetWrapMode (wxSTC_WRAP_WORD);
+
+ text->SetText(source);
+
+ text->StyleClearAll();
+ text->SetLexer(wxSTC_LEX_HTML);
+ text->StyleSetForeground (wxSTC_H_DOUBLESTRING, wxColour(255,0,0));
+ text->StyleSetForeground (wxSTC_H_SINGLESTRING, wxColour(255,0,0));
+ text->StyleSetForeground (wxSTC_H_ENTITY, wxColour(255,0,0));
+ text->StyleSetForeground (wxSTC_H_TAG, wxColour(0,150,0));
+ text->StyleSetForeground (wxSTC_H_TAGUNKNOWN, wxColour(0,150,0));
+ text->StyleSetForeground (wxSTC_H_ATTRIBUTE, wxColour(0,0,150));
+ text->StyleSetForeground (wxSTC_H_ATTRIBUTEUNKNOWN, wxColour(0,0,150));
+ text->StyleSetForeground (wxSTC_H_COMMENT, wxColour(150,150,150));
+
+
+ wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
+ sizer->Add(text, 1, wxEXPAND);
+ SetSizer(sizer);
+
+ Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(SourceViewDialog::onClose), NULL, this);
+ }
+
+
+};
+
+// --------------------------------------------------------------------------------------------------
+// MAIN BROWSER CLASS
+// --------------------------------------------------------------------------------------------------
+class wxMiniApp : public wxApp
+{
+ wxTextCtrl* url;
+ wxWebView* m_browser_ctrl;
+ wxFrame* frame;
+
+ wxToolBarToolBase* back;
+ wxToolBarToolBase* forward;
+ wxToolBarToolBase* stop;
+ wxToolBarToolBase* reload;
+ wxToolBarToolBase* tools;
+
+ wxMenu* toolsMenu;
+ wxMenuItem* tinySize;
+ wxMenuItem* smallSize;
+ wxMenuItem* mediumSize;
+ wxMenuItem* largeSize;
+ wxMenuItem* largestSize;
+
+ //wxMenuItem* offlineMode;
+ //wxMenuItem* onlineMode;
+
+ wxLogWindow* logging;
+ wxToolBar* m_toolbar;
+
+ wxTimer* m_timer;
+ int m_animation_angle;
+
+ wxPanel* m_notification_panel;
+ wxStaticText* m_notification_text;
+
+public:
+ // function called at the application initialization
+ virtual bool OnInit();
+
+ /**
+ * Implement timer to display the loading animation (OK, I admit this is totally irrelevant to
+ * the HTML control being demonstrated here, but it's fun ;)
+ */
+ void onAnimationTimer(wxTimerEvent& evt)
+ {
+ m_animation_angle += 15;
+ if (m_animation_angle > 360) m_animation_angle -= 360;
+
+ wxBitmap image(32, 32);
+
+ {
+ wxMemoryDC dc;
+ dc.SelectObject(image);
+ dc.SetBackground(wxBrush(wxColour(255,0,255)));
+ dc.Clear();
+
+ if (m_animation_angle >= 0 && m_animation_angle <= 180)
+ {
+ dc.SetBrush(*wxYELLOW_BRUSH);
+ dc.SetPen(*wxYELLOW_PEN);
+ dc.DrawCircle(16 - int(sin(m_animation_angle*0.01745f /* convert to radians */)*14.0f),
+ 16 + int(cos(m_animation_angle*0.01745f /* convert to radians */)*14.0f), 3 );
+ }
+
+ dc.DrawBitmap(wxBitmap(wxlogo_xpm), 0, 0, true);
+
+ if (m_animation_angle > 180)
+ {
+ dc.SetBrush(*wxYELLOW_BRUSH);
+ dc.SetPen(*wxYELLOW_PEN);
+ dc.DrawCircle(16 - int(sin(m_animation_angle*0.01745f /* convert to radians */)*14.0f),
+ 16 + int(cos(m_animation_angle*0.01745f /* convert to radians */)*14.0f), 3 );
+ }
+ }
+
+ image.SetMask(new wxMask(image, wxColour(255,0,255)));
+ m_toolbar->SetToolNormalBitmap(tools->GetId(), image);
+ }
+
+ /**
+ * Method that retrieves the current state from the web control and updates the GUI
+ * the reflect this current state.
+ */
+ void updateState()
+ {
+ m_toolbar->EnableTool( back->GetId(), m_browser_ctrl->CanGoBack() );
+ m_toolbar->EnableTool( forward->GetId(), m_browser_ctrl->CanGoForward() );
+
+ if (m_browser_ctrl->IsBusy())
+ {
+ //tools->SetLabel(_("Loading..."));
+
+ if (m_timer == NULL)
+ {
+ m_timer = new wxTimer(this);
+ this->Connect(wxEVT_TIMER, wxTimerEventHandler(wxMiniApp::onAnimationTimer), NULL, this);
+ }
+ m_timer->Start(100); // start animation timer
+
+ m_toolbar->EnableTool( stop->GetId(), true );
+ }
+ else
+ {
+ if (m_timer != NULL) m_timer->Stop(); // stop animation timer
+
+ //tools->SetLabel(_("Tools"));
+ m_toolbar->SetToolNormalBitmap(tools->GetId(), wxBitmap(wxlogo_xpm));
+ m_toolbar->EnableTool( stop->GetId(), false );
+ }
+
+ frame->SetTitle( m_browser_ctrl->GetCurrentTitle() );
+ url->SetValue( m_browser_ctrl->GetCurrentURL() );
+ }
+
+ /**
+ * Callback invoked when user entered an URL and pressed enter
+ */
+ void onUrl(wxCommandEvent& evt)
+ {
+ if (m_notification_panel->IsShown())
+ {
+ m_notification_panel->Hide();
+ frame->Layout();
+ }
+
+ m_browser_ctrl->LoadUrl( url->GetValue() );
+ updateState();
+ }
+
+ /**
+ * Callback invoked when user pressed the "back" button
+ */
+ void onBack(wxCommandEvent& evt)
+ {
+ // First, hide notification panel if it was shown
+ if (m_notification_panel->IsShown())
+ {
+ m_notification_panel->Hide();
+ frame->Layout();
+ }
+
+ m_browser_ctrl->GoBack();
+ updateState();
+ }
+
+ /**
+ * Callback invoked when user pressed the "forward" button
+ */
+ void onForward(wxCommandEvent& evt)
+ {
+ // First, hide notification panel if it was shown
+ if (m_notification_panel->IsShown())
+ {
+ m_notification_panel->Hide();
+ frame->Layout();
+ }
+
+ m_browser_ctrl->GoForward();
+ updateState();
+ }
+
+ /**
+ * Callback invoked when user pressed the "stop" button
+ */
+ void onStop(wxCommandEvent& evt)
+ {
+ m_browser_ctrl->Stop();
+ updateState();
+ }
+
+ /**
+ * Callback invoked when user pressed the "reload" button
+ */
+ void onReload(wxCommandEvent& evt)
+ {
+ // First, hide notification panel if it was shown
+ if (m_notification_panel->IsShown())
+ {
+ m_notification_panel->Hide();
+ frame->Layout();
+ }
+
+ m_browser_ctrl->Reload();
+ updateState();
+ }
+
+ /**
+ * Callback invoked when there is a request to load a new page (for instance
+ * when the user clicks a link)
+ */
+ void onNavigationRequest(wxWebNavigationEvent& evt)
+ {
+ // First, hide notification panel if it was shown
+ if (m_notification_panel->IsShown())
+ {
+ m_notification_panel->Hide();
+ frame->Layout();
+ }
+
+ wxLogMessage("Navigation request to '" + evt.GetHref() + "' (target='" +
+ evt.GetTarget() + "')");
+
+ wxASSERT(m_browser_ctrl->IsBusy());
+
+ // Uncomment this to see how to block navigation requests
+ //int answer = wxMessageBox("Proceed with navigation to '" + evt.GetHref() + "'?",
+ // "Proceed with navigation?", wxYES_NO );
+ //if (answer != wxYES)
+ //{
+ // evt.Veto();
+ //}
+ updateState();
+ }
+
+ /**
+ * Callback invoked when a navigation request was accepted
+ */
+ void onNavigationComplete(wxWebNavigationEvent& evt)
+ {
+ wxLogMessage("Navigation complete; url='" + evt.GetHref() + "'");
+ updateState();
+ }
+
+ /**
+ * Callback invoked when a page is finished loading
+ */
+ void onDocumentLoaded(wxWebNavigationEvent& evt)
+ {
+ wxLogMessage("Document loaded; url='" + evt.GetHref() + "'");
+ updateState();
+
+ m_browser_ctrl->GetZoom();
+ }
+
+ /**
+ * Invoked when user selects the "View Source" menu item
+ */
+ void onViewSourceRequest(wxCommandEvent& evt)
+ {
+ SourceViewDialog dlg(frame, m_browser_ctrl->GetPageSource());
+ dlg.Center();
+ dlg.ShowModal();
+ }
+
+ /**
+ * Invoked when user selects the "Menu" item
+ */
+ void onToolsClicked(wxCommandEvent& evt)
+ {
+ tinySize->Check(false);
+ smallSize->Check(false);
+ mediumSize->Check(false);
+ largeSize->Check(false);
+ largestSize->Check(false);
+
+ wxWebViewZoom zoom = m_browser_ctrl->GetZoom();
+ switch (zoom)
+ {
+ case wxWEB_VIEW_ZOOM_TINY:
+ tinySize->Check();
+ break;
+ case wxWEB_VIEW_ZOOM_SMALL:
+ smallSize->Check();
+ break;
+ case wxWEB_VIEW_ZOOM_MEDIUM:
+ mediumSize->Check();
+ break;
+ case wxWEB_VIEW_ZOOM_LARGE:
+ largeSize->Check();
+ break;
+ case wxWEB_VIEW_ZOOM_LARGEST:
+ largestSize->Check();
+ break;
+ }
+
+ // bool IsOfflineMode();
+ // void SetOfflineMode(bool offline);
+
+ //offlineMode->Check(false);
+ //onlineMode->Check(false);
+ //const bool offline = m_browser_ctrl->IsOfflineMode();
+ //if (offline) offlineMode->Check();
+ //else onlineMode->Check();
+
+ wxPoint position = frame->ScreenToClient( wxGetMousePosition() );
+ frame->PopupMenu(toolsMenu, position.x, position.y);
+ }
+
+ /**
+ * Invoked when user selects the zoom size in the menu
+ */
+ void onSetZoom(wxCommandEvent& evt)
+ {
+ if (evt.GetId() == tinySize->GetId())
+ {
+ m_browser_ctrl->SetZoom(wxWEB_VIEW_ZOOM_TINY);
+ }
+ else if (evt.GetId() == smallSize->GetId())
+ {
+ m_browser_ctrl->SetZoom(wxWEB_VIEW_ZOOM_SMALL);
+ }
+ else if (evt.GetId() == mediumSize->GetId())
+ {
+ m_browser_ctrl->SetZoom(wxWEB_VIEW_ZOOM_MEDIUM);
+ }
+ else if (evt.GetId() == largeSize->GetId())
+ {
+ m_browser_ctrl->SetZoom(wxWEB_VIEW_ZOOM_LARGE);
+ }
+ else if (evt.GetId() == largestSize->GetId())
+ {
+ m_browser_ctrl->SetZoom(wxWEB_VIEW_ZOOM_LARGEST);
+ }
+ else
+ {
+ wxASSERT(false);
+ }
+ }
+
+ /*
+ void onChangeOnlineMode(wxCommandEvent& evt)
+ {
+ if (evt.GetId() == offlineMode->GetId())
+ {
+ m_browser_ctrl->SetOfflineMode(true);
+ m_browser_ctrl->SetPage("You are now in offline mode.
");
+ }
+ else if (evt.GetId() == onlineMode->GetId())
+ {
+ m_browser_ctrl->SetOfflineMode(false);
+ }
+ else
+ {
+ wxASSERT(false);
+ }
+ }
+ */
+
+ /**
+ * Callback invoked when a loading error occurs
+ */
+ void onError(wxWebNavigationEvent& evt)
+ {
+ wxString errorCategory;
+ switch (evt.GetInt())
+ {
+ case wxWEB_NAV_ERR_CONNECTION:
+ errorCategory = "wxWEB_NAV_ERR_CONNECTION";
+ break;
+
+ case wxWEB_NAV_ERR_CERTIFICATE:
+ errorCategory = "wxWEB_NAV_ERR_CERTIFICATE";
+ break;
+
+ case wxWEB_NAV_ERR_AUTH:
+ errorCategory = "wxWEB_NAV_ERR_AUTH";
+ break;
+
+ case wxWEB_NAV_ERR_SECURITY:
+ errorCategory = "wxWEB_NAV_ERR_SECURITY";
+ break;
+
+ case wxWEB_NAV_ERR_NOT_FOUND:
+ errorCategory = "wxWEB_NAV_ERR_NOT_FOUND";
+ break;
+
+ case wxWEB_NAV_ERR_REQUEST:
+ errorCategory = "wxWEB_NAV_ERR_REQUEST";
+ break;
+
+ case wxWEB_NAV_ERR_USER_CANCELLED:
+ errorCategory = "wxWEB_NAV_ERR_USER_CANCELLED";
+ break;
+
+ case wxWEB_NAV_ERR_OTHER:
+ errorCategory = "wxWEB_NAV_ERR_OTHER";
+ break;
+ }
+
+ wxLogMessage("Error; url='" + evt.GetHref() + "', error='" + errorCategory + "' (" + evt.GetString() + ")");
+
+ // show the notification panel
+ m_notification_text->SetLabel(_("An error occurred loading ") + evt.GetHref() + "\n" +
+ "'" + errorCategory + "' (" + evt.GetString() + ")");
+ m_notification_panel->Layout();
+ m_notification_panel->GetSizer()->SetSizeHints(m_notification_panel);
+ m_notification_panel->Show();
+ frame->Layout();
+
+ updateState();
+ }
+
+ /**
+ * Invoked when user clicks "Hide" in the notification panel
+ */
+ void onHideNotifBar(wxCommandEvent& evt)
+ {
+ m_notification_panel->Hide();
+ frame->Layout();
+ }
+
+ void onClose(wxCloseEvent& evt)
+ {
+ frame->Destroy();
+ }
+
+ void onQuitMenu(wxCommandEvent& evt)
+ {
+ frame->Destroy();
+ }
+
+ /**
+ * Invoked when user selects "Print" from the menu
+ */
+ void onPrint(wxCommandEvent& evt)
+ {
+ m_browser_ctrl->Print();
+ }
+};
+
+IMPLEMENT_APP(wxMiniApp);
+
+bool wxMiniApp::OnInit()
+{
+ m_timer = NULL;
+ m_animation_angle = 0;
+
+ frame = new wxFrame( NULL, -1, _("wxBetterHTMLControl Browser Example"), wxDefaultPosition, wxSize(800, 600) );
+
+ // wx has a default mechanism to expand the only control of a frame; but since this mechanism
+ // does not involve sizers, invoking ->Layout on the frame does not udpate the layout which is
+ // not good.
+ wxBoxSizer* expandSizer = new wxBoxSizer(wxHORIZONTAL);
+ wxPanel* mainpane = new wxPanel(frame, wxID_ANY);
+ expandSizer->Add(mainpane, 1, wxEXPAND);
+ frame->SetSizer(expandSizer);
+
+ wxLog::SetLogLevel(wxLOG_Max);
+ logging = new wxLogWindow(frame, _("Logging"));
+ wxLog::SetLogLevel(wxLOG_Max);
+
+ // ---- Create the Tools menu
+ toolsMenu = new wxMenu();
+ wxMenuItem* print = toolsMenu->Append(wxID_ANY , _("Print"));
+ wxMenuItem* viewSource = toolsMenu->Append(wxID_ANY , _("View Source"));
+ toolsMenu->AppendSeparator();
+ tinySize = toolsMenu->AppendCheckItem(wxID_ANY, _("Tiny"));
+ smallSize = toolsMenu->AppendCheckItem(wxID_ANY, _("Small"));
+ mediumSize = toolsMenu->AppendCheckItem(wxID_ANY, _("Medium"));
+ largeSize = toolsMenu->AppendCheckItem(wxID_ANY, _("Large"));
+ largestSize = toolsMenu->AppendCheckItem(wxID_ANY, _("Largest"));
+ //toolsMenu->AppendSeparator();
+ //offlineMode = toolsMenu->AppendCheckItem(wxID_ANY, _("Offline Mode"));
+ //onlineMode = toolsMenu->AppendCheckItem(wxID_ANY, _("Online Mode"));
+
+ // ---- Create the Toolbar
+ m_toolbar = frame->CreateToolBar(/*wxNO_BORDER |*/ wxTB_TEXT);
+ m_toolbar->SetToolBitmapSize(wxSize(32, 32));
+
+ back = m_toolbar->AddTool(wxID_ANY, _("Back"), wxBitmap(back_xpm));
+ forward = m_toolbar->AddTool(wxID_ANY, _("Forward"), wxBitmap(forward_xpm));
+ stop = m_toolbar->AddTool(wxID_ANY, _("Stop"), wxBitmap(stop_xpm));
+ reload = m_toolbar->AddTool(wxID_ANY, _("Reload"), wxBitmap(refresh_xpm));
+
+ url = new wxTextCtrl(m_toolbar, wxID_ANY, wxT("http://www.google.com"),
+ wxDefaultPosition, wxSize(400, -1), wxTE_PROCESS_ENTER );
+ m_toolbar->AddControl(url, _("URL"));
+ tools = m_toolbar->AddTool(wxID_ANY, _("Menu"), wxBitmap(wxlogo_xpm));
+ //m_toolbar->SetDropdownMenu(tools->GetId(), toolsMenu);
+
+ m_toolbar->Realize();
+
+ m_toolbar->Connect(back->GetId(), wxEVT_COMMAND_TOOL_CLICKED,
+ wxCommandEventHandler(wxMiniApp::onBack), NULL, this );
+ m_toolbar->Connect(forward->GetId(), wxEVT_COMMAND_TOOL_CLICKED,
+ wxCommandEventHandler(wxMiniApp::onForward), NULL, this );
+ m_toolbar->Connect(stop->GetId(), wxEVT_COMMAND_TOOL_CLICKED,
+ wxCommandEventHandler(wxMiniApp::onStop), NULL, this );
+ m_toolbar->Connect(reload->GetId(), wxEVT_COMMAND_TOOL_CLICKED,
+ wxCommandEventHandler(wxMiniApp::onReload), NULL, this );
+ m_toolbar->Connect(tools->GetId(), wxEVT_COMMAND_TOOL_CLICKED,
+ wxCommandEventHandler(wxMiniApp::onToolsClicked), NULL, this );
+
+ url->Connect(url->GetId(), wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(wxMiniApp::onUrl), NULL, this );
+
+
+ frame->Connect(viewSource->GetId(), wxEVT_COMMAND_MENU_SELECTED,
+ wxCommandEventHandler(wxMiniApp::onViewSourceRequest), NULL, this );
+ frame->Connect(print->GetId(), wxEVT_COMMAND_MENU_SELECTED,
+ wxCommandEventHandler(wxMiniApp::onPrint), NULL, this );
+
+ frame->Connect(tinySize->GetId(), wxEVT_COMMAND_MENU_SELECTED,
+ wxCommandEventHandler(wxMiniApp::onSetZoom), NULL, this );
+ frame->Connect(smallSize->GetId(), wxEVT_COMMAND_MENU_SELECTED,
+ wxCommandEventHandler(wxMiniApp::onSetZoom), NULL, this );
+ frame->Connect(mediumSize->GetId(), wxEVT_COMMAND_MENU_SELECTED,
+ wxCommandEventHandler(wxMiniApp::onSetZoom), NULL, this );
+ frame->Connect(largeSize->GetId(), wxEVT_COMMAND_MENU_SELECTED,
+ wxCommandEventHandler(wxMiniApp::onSetZoom), NULL, this );
+ frame->Connect(largestSize->GetId(), wxEVT_COMMAND_MENU_SELECTED,
+ wxCommandEventHandler(wxMiniApp::onSetZoom), NULL, this );
+
+ // ---- Create the web view
+ m_browser_ctrl = wxWebView::GetNew(mainpane, wxID_ANY);
+
+ // ---- Create the notification panel
+ {
+ wxBoxSizer* notification_sizer = new wxBoxSizer(wxHORIZONTAL);
+ m_notification_panel = new wxPanel(mainpane, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE);
+ m_notification_text = new wxStaticText(m_notification_panel, wxID_ANY, "[No message]");
+ notification_sizer->Add( new wxStaticBitmap(m_notification_panel, wxID_ANY,
+ wxArtProvider::GetBitmap(wxART_WARNING, wxART_OTHER , wxSize(48, 48))),
+ 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
+ notification_sizer->Add(m_notification_text, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 5);
+ wxButton* hideNotif = new wxButton(m_notification_panel, wxID_ANY, _("Hide"));
+ notification_sizer->Add(hideNotif, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+ m_notification_panel->SetSizer(notification_sizer);
+ m_notification_panel->SetBackgroundColour(wxColor(255,225,110));
+ m_notification_panel->Hide();
+ hideNotif->Connect(hideNotif->GetId(), wxEVT_COMMAND_BUTTON_CLICKED,
+ wxCommandEventHandler(wxMiniApp::onHideNotifBar), NULL, this);
+ }
+
+ wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
+ sizer->Add(m_notification_panel, 0, wxEXPAND | wxALL, 5);
+ sizer->Add(m_browser_ctrl, 1, wxEXPAND | wxALL, 5);
+
+ mainpane->SetSizer(sizer);
+ frame->Layout();
+ frame->Center();
+ frame->Show();
+
+ m_browser_ctrl->Connect(m_browser_ctrl->GetId(), wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
+ wxWebNavigationEventHandler(wxMiniApp::onNavigationRequest), NULL, this);
+
+ m_browser_ctrl->Connect(m_browser_ctrl->GetId(), wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+ wxWebNavigationEventHandler(wxMiniApp::onNavigationComplete), NULL, this);
+
+ m_browser_ctrl->Connect(m_browser_ctrl->GetId(), wxEVT_COMMAND_WEB_VIEW_LOADED,
+ wxWebNavigationEventHandler(wxMiniApp::onDocumentLoaded), NULL, this);
+
+ m_browser_ctrl->Connect(m_browser_ctrl->GetId(), wxEVT_COMMAND_WEB_VIEW_ERROR,
+ wxWebNavigationEventHandler(wxMiniApp::onError), NULL, this);
+
+ frame->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(wxMiniApp::onClose), NULL, this);
+ Connect(wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(wxMiniApp::onQuitMenu), NULL, this);
+
+ // You can test different zoom types (if supported by the backend)
+ // if (m_browser_ctrl->CanSetZoomType(wxWEB_VIEW_ZOOM_TYPE_LAYOUT))
+ // m_browser_ctrl->SetZoomType(wxWEB_VIEW_ZOOM_TYPE_LAYOUT);
+
+ SetTopWindow(frame);
+ frame->Layout();
+
+ return true;
+}
diff --git a/samples/web/wxlogo.xpm b/samples/web/wxlogo.xpm
new file mode 100644
index 0000000000..24351307c4
--- /dev/null
+++ b/samples/web/wxlogo.xpm
@@ -0,0 +1,44 @@
+/* XPM */
+static const char *const wxlogo_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 6 1",
+" c black",
+". c navy",
+"X c red",
+"o c yellow",
+"O c gray100",
+"+ c None",
+/* pixels */
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++ ++++++++++",
+"++++++++ ............ ++++++++++",
+"++++++++ ............ ++++++++++",
+"++++++++ .OO......... ++++++++++",
+"++++++++ .OO......... ++++++++++",
+"++++++++ .OO......... ++++++++++",
+"++++++++ .OO...... ",
+"++++++++ .OO...... oooooooooooo ",
+" .OO...... oooooooooooo ",
+" XXXXXXX .OO...... oOOooooooooo ",
+" XXXXXXX .OO...... oOOooooooooo ",
+" XOOXXXX ......... oOOooooooooo ",
+" XOOXXXX ......... oOOooooooooo ",
+" XOOXXXX oOOooooooooo ",
+" XOOXXXXXXXXX ++++ oOOooooooooo ",
+" XOOXXXXXXXXX ++++ oOOooooooooo ",
+" XOOXXXXXXXXX ++++ oOOooooooooo ",
+" XOOXXXXXXXXX ++++ oooooooooooo ",
+" XOOXXXXXXXXX ++++ oooooooooooo ",
+" XXXXXXXXXXXX ++++ ",
+" XXXXXXXXXXXX ++++++++++++++++++",
+" ++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++"
+};
diff --git a/src/common/webview.cpp b/src/common/webview.cpp
new file mode 100644
index 0000000000..91ce54f048
--- /dev/null
+++ b/src/common/webview.cpp
@@ -0,0 +1,113 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: webview.cpp
+// Purpose: Common interface and events for web view component
+// Author: Marianne Gagnon
+// Id: $Id$
+// Copyright: (c) 2010 Marianne Gagnon
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/webview.h"
+
+#include "wx/osx/webkit.h"
+#include "wx/gtk/webkit.h"
+#include "wx/msw/webkitie.h"
+
+extern WXDLLEXPORT_DATA(const char) wxWebViewNameStr[] = "wxWebView";
+extern WXDLLEXPORT_DATA(const char) wxWebViewDefaultURLStr[] = "about:blank";
+
+IMPLEMENT_DYNAMIC_CLASS(wxWebNavigationEvent, wxCommandEvent)
+
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebNavigationEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebNavigationEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebNavigationEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebNavigationEvent );
+
+// static
+wxWebView* wxWebView::New(wxWebViewBackend backend)
+{
+ switch (backend)
+ {
+ #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
+ case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
+ return new wxOSXWebKitCtrl();
+ #endif
+
+ #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
+ case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
+ return new wxGtkWebKitCtrl();
+ #endif
+
+ #if wxHAVE_WEB_BACKEND_IE
+ case wxWEB_VIEW_BACKEND_IE:
+ return new wxIEPanel();
+ #endif
+
+ case wxWEB_VIEW_BACKEND_DEFAULT:
+
+ #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
+ return new wxOSXWebKitCtrl();
+ #endif
+
+ #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
+ return new wxGtkWebKitCtrl();
+ #endif
+
+ #if wxHAVE_WEB_BACKEND_IE
+ return new wxIEPanel();
+ #endif
+
+ // fall-through intended
+ default:
+ return NULL;
+ }
+}
+
+// static
+wxWebView* wxWebView::New(wxWindow* parent,
+ wxWindowID id,
+ const wxString& url,
+ const wxPoint& pos,
+ const wxSize& size,
+ wxWebViewBackend backend,
+ long style,
+ const wxString& name)
+{
+ switch (backend)
+ {
+ #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
+ case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
+ return new wxOSXWebKitCtrl(parent, id, url, pos, size, style,
+ name);
+ #endif
+
+ #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
+ case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
+ return new wxGtkWebKitCtrl(parent, id, url, pos, size, style,
+ name);
+ #endif
+
+ #if wxHAVE_WEB_BACKEND_IE
+ case wxWEB_VIEW_BACKEND_IE:
+ return new wxIEPanel(parent, id, url, pos, size, style, name);
+ #endif
+
+ case wxWEB_VIEW_BACKEND_DEFAULT:
+
+ #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
+ return new wxOSXWebKitCtrl(parent, id, url, pos, size, style, name);
+ #endif
+
+ #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
+ return new wxGtkWebKitCtrl(parent, id, url, pos, size, style, name);
+ #endif
+
+ #if wxHAVE_WEB_BACKEND_IE
+ return new wxIEPanel(parent, id, url, pos, size, style, name);
+ #endif
+
+ // fall-through intended
+ default:
+ return NULL;
+ }
+}
diff --git a/src/gtk/webview.cpp b/src/gtk/webview.cpp
new file mode 100644
index 0000000000..2aac2708ff
--- /dev/null
+++ b/src/gtk/webview.cpp
@@ -0,0 +1,560 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: src/gtk/webview.cpp
+// Purpose: GTK WebKit backend for web view component
+// Author: Marianne Gagnon, Robert Roebling
+// Id: $Id$
+// Copyright: (c) 2010 Marianne Gagnon, 1998 Robert Roebling
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+
+#if wxHAVE_WEB_BACKEND_GTK_WEBKIT
+
+#include "wx/stockitem.h"
+#include "wx/gtk/webview.h"
+#include "wx/gtk/control.h"
+#include "wx/gtk/private.h"
+#include "webkit/webkit.h"
+
+// ----------------------------------------------------------------------------
+// GTK callbacks
+// ----------------------------------------------------------------------------
+
+extern "C"
+{
+
+static void
+wxgtk_webkitctrl_load_status_callback(GtkWidget* widget, GParamSpec* arg1,
+ wxWebViewGTKWebKit *webKitCtrl)
+{
+ if (!webKitCtrl->m_ready) return;
+
+ wxString url = webKitCtrl->GetCurrentURL();
+
+ WebKitLoadStatus status;
+ g_object_get(G_OBJECT(widget), "load-status", &status, NULL);
+
+ wxString target; // TODO: get target (if possible)
+
+ if (status == WEBKIT_LOAD_FINISHED)
+ {
+ webKitCtrl->m_busy = false;
+ wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_LOADED,
+ webKitCtrl->GetId(),
+ url, target, false);
+
+ if (webKitCtrl && webKitCtrl->GetEventHandler())
+ webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent);
+ }
+ else if (status == WEBKIT_LOAD_COMMITTED)
+ {
+ webKitCtrl->m_busy = true;
+ wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+ webKitCtrl->GetId(),
+ url, target, false);
+
+ if (webKitCtrl && webKitCtrl->GetEventHandler())
+ webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent);
+ }
+}
+
+static WebKitNavigationResponse
+wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView *web_view,
+ WebKitWebFrame *frame,
+ WebKitNetworkRequest *request,
+ wxWebViewGTKWebKit *webKitCtrl)
+{
+ webKitCtrl->m_busy = true;
+
+ const gchar* uri = webkit_network_request_get_uri(request);
+
+ wxString target = webkit_web_frame_get_name (frame);
+ wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
+ webKitCtrl->GetId(),
+ wxString( uri, wxConvUTF8 ),
+ target,
+ true);
+
+ if (webKitCtrl && webKitCtrl->GetEventHandler())
+ webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent);
+
+ if (thisEvent.IsVetoed())
+ {
+ webKitCtrl->m_busy = false;
+ return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
+ }
+ else
+ {
+ return WEBKIT_NAVIGATION_RESPONSE_ACCEPT;
+ }
+}
+
+static gboolean
+wxgtk_webkitctrl_error (WebKitWebView *web_view,
+ WebKitWebFrame *web_frame,
+ gchar *uri,
+ gpointer web_error,
+ wxWebViewGTKWebKit* webKitWindow)
+{
+ webKitWindow->m_busy = false;
+ wxWebNavigationError type = wxWEB_NAV_ERR_OTHER;
+
+ GError* error = (GError*)web_error;
+ wxString description(error->message, wxConvUTF8);
+
+ if (strcmp(g_quark_to_string(error->domain), "soup_http_error_quark") == 0)
+ {
+ switch (error->code)
+ {
+ case SOUP_STATUS_CANCELLED:
+ type = wxWEB_NAV_ERR_USER_CANCELLED;
+ break;
+
+ case SOUP_STATUS_CANT_RESOLVE:
+ case SOUP_STATUS_NOT_FOUND:
+ type = wxWEB_NAV_ERR_NOT_FOUND;
+ break;
+
+ case SOUP_STATUS_CANT_RESOLVE_PROXY:
+ case SOUP_STATUS_CANT_CONNECT:
+ case SOUP_STATUS_CANT_CONNECT_PROXY:
+ case SOUP_STATUS_SSL_FAILED:
+ case SOUP_STATUS_IO_ERROR:
+ type = wxWEB_NAV_ERR_CONNECTION;
+ break;
+
+ case SOUP_STATUS_MALFORMED:
+ //case SOUP_STATUS_TOO_MANY_REDIRECTS:
+ type = wxWEB_NAV_ERR_REQUEST;
+ break;
+
+ //case SOUP_STATUS_NO_CONTENT:
+ //case SOUP_STATUS_RESET_CONTENT:
+
+ case SOUP_STATUS_BAD_REQUEST:
+ type = wxWEB_NAV_ERR_REQUEST;
+ break;
+
+ case SOUP_STATUS_UNAUTHORIZED:
+ case SOUP_STATUS_FORBIDDEN:
+ type = wxWEB_NAV_ERR_AUTH;
+ break;
+
+ case SOUP_STATUS_METHOD_NOT_ALLOWED:
+ case SOUP_STATUS_NOT_ACCEPTABLE:
+ type = wxWEB_NAV_ERR_SECURITY;
+ break;
+
+ case SOUP_STATUS_PROXY_AUTHENTICATION_REQUIRED:
+ type = wxWEB_NAV_ERR_AUTH;
+ break;
+
+ case SOUP_STATUS_REQUEST_TIMEOUT:
+ type = wxWEB_NAV_ERR_CONNECTION;
+ break;
+
+ //case SOUP_STATUS_PAYMENT_REQUIRED:
+ case SOUP_STATUS_REQUEST_ENTITY_TOO_LARGE:
+ case SOUP_STATUS_REQUEST_URI_TOO_LONG:
+ case SOUP_STATUS_UNSUPPORTED_MEDIA_TYPE:
+ type = wxWEB_NAV_ERR_REQUEST;
+ break;
+
+ case SOUP_STATUS_BAD_GATEWAY:
+ case SOUP_STATUS_SERVICE_UNAVAILABLE:
+ case SOUP_STATUS_GATEWAY_TIMEOUT:
+ type = wxWEB_NAV_ERR_CONNECTION;
+ break;
+
+ case SOUP_STATUS_HTTP_VERSION_NOT_SUPPORTED:
+ type = wxWEB_NAV_ERR_REQUEST;
+ break;
+ //case SOUP_STATUS_INSUFFICIENT_STORAGE:
+ //case SOUP_STATUS_NOT_EXTENDED:
+ }
+ }
+ else if (strcmp(g_quark_to_string(error->domain),
+ "webkit-network-error-quark") == 0)
+ {
+ switch (error->code)
+ {
+ //WEBKIT_NETWORK_ERROR_FAILED:
+ //WEBKIT_NETWORK_ERROR_TRANSPORT:
+
+ case WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL:
+ type = wxWEB_NAV_ERR_REQUEST;
+ break;
+
+ case WEBKIT_NETWORK_ERROR_CANCELLED:
+ type = wxWEB_NAV_ERR_USER_CANCELLED;
+ break;
+
+ case WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST:
+ type = wxWEB_NAV_ERR_NOT_FOUND;
+ break;
+ }
+ }
+ else if (strcmp(g_quark_to_string(error->domain),
+ "webkit-policy-error-quark") == 0)
+ {
+ switch (error->code)
+ {
+ //case WEBKIT_POLICY_ERROR_FAILED:
+ //case WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE:
+ //case WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL:
+ //case WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE:
+ case WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT:
+ type = wxWEB_NAV_ERR_SECURITY;
+ break;
+ }
+ }
+ /*
+ webkit_plugin_error_quark
+ else
+ {
+ printf("Error domain %s\n", g_quark_to_string(error->domain));
+ }
+ */
+
+ wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_ERROR,
+ webKitWindow->GetId(),
+ uri,
+ wxEmptyString,
+ false);
+ thisEvent.SetString(description);
+ thisEvent.SetInt(type);
+
+ if (webKitWindow && webKitWindow->GetEventHandler())
+ {
+ webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+ }
+
+ return FALSE;
+}
+
+
+} // extern "C"
+
+//-----------------------------------------------------------------------------
+// wxWebViewGTKWebKit
+//-----------------------------------------------------------------------------
+
+//IMPLEMENT_DYNAMIC_CLASS(wxWebViewGTKWebKit, wxControl)
+
+bool wxWebViewGTKWebKit::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxString &url,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
+{
+ m_ready = false;
+ m_busy = false;
+
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+ {
+ wxFAIL_MSG( wxT("wxWebViewGTKWebKit creation failed") );
+ return false;
+ }
+
+ GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ web_view = webkit_web_view_new ();
+ g_object_ref(web_view); // TODO: check memory management
+
+ m_widget = scrolled_window;
+ g_object_ref(m_widget); // TODO: check memory management
+
+ /* Place the WebKitWebView in the GtkScrolledWindow */
+ gtk_container_add (GTK_CONTAINER (scrolled_window), web_view);
+ gtk_widget_show(m_widget);
+ gtk_widget_show(web_view);
+
+ g_signal_connect_after(web_view, "notify::load-status",
+ G_CALLBACK(wxgtk_webkitctrl_load_status_callback),
+ this);
+ g_signal_connect_after(web_view, "navigation-requested",
+ G_CALLBACK(wxgtk_webkitctrl_navigation_requ_callback),
+ this);
+ g_signal_connect_after(web_view, "load-error",
+ G_CALLBACK(wxgtk_webkitctrl_error),
+ this);
+
+ // this signal can be added if we care about new frames open requests
+ //g_signal_connect_after(web_view, "new-window-policy-decision-requested",
+ // G_CALLBACK(...), this);
+
+ m_parent->DoAddChild( this );
+
+ PostCreation(size);
+
+ /* Open a webpage */
+ webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), url);
+
+ m_ready = true;
+
+ return true;
+}
+
+bool wxWebViewGTKWebKit::Enable( bool enable )
+{
+ if (!wxControl::Enable(enable))
+ return false;
+
+ gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
+
+ //if (enable)
+ // GTKFixSensitivity();
+
+ return true;
+}
+
+GdkWindow*
+wxWebViewGTKWebKit::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
+{
+ GdkWindow* window = gtk_widget_get_parent_window(m_widget);
+ return window;
+}
+
+void wxWebViewGTKWebKit::ZoomIn()
+{
+ webkit_web_view_zoom_in (WEBKIT_WEB_VIEW(web_view));
+}
+
+void wxWebViewGTKWebKit::ZoomOut()
+{
+ webkit_web_view_zoom_out (WEBKIT_WEB_VIEW(web_view));
+}
+
+void wxWebViewGTKWebKit::SetWebkitZoom(float level)
+{
+ webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW(web_view), level);
+}
+
+float wxWebViewGTKWebKit::GetWebkitZoom()
+{
+ return webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW(web_view));
+}
+
+void wxWebViewGTKWebKit::Stop()
+{
+ webkit_web_view_stop_loading (WEBKIT_WEB_VIEW(web_view));
+}
+
+void wxWebViewGTKWebKit::Reload(wxWebViewReloadFlags flags)
+{
+ if (flags & wxWEB_VIEW_RELOAD_NO_CACHE)
+ {
+ webkit_web_view_reload_bypass_cache (WEBKIT_WEB_VIEW(web_view));
+ }
+ else
+ {
+ webkit_web_view_reload (WEBKIT_WEB_VIEW(web_view));
+ }
+}
+
+void wxWebViewGTKWebKit::LoadUrl(const wxString& url)
+{
+ webkit_web_view_open(WEBKIT_WEB_VIEW(web_view), wxGTK_CONV(loc));
+}
+
+
+void wxWebViewGTKWebKit::GoBack()
+{
+ webkit_web_view_go_back (WEBKIT_WEB_VIEW(web_view));
+}
+
+void wxWebViewGTKWebKit::GoForward()
+{
+ webkit_web_view_go_forward (WEBKIT_WEB_VIEW(web_view));
+}
+
+
+bool wxWebViewGTKWebKit::CanGoBack()
+{
+ return webkit_web_view_can_go_back (WEBKIT_WEB_VIEW(web_view));
+}
+
+
+bool wxWebViewGTKWebKit::CanGoForward()
+{
+ return webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW(web_view));
+}
+
+
+wxString wxWebViewGTKWebKit::GetCurrentURL()
+{
+ // FIXME: check which encoding the web kit control uses instead of
+ // assuming UTF8 (here and elsewhere too)
+ return wxString::FromUTF8(webkit_web_view_get_uri(
+ WEBKIT_WEB_VIEW(web_view)));
+}
+
+
+wxString wxWebViewGTKWebKit::GetCurrentTitle()
+{
+ return wxString::FromUTF8(webkit_web_view_get_title(
+ WEBKIT_WEB_VIEW(web_view)));
+}
+
+
+wxString wxWebViewGTKWebKit::GetPageSource()
+{
+ WebKitWebFrame* frame = webkit_web_view_get_main_frame(
+ WEBKIT_WEB_VIEW(web_view));
+ WebKitWebDataSource* src = webkit_web_frame_get_data_source (frame);
+
+ // TODO: check encoding with
+ // const gchar*
+ // webkit_web_data_source_get_encoding(WebKitWebDataSource *data_source);
+ return wxString(webkit_web_data_source_get_data (src)->str, wxConvUTF8);
+}
+
+
+wxWebViewZoom wxWebViewGTKWebKit::GetZoom()
+{
+ float zoom = GetWebkitZoom();
+
+ // arbitrary way to map float zoom to our common zoom enum
+ if (zoom <= 0.65)
+ {
+ return wxWEB_VIEW_ZOOM_TINY;
+ }
+ else if (zoom > 0.65 && zoom <= 0.90)
+ {
+ return wxWEB_VIEW_ZOOM_SMALL;
+ }
+ else if (zoom > 0.90 && zoom <= 1.15)
+ {
+ return wxWEB_VIEW_ZOOM_MEDIUM;
+ }
+ else if (zoom > 1.15 && zoom <= 1.45)
+ {
+ return wxWEB_VIEW_ZOOM_LARGE;
+ }
+ else if (zoom > 1.45)
+ {
+ return wxWEB_VIEW_ZOOM_LARGEST;
+ }
+
+ // to shut up compilers, this can never be reached logically
+ wxASSERT(false);
+ return wxWEB_VIEW_ZOOM_MEDIUM;
+}
+
+
+void wxWebViewGTKWebKit::SetZoom(wxWebViewZoom zoom)
+{
+ // arbitrary way to map our common zoom enum to float zoom
+ switch (zoom)
+ {
+ case wxWEB_VIEW_ZOOM_TINY:
+ SetWebkitZoom(0.6f);
+ break;
+
+ case wxWEB_VIEW_ZOOM_SMALL:
+ SetWebkitZoom(0.8f);
+ break;
+
+ case wxWEB_VIEW_ZOOM_MEDIUM:
+ SetWebkitZoom(1.0f);
+ break;
+
+ case wxWEB_VIEW_ZOOM_LARGE:
+ SetWebkitZoom(1.3);
+ break;
+
+ case wxWEB_VIEW_ZOOM_LARGEST:
+ SetWebkitZoom(1.6);
+ break;
+
+ default:
+ wxASSERT(false);
+ }
+}
+
+void wxWebViewGTKWebKit::SetZoomType(wxWebViewZoomType type)
+{
+ webkit_web_view_set_full_content_zoom(WEBKIT_WEB_VIEW(web_view),
+ (type == wxWEB_VIEW_ZOOM_TYPE_LAYOUT ?
+ TRUE : FALSE));
+}
+
+wxWebViewZoomType wxWebViewGTKWebKit::GetZoomType() const
+{
+ gboolean fczoom = webkit_web_view_get_full_content_zoom(
+ WEBKIT_WEB_VIEW(web_view));
+
+ if (fczoom) return wxWEB_VIEW_ZOOM_TYPE_LAYOUT;
+ else return wxWEB_VIEW_ZOOM_TYPE_TEXT;
+}
+
+bool wxWebViewGTKWebKit::CanSetZoomType(wxWebViewZoomType) const
+{
+ // this port supports all zoom types
+ return true;
+}
+
+void wxWebViewGTKWebKit::SetPage(const wxString& html, const wxString& baseUri)
+{
+ webkit_web_view_load_string (WEBKIT_WEB_VIEW(web_view),
+ html.mb_str(wxConvUTF8),
+ "text/html",
+ "UTF-8",
+ baseUri.mb_str(wxConvUTF8));
+}
+
+void wxWebViewGTKWebKit::Print()
+{
+ WebKitWebFrame* frame = webkit_web_view_get_main_frame(
+ WEBKIT_WEB_VIEW(web_view));
+ webkit_web_frame_print (frame);
+
+ // GtkPrintOperationResult webkit_web_frame_print_full
+ // (WebKitWebFrame *frame,
+ // GtkPrintOperation *operation,
+ // GtkPrintOperationAction action,
+ // GError **error);
+
+}
+
+
+bool wxWebViewGTKWebKit::IsBusy()
+{
+ return m_busy;
+
+ // This code looks nice but returns true after a page was cancelled
+ /*
+ WebKitLoadStatus status = webkit_web_view_get_load_status
+ (WEBKIT_WEB_VIEW(web_view));
+
+
+#if WEBKIT_CHECK_VERSION(1,1,16)
+ // WEBKIT_LOAD_FAILED is new in webkit 1.1.16
+ if (status == WEBKIT_LOAD_FAILED)
+ {
+ return false;
+ }
+#endif
+ if (status == WEBKIT_LOAD_FINISHED)
+ {
+ return false;
+ }
+
+ return true;
+ */
+}
+
+// static
+wxVisualAttributes
+wxWebViewGTKWebKit::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ return GetDefaultAttributesFromGTKWidget(webkit_web_view_new);
+}
+
+
+#endif // wxHAVE_WEB_BACKEND_GTK_WEBKIT
diff --git a/src/msw/webviewie.cpp b/src/msw/webviewie.cpp
new file mode 100644
index 0000000000..e6f1246ce3
--- /dev/null
+++ b/src/msw/webviewie.cpp
@@ -0,0 +1,667 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: src/msw/webviewie.cpp
+// Purpose: wxMSW wxWebViewIE class implementation for web view component
+// Author: Marianne Gagnon
+// Id: $Id$
+// Copyright: (c) 2010 Marianne Gagnon
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/msw/webview.h"
+
+#if wxHAVE_WEB_BACKEND_IE
+
+#include
+#include
+#include
+#include
+#include
+
+// FIXME: Seems like MINGW does not have these, how to handle cleanly?
+#define DISPID_COMMANDSTATECHANGE 105
+typedef enum CommandStateChangeConstants {
+ CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF,
+ CSC_NAVIGATEFORWARD = 0x1,
+ CSC_NAVIGATEBACK = 0x2
+} CommandStateChangeConstants;
+
+
+// FIXME: Seems like MINGW does not have these, how to handle cleanly?
+#define DISPID_NAVIGATECOMPLETE2 252
+#define DISPID_NAVIGATEERROR 271
+#define OLECMDID_OPTICAL_ZOOM 63
+#define INET_E_ERROR_FIRST 0x800C0002L
+#define INET_E_INVALID_URL 0x800C0002L
+#define INET_E_NO_SESSION 0x800C0003L
+#define INET_E_CANNOT_CONNECT 0x800C0004L
+#define INET_E_RESOURCE_NOT_FOUND 0x800C0005L
+#define INET_E_OBJECT_NOT_FOUND 0x800C0006L
+#define INET_E_DATA_NOT_AVAILABLE 0x800C0007L
+#define INET_E_DOWNLOAD_FAILURE 0x800C0008L
+#define INET_E_AUTHENTICATION_REQUIRED 0x800C0009L
+#define INET_E_NO_VALID_MEDIA 0x800C000AL
+#define INET_E_CONNECTION_TIMEOUT 0x800C000BL
+#define INET_E_INVALID_REQUEST 0x800C000CL
+#define INET_E_UNKNOWN_PROTOCOL 0x800C000DL
+#define INET_E_SECURITY_PROBLEM 0x800C000EL
+#define INET_E_CANNOT_LOAD_DATA 0x800C000FL
+#define INET_E_CANNOT_INSTANTIATE_OBJECT 0x800C0010L
+#define INET_E_QUERYOPTION_UNKNOWN 0x800C0013L
+#define INET_E_REDIRECT_FAILED 0x800C0014L
+#define INET_E_REDIRECT_TO_DIR 0x800C0015L
+#define INET_E_CANNOT_LOCK_REQUEST 0x800C0016L
+#define INET_E_USE_EXTEND_BINDING 0x800C0017L
+#define INET_E_TERMINATED_BIND 0x800C0018L
+#define INET_E_INVALID_CERTIFICATE 0x800C0019L
+#define INET_E_CODE_DOWNLOAD_DECLINED 0x800C0100L
+#define INET_E_RESULT_DISPATCHED 0x800C0200L
+#define INET_E_CANNOT_REPLACE_SFP_FILE 0x800C0300L
+#define INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY 0x800C0500L
+#define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L
+
+#define REFRESH_COMPLETELY 3
+
+BEGIN_EVENT_TABLE(wxWebViewIE, wxControl)
+EVT_ACTIVEX(wxID_ANY, wxWebViewIE::onActiveXEvent)
+EVT_ERASE_BACKGROUND(wxWebViewIE::onEraseBg)
+END_EVENT_TABLE()
+
+bool wxWebViewIE::Create(wxWindow* parent,
+ wxWindowID id,
+ const wxString& url,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
+{
+ if (!wxControl::Create(parent, id, pos, size, style,
+ wxDefaultValidator, name))
+ {
+ return false;
+ }
+
+ m_webBrowser = NULL;
+ m_canNavigateBack = false;
+ m_canNavigateForward = false;
+ m_isBusy = false;
+
+ if (::CoCreateInstance(CLSID_WebBrowser, NULL,
+ CLSCTX_INPROC_SERVER, // CLSCTX_INPROC,
+ IID_IWebBrowser2 , (void**)&m_webBrowser) != 0)
+ {
+ wxLogError("Failed to initialize IE, CoCreateInstance returned an error");
+ return false;
+ }
+
+ m_ie.SetDispatchPtr(m_webBrowser); // wxAutomationObject will release itself
+
+ m_webBrowser->put_RegisterAsBrowser(VARIANT_TRUE);
+ m_webBrowser->put_RegisterAsDropTarget(VARIANT_TRUE);
+ //m_webBrowser->put_Silent(VARIANT_FALSE);
+
+ m_container = new wxActiveXContainer(this, IID_IWebBrowser2, m_webBrowser);
+
+ SetBackgroundStyle(wxBG_STYLE_PAINT);
+ SetDoubleBuffered(true);
+ return true;
+}
+
+
+void wxWebViewIE::LoadUrl(const wxString& url)
+{
+ wxVariant out = m_ie.CallMethod("Navigate", (BSTR) url.wc_str(),
+ NULL, NULL, NULL, NULL);
+
+ // FIXME: why is out value null??
+ //(HRESULT)(out.GetLong()) == S_OK;
+}
+
+void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
+{
+ LoadUrl("about:blank");
+
+ // Let the wx events generated for navigation events be processed, so
+ // that the underlying IE component completes its Document object.
+ // FIXME: calling wxYield is not elegant nor very reliable probably
+ wxYield();
+
+ wxVariant documentVariant = m_ie.GetProperty("Document");
+ void* documentPtr = documentVariant.GetVoidPtr();
+
+ wxASSERT (documentPtr != NULL);
+
+ // TODO: consider the "baseUrl" parameter if possible
+ // TODO: consider encoding
+ BSTR bstr = SysAllocString(html.wc_str());
+
+ // Creates a new one-dimensional array
+ SAFEARRAY *psaStrings = SafeArrayCreateVector(VT_VARIANT, 0, 1);
+ if (psaStrings != NULL)
+ {
+ VARIANT *param;
+ HRESULT hr = SafeArrayAccessData(psaStrings, (LPVOID*)¶m);
+ param->vt = VT_BSTR;
+ param->bstrVal = bstr;
+
+ hr = SafeArrayUnaccessData(psaStrings);
+
+ IHTMLDocument2* document = (IHTMLDocument2*)documentPtr;
+ document->write(psaStrings);
+
+ // SafeArrayDestroy calls SysFreeString for each BSTR
+ SafeArrayDestroy(psaStrings);
+ }
+ else
+ {
+ wxLogError("wxWebViewIE::SetPage() : psaStrings is NULL");
+ }
+
+}
+
+wxString wxWebViewIE::GetPageSource()
+{
+ wxVariant documentVariant = m_ie.GetProperty("Document");
+ void* documentPtr = documentVariant.GetVoidPtr();
+
+ if (documentPtr == NULL)
+ {
+ return wxEmptyString;
+ }
+
+ IHTMLDocument2* document = (IHTMLDocument2*)documentPtr;
+
+ IHTMLElement *bodyTag = NULL;
+ IHTMLElement *htmlTag = NULL;
+ document->get_body(&bodyTag);
+ wxASSERT(bodyTag != NULL);
+
+ document->Release();
+ bodyTag->get_parentElement(&htmlTag);
+ wxASSERT(htmlTag != NULL);
+
+ BSTR bstr;
+ htmlTag->get_outerHTML(&bstr);
+
+ bodyTag->Release();
+ htmlTag->Release();
+
+ //wxMessageBox(wxString(bstr));
+
+ // TODO: check encoding
+ return wxString(bstr);
+}
+
+// FIXME? retrieve OLECMDID_GETZOOMRANGE instead of hardcoding range 0-4
+wxWebViewZoom wxWebViewIE::GetZoom()
+{
+ const int zoom = GetIETextZoom();
+
+ switch (zoom)
+ {
+ case 0:
+ return wxWEB_VIEW_ZOOM_TINY;
+ break;
+ case 1:
+ return wxWEB_VIEW_ZOOM_SMALL;
+ break;
+ case 2:
+ return wxWEB_VIEW_ZOOM_MEDIUM;
+ break;
+ case 3:
+ return wxWEB_VIEW_ZOOM_LARGE;
+ break;
+ case 4:
+ return wxWEB_VIEW_ZOOM_LARGEST;
+ break;
+ default:
+ wxASSERT(false);
+ return wxWEB_VIEW_ZOOM_MEDIUM;
+ }
+}
+void wxWebViewIE::SetZoom(wxWebViewZoom zoom)
+{
+ // I know I could cast from enum to int since wxWebViewZoom happens to
+ // match with IE's zoom levels, but I don't like doing that, what if enum
+ // values change...
+ switch (zoom)
+ {
+ case wxWEB_VIEW_ZOOM_TINY:
+ SetIETextZoom(0);
+ break;
+ case wxWEB_VIEW_ZOOM_SMALL:
+ SetIETextZoom(1);
+ break;
+ case wxWEB_VIEW_ZOOM_MEDIUM:
+ SetIETextZoom(2);
+ break;
+ case wxWEB_VIEW_ZOOM_LARGE:
+ SetIETextZoom(3);
+ break;
+ case wxWEB_VIEW_ZOOM_LARGEST:
+ SetIETextZoom(4);
+ break;
+ default:
+ wxASSERT(false);
+ }
+}
+
+void wxWebViewIE::SetIETextZoom(int level)
+{
+ VARIANT zoomVariant;
+ VariantInit (&zoomVariant);
+ V_VT(&zoomVariant) = VT_I4;
+ V_I4(&zoomVariant) = level;
+
+ HRESULT result = m_webBrowser->ExecWB(OLECMDID_ZOOM,
+ OLECMDEXECOPT_DONTPROMPTUSER,
+ &zoomVariant, NULL);
+ wxASSERT (result == S_OK);
+
+ VariantClear (&zoomVariant);
+}
+
+int wxWebViewIE::GetIETextZoom()
+{
+ VARIANT zoomVariant;
+ VariantInit (&zoomVariant);
+ V_VT(&zoomVariant) = VT_I4;
+ V_I4(&zoomVariant) = 4;
+
+ HRESULT result = m_webBrowser->ExecWB(OLECMDID_ZOOM,
+ OLECMDEXECOPT_DONTPROMPTUSER,
+ NULL, &zoomVariant);
+ wxASSERT (result == S_OK);
+
+ int zoom = V_I4(&zoomVariant);
+ // wxMessageBox(wxString::Format("Zoom : %i", zoom));
+ VariantClear (&zoomVariant);
+
+ return zoom;
+}
+
+void wxWebViewIE::SetIEOpticalZoom(float zoom)
+{
+ // TODO: add support for optical zoom (IE7+ only)
+
+ // TODO: get range from OLECMDID_OPTICAL_GETZOOMRANGE instead of hardcoding?
+ wxASSERT(zoom >= 10.0f);
+ wxASSERT(zoom <= 1000.0f);
+
+ VARIANT zoomVariant;
+ VariantInit (&zoomVariant);
+ V_VT(&zoomVariant) = VT_I4;
+ V_I4(&zoomVariant) = (zoom * 100.0f);
+
+ HRESULT result = m_webBrowser->ExecWB((OLECMDID)OLECMDID_OPTICAL_ZOOM,
+ OLECMDEXECOPT_DODEFAULT,
+ &zoomVariant,
+ NULL);
+ wxASSERT (result == S_OK);
+}
+
+float wxWebViewIE::GetIEOpticalZoom()
+{
+ // TODO: add support for optical zoom (IE7+ only)
+
+ VARIANT zoomVariant;
+ VariantInit (&zoomVariant);
+ V_VT(&zoomVariant) = VT_I4;
+ V_I4(&zoomVariant) = -1;
+
+ HRESULT result = m_webBrowser->ExecWB((OLECMDID)OLECMDID_OPTICAL_ZOOM,
+ OLECMDEXECOPT_DODEFAULT, NULL,
+ &zoomVariant);
+ wxASSERT (result == S_OK);
+
+ const int zoom = V_I4(&zoomVariant);
+ VariantClear (&zoomVariant);
+
+ return zoom / 100.0f;
+}
+
+void wxWebViewIE::SetZoomType(wxWebViewZoomType)
+{
+ // TODO: add support for optical zoom (IE7+ only)
+ wxASSERT(false);
+}
+
+wxWebViewZoomType wxWebViewIE::GetZoomType() const
+{
+ // TODO: add support for optical zoom (IE7+ only)
+ return wxWEB_VIEW_ZOOM_TYPE_TEXT;
+}
+
+bool wxWebViewIE::CanSetZoomType(wxWebViewZoomType) const
+{
+ // both are supported
+ // TODO: IE6 only supports text zoom, check if it's IE6 first
+ return true;
+}
+
+void wxWebViewIE::Print()
+{
+ m_webBrowser->ExecWB(OLECMDID_PRINTPREVIEW,
+ OLECMDEXECOPT_DODEFAULT, NULL, NULL);
+}
+
+void wxWebViewIE::GoBack()
+{
+ wxVariant out = m_ie.CallMethod("GoBack");
+
+ // FIXME: why is out value null??
+ //return (HRESULT)(out.GetLong()) == S_OK;
+}
+
+void wxWebViewIE::GoForward()
+{
+ wxVariant out = m_ie.CallMethod("GoForward");
+
+ // FIXME: why is out value null??
+ //return (HRESULT)(out.GetLong()) == S_OK;
+}
+
+void wxWebViewIE::Stop()
+{
+ wxVariant out = m_ie.CallMethod("Stop");
+
+ // FIXME: why is out value null??
+ //return (HRESULT)(out.GetLong()) == S_OK;
+}
+
+
+void wxWebViewIE::Reload(wxWebViewReloadFlags flags)
+{
+ wxVariant out;
+
+ if (flags & wxWEB_VIEW_RELOAD_NO_CACHE)
+ {
+ VARIANTARG level;
+ level.vt = VT_I2;
+ level.iVal = 3;
+ out = m_ie.CallMethod("Refresh2", &level);
+ }
+ else
+ {
+ out = m_ie.CallMethod("Refresh");
+ }
+
+ if (out.GetType() != "null")
+ {
+ wxMessageBox("Non-null return message : " + out.GetType());
+ }
+}
+
+bool wxWebViewIE::IsOfflineMode()
+{
+ wxVariant out = m_ie.GetProperty("Offline");
+
+ wxASSERT(out.GetType() == "bool");
+
+ return out.GetBool();
+}
+
+void wxWebViewIE::SetOfflineMode(bool offline)
+{
+ // FIXME: the wxWidgets docs do not really document what the return
+ // parameter of PutProperty is
+ const bool success = m_ie.PutProperty("Offline", (offline ?
+ VARIANT_TRUE :
+ VARIANT_FALSE));
+ wxASSERT(success);
+}
+
+bool wxWebViewIE::IsBusy()
+{
+ if (m_isBusy) return true;
+
+ wxVariant out = m_ie.GetProperty("Busy");
+
+ wxASSERT(out.GetType() == "bool");
+
+ return out.GetBool();
+}
+
+wxString wxWebViewIE::GetCurrentURL()
+{
+ wxVariant out = m_ie.GetProperty("LocationURL");
+
+ wxASSERT(out.GetType() == "string");
+ return out.GetString();
+}
+
+wxString wxWebViewIE::GetCurrentTitle()
+{
+ wxVariant out = m_ie.GetProperty("LocationName");
+
+ wxASSERT(out.GetType() == "string");
+ return out.GetString();
+}
+
+void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
+{
+ if (m_webBrowser == NULL) return;
+
+ switch (evt.GetDispatchId())
+ {
+ case DISPID_BEFORENAVIGATE2:
+ {
+ m_isBusy = true;
+
+ wxString url = evt[1].GetString();
+ wxString target = evt[3].GetString();
+
+ wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
+ GetId(), url, target, true);
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
+
+ if (event.IsVetoed())
+ {
+ wxActiveXEventNativeMSW* nativeParams =
+ evt.GetNativeParameters();
+ *V_BOOLREF(&nativeParams->pDispParams->rgvarg[0]) = VARIANT_TRUE;
+ }
+
+ // at this point, either the navigation event has been cancelled
+ // and we're not busy, either it was accepted and IWebBrowser2's
+ // Busy property will be true; so we don't need our override
+ // flag anymore.
+ m_isBusy = false;
+
+ break;
+ }
+
+ case DISPID_NAVIGATECOMPLETE2:
+ {
+ wxString url = evt[1].GetString();
+ // TODO: set target parameter if possible
+ wxString target = wxEmptyString;
+ wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+ GetId(), url, target, false);
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
+ break;
+ }
+
+ case DISPID_PROGRESSCHANGE:
+ {
+ // download progress
+ break;
+ }
+
+ case DISPID_DOCUMENTCOMPLETE:
+ {
+ wxString url = evt[1].GetString();
+ // TODO: set target parameter if possible
+ wxString target = wxEmptyString;
+ wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, GetId(),
+ url, target, false);
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
+ break;
+ }
+
+ case DISPID_STATUSTEXTCHANGE:
+ {
+ break;
+ }
+
+ case DISPID_TITLECHANGE:
+ {
+ break;
+ }
+
+ case DISPID_NAVIGATEERROR:
+ {
+ wxWebNavigationError errorType = wxWEB_NAV_ERR_OTHER;
+ wxString errorCode = "?";
+ switch (evt[3].GetLong())
+ {
+ case INET_E_INVALID_URL: // (0x800C0002L or -2146697214)
+ errorCode = "INET_E_INVALID_URL";
+ errorType = wxWEB_NAV_ERR_REQUEST;
+ break;
+ case INET_E_NO_SESSION: // (0x800C0003L or -2146697213)
+ errorCode = "INET_E_NO_SESSION";
+ errorType = wxWEB_NAV_ERR_CONNECTION;
+ break;
+ case INET_E_CANNOT_CONNECT: // (0x800C0004L or -2146697212)
+ errorCode = "INET_E_CANNOT_CONNECT";
+ errorType = wxWEB_NAV_ERR_CONNECTION;
+ break;
+ case INET_E_RESOURCE_NOT_FOUND: // (0x800C0005L or -2146697211)
+ errorCode = "INET_E_RESOURCE_NOT_FOUND";
+ errorType = wxWEB_NAV_ERR_NOT_FOUND;
+ break;
+ case INET_E_OBJECT_NOT_FOUND: // (0x800C0006L or -2146697210)
+ errorCode = "INET_E_OBJECT_NOT_FOUND";
+ errorType = wxWEB_NAV_ERR_NOT_FOUND;
+ break;
+ case INET_E_DATA_NOT_AVAILABLE: // (0x800C0007L or -2146697209)
+ errorCode = "INET_E_DATA_NOT_AVAILABLE";
+ errorType = wxWEB_NAV_ERR_NOT_FOUND;
+ break;
+ case INET_E_DOWNLOAD_FAILURE: // (0x800C0008L or -2146697208)
+ errorCode = "INET_E_DOWNLOAD_FAILURE";
+ errorType = wxWEB_NAV_ERR_CONNECTION;
+ break;
+ case INET_E_AUTHENTICATION_REQUIRED: // (0x800C0009L or -2146697207)
+ errorCode = "INET_E_AUTHENTICATION_REQUIRED";
+ errorType = wxWEB_NAV_ERR_AUTH;
+ break;
+ case INET_E_NO_VALID_MEDIA: // (0x800C000AL or -2146697206)
+ errorCode = "INET_E_NO_VALID_MEDIA";
+ errorType = wxWEB_NAV_ERR_REQUEST;
+ break;
+ case INET_E_CONNECTION_TIMEOUT: // (0x800C000BL or -2146697205)
+ errorCode = "INET_E_CONNECTION_TIMEOUT";
+ errorType = wxWEB_NAV_ERR_CONNECTION;
+ break;
+ case INET_E_INVALID_REQUEST: // (0x800C000CL or -2146697204)
+ errorCode = "INET_E_INVALID_REQUEST";
+ errorType = wxWEB_NAV_ERR_REQUEST;
+ break;
+ case INET_E_UNKNOWN_PROTOCOL: // (0x800C000DL or -2146697203)
+ errorCode = "INET_E_UNKNOWN_PROTOCOL";
+ errorType = wxWEB_NAV_ERR_REQUEST;
+ break;
+ case INET_E_SECURITY_PROBLEM: // (0x800C000EL or -2146697202)
+ errorCode = "INET_E_SECURITY_PROBLEM";
+ errorType = wxWEB_NAV_ERR_SECURITY;
+ break;
+ case INET_E_CANNOT_LOAD_DATA: // (0x800C000FL or -2146697201)
+ errorCode = "INET_E_CANNOT_LOAD_DATA";
+ errorType = wxWEB_NAV_ERR_OTHER;
+ break;
+ case INET_E_CANNOT_INSTANTIATE_OBJECT:
+ // CoCreateInstance will return an error code if this happens,
+ // we'll handle this above.
+ return;
+ break;
+ case INET_E_REDIRECT_FAILED: // (0x800C0014L or -2146697196)
+ errorCode = "INET_E_REDIRECT_FAILED";
+ errorType = wxWEB_NAV_ERR_OTHER;
+ break;
+ case INET_E_REDIRECT_TO_DIR: // (0x800C0015L or -2146697195)
+ errorCode = "INET_E_REDIRECT_TO_DIR";
+ errorType = wxWEB_NAV_ERR_REQUEST;
+ break;
+ case INET_E_CANNOT_LOCK_REQUEST: // (0x800C0016L or -2146697194)
+ errorCode = "INET_E_CANNOT_LOCK_REQUEST";
+ errorType = wxWEB_NAV_ERR_OTHER;
+ break;
+ case INET_E_USE_EXTEND_BINDING: // (0x800C0017L or -2146697193)
+ errorCode = "INET_E_USE_EXTEND_BINDING";
+ errorType = wxWEB_NAV_ERR_OTHER;
+ break;
+ case INET_E_TERMINATED_BIND: // (0x800C0018L or -2146697192)
+ errorCode = "INET_E_TERMINATED_BIND";
+ errorType = wxWEB_NAV_ERR_OTHER;
+ break;
+ case INET_E_INVALID_CERTIFICATE: // (0x800C0019L or -2146697191)
+ errorCode = "INET_E_INVALID_CERTIFICATE";
+ errorType = wxWEB_NAV_ERR_CERTIFICATE;
+ break;
+ case INET_E_CODE_DOWNLOAD_DECLINED: // (0x800C0100L or -2146696960)
+ errorCode = "INET_E_CODE_DOWNLOAD_DECLINED";
+ errorType = wxWEB_NAV_ERR_USER_CANCELLED;
+ break;
+ case INET_E_RESULT_DISPATCHED: // (0x800C0200L or -2146696704)
+ // cancel request cancelled...
+ errorCode = "INET_E_RESULT_DISPATCHED";
+ errorType = wxWEB_NAV_ERR_OTHER;
+ break;
+ case INET_E_CANNOT_REPLACE_SFP_FILE: // (0x800C0300L or -2146696448)
+ errorCode = "INET_E_CANNOT_REPLACE_SFP_FILE";
+ errorType = wxWEB_NAV_ERR_SECURITY;
+ break;
+ case INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY:
+ errorCode = "INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY";
+ errorType = wxWEB_NAV_ERR_SECURITY;
+ break;
+ case INET_E_CODE_INSTALL_SUPPRESSED:
+ errorCode = "INET_E_CODE_INSTALL_SUPPRESSED";
+ errorType = wxWEB_NAV_ERR_SECURITY;
+ break;
+ }
+
+ wxString url = evt[1].GetString();
+ wxString target = evt[2].GetString();
+ wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(),
+ url, target, false);
+ event.SetEventObject(this);
+ event.SetInt(errorType);
+ event.SetString(errorCode);
+ HandleWindowEvent(event);
+ break;
+ }
+
+ case DISPID_COMMANDSTATECHANGE:
+ {
+ long commandId = evt[0].GetLong();
+ bool enable = evt[1].GetBool();
+ if (commandId == CSC_NAVIGATEBACK)
+ {
+ m_canNavigateBack = enable;
+ }
+ else if (commandId == CSC_NAVIGATEFORWARD)
+ {
+ m_canNavigateForward = enable;
+ }
+ }
+
+ /*
+ case DISPID_NEWWINDOW2:
+ //case DISPID_NEWWINDOW3:
+ {
+ wxLogMessage("DISPID_NEWWINDOW2\n");
+ wxActiveXEventNativeMSW* nativeParams = evt.GetNativeParameters();
+ // Cancel the attempt to open a new window
+ *V_BOOLREF(&nativeParams->pDispParams->rgvarg[0]) = VARIANT_TRUE;
+ }*/
+ }
+
+ evt.Skip();
+}
+
+#endif
diff --git a/src/osx/webview.mm b/src/osx/webview.mm
new file mode 100644
index 0000000000..83b13363b8
--- /dev/null
+++ b/src/osx/webview.mm
@@ -0,0 +1,1208 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: src/osx/webkit.mm
+// Purpose: wxOSXWebKitCtrl - embeddable web kit control,
+// OS X implementation of web view component
+// Author: Jethro Grassie / Kevin Ollivier / Marianne Gagnon
+// Modified by:
+// Created: 2004-4-16
+// RCS-ID: $Id: webkit.mm 64943 2010-07-13 13:29:58Z VZ $
+// Copyright: (c) Jethro Grassie / Kevin Ollivier / Marianne Gagnon
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// http://developer.apple.com/mac/library/documentation/Cocoa/Reference/WebKit/Classes/WebView_Class/Reference/Reference.html
+
+#include "wx/osx/webview.h"
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/wx.h"
+#endif
+
+#if wxHAVE_WEB_BACKEND_OSX_WEBKIT
+
+#ifdef __WXCOCOA__
+#include "wx/cocoa/autorelease.h"
+#else
+#include "wx/osx/private.h"
+
+#include
+#include
+#include
+#endif
+
+#include
+
+// FIXME: find cleaner way to find the wxWidgets ID of a webview than this hack
+#include