Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the web sample to allow choosing between different types of zoom, text or layout.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-07-14 12:53:28 +00:00
parent cd4e467319
commit 87d482ec3f
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
samples/web/web.cpp
View File

@@ -77,6 +77,7 @@ public:
void OnUndo(wxCommandEvent& evt); void OnUndo(wxCommandEvent& evt);
void OnRedo(wxCommandEvent& evt); void OnRedo(wxCommandEvent& evt);
void OnMode(wxCommandEvent& evt); void OnMode(wxCommandEvent& evt);
void OnZoomLayout(wxCommandEvent& evt);
private: private:
wxTextCtrl* m_url; wxTextCtrl* m_url;
@@ -90,6 +91,7 @@ private:
wxToolBarToolBase* m_toolbar_tools; wxToolBarToolBase* m_toolbar_tools;
wxMenu* m_tools_menu; wxMenu* m_tools_menu;
wxMenuItem* m_tools_layout;
wxMenuItem* m_tools_tiny; wxMenuItem* m_tools_tiny;
wxMenuItem* m_tools_small; wxMenuItem* m_tools_small;
wxMenuItem* m_tools_medium; wxMenuItem* m_tools_medium;
@@ -195,6 +197,7 @@ WebFrame::WebFrame() : wxFrame(NULL, wxID_ANY, "wxWebView Sample")
wxMenuItem* print = m_tools_menu->Append(wxID_ANY , _("Print")); wxMenuItem* print = m_tools_menu->Append(wxID_ANY , _("Print"));
wxMenuItem* viewSource = m_tools_menu->Append(wxID_ANY , _("View Source")); wxMenuItem* viewSource = m_tools_menu->Append(wxID_ANY , _("View Source"));
m_tools_menu->AppendSeparator(); m_tools_menu->AppendSeparator();
m_tools_layout = m_tools_menu->AppendCheckItem(wxID_ANY, _("Use Layout Zoom"));
m_tools_tiny = m_tools_menu->AppendCheckItem(wxID_ANY, _("Tiny")); m_tools_tiny = m_tools_menu->AppendCheckItem(wxID_ANY, _("Tiny"));
m_tools_small = m_tools_menu->AppendCheckItem(wxID_ANY, _("Small")); m_tools_small = m_tools_menu->AppendCheckItem(wxID_ANY, _("Small"));
m_tools_medium = m_tools_menu->AppendCheckItem(wxID_ANY, _("Medium")); m_tools_medium = m_tools_menu->AppendCheckItem(wxID_ANY, _("Medium"));
@@ -225,6 +228,8 @@ WebFrame::WebFrame() : wxFrame(NULL, wxID_ANY, "wxWebView Sample")
m_tools_handle_navigation->Check(); m_tools_handle_navigation->Check();
m_tools_handle_new_window->Check(); m_tools_handle_new_window->Check();
m_tools_enable_history->Check(); m_tools_enable_history->Check();
if(!m_browser->CanSetZoomType(wxWEB_VIEW_ZOOM_TYPE_LAYOUT))
m_tools_layout->Enable(false);
// Connect the toolbar events // Connect the toolbar events
@@ -259,6 +264,8 @@ WebFrame::WebFrame() : wxFrame(NULL, wxID_ANY, "wxWebView Sample")
wxCommandEventHandler(WebFrame::OnViewSourceRequest), NULL, this ); wxCommandEventHandler(WebFrame::OnViewSourceRequest), NULL, this );
Connect(print->GetId(), wxEVT_COMMAND_MENU_SELECTED, Connect(print->GetId(), wxEVT_COMMAND_MENU_SELECTED,
wxCommandEventHandler(WebFrame::OnPrint), NULL, this ); wxCommandEventHandler(WebFrame::OnPrint), NULL, this );
Connect(m_tools_layout->GetId(), wxEVT_COMMAND_MENU_SELECTED,
wxCommandEventHandler(WebFrame::OnZoomLayout), NULL, this );
Connect(m_tools_tiny->GetId(), wxEVT_COMMAND_MENU_SELECTED, Connect(m_tools_tiny->GetId(), wxEVT_COMMAND_MENU_SELECTED,
wxCommandEventHandler(WebFrame::OnSetZoom), NULL, this ); wxCommandEventHandler(WebFrame::OnSetZoom), NULL, this );
Connect(m_tools_small->GetId(), wxEVT_COMMAND_MENU_SELECTED, Connect(m_tools_small->GetId(), wxEVT_COMMAND_MENU_SELECTED,
@@ -583,6 +590,14 @@ void WebFrame::OnSetZoom(wxCommandEvent& evt)
} }
} }
void WebFrame::OnZoomLayout(wxCommandEvent& evt)
{
if(m_tools_layout->IsChecked())
m_browser->SetZoomType(wxWEB_VIEW_ZOOM_TYPE_LAYOUT);
else
m_browser->SetZoomType(wxWEB_VIEW_ZOOM_TYPE_TEXT);
}
/** /**
* Callback invoked when a loading error occurs * Callback invoked when a loading error occurs
*/ */