From 3f6bd7c1c5d9c63824c6e74982ac4b583b31d9fe Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Thu, 19 Feb 2004 00:24:06 +0000 Subject: [PATCH 1/1] wxCleanup; Added accelerators for navigation (Alt+left, Alt+right). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/html/test/tables.htm | 2 +- samples/html/test/test.cpp | 250 ++++++++++++++++++----------------- 2 files changed, 127 insertions(+), 125 deletions(-) diff --git a/samples/html/test/tables.htm b/samples/html/test/tables.htm index b27eb5e3f5..781983ec27 100644 --- a/samples/html/test/tables.htm +++ b/samples/html/test/tables.htm @@ -11,7 +11,7 @@ This is TABLES tests page... -(yes, really, see bellow:) +(yes, really, see below:)
Click here to go to original testing page...
Click here to go to manuals...
  diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp index 88f50a45f7..d9e8cd3c22 100644 --- a/samples/html/test/test.cpp +++ b/samples/html/test/test.cpp @@ -1,6 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // Name: test.cpp // Purpose: wxHtml testing example +// Author: Vaclav Slavik +// Created: 1999-07-07 +// RCS-ID: $Id$ +// Copyright: (c) Vaclav Slavik +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #if defined(__GNUG__) && !defined(__APPLE__) @@ -15,7 +20,7 @@ #pragma hdrstop #endif -// for all others, include the necessary headers (this file is usually all you +// For all others, include the necessary headers (this file is usually all you // need because it includes almost all "standard" wxWindows headers #ifndef WX_PRECOMP #include "wx/wx.h" @@ -36,23 +41,17 @@ class MyApp : public wxApp { public: - // override base class virtuals - // ---------------------------- - - // this one is called on application startup and is a good place for the app - // initialization (doing it here and not in the ctor allows to have an error - // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit(); }; // Define a new frame type: this is going to be our main frame class MyFrame : public wxFrame { public: - // ctor(s) + // ctor(s) MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size); - // event handlers (these functions should _not_ be virtual) + // event handlers (these functions should _not_ be virtual) void OnQuit(wxCommandEvent& event); void OnPageOpen(wxCommandEvent& event); void OnBack(wxCommandEvent& event); @@ -60,25 +59,27 @@ public: void OnProcessor(wxCommandEvent& event); private: - wxHtmlWindow *m_Html; - wxHtmlProcessor *m_Processor; - // any class wishing to process wxWindows events must use this macro - DECLARE_EVENT_TABLE() + wxHtmlWindow *m_Html; + wxHtmlProcessor *m_Processor; + + // Any class wishing to process wxWindows events must use this macro + DECLARE_EVENT_TABLE() }; class BoldProcessor : public wxHtmlProcessor { - public: - virtual wxString Process(const wxString& s) const - { - wxString r(s); - r.Replace(wxT(""), wxEmptyString); - r.Replace(wxT(""), wxEmptyString); - r.Replace(wxT(""), wxEmptyString); - r.Replace(wxT(""), wxEmptyString); - return r; - } +public: + virtual wxString Process(const wxString& s) const + { + wxString r(s); + r.Replace(wxT(""), wxEmptyString); + r.Replace(wxT(""), wxEmptyString); + r.Replace(wxT(""), wxEmptyString); + r.Replace(wxT(""), wxEmptyString); + + return r; + } }; // ---------------------------------------------------------------------------- @@ -86,149 +87,150 @@ class BoldProcessor : public wxHtmlProcessor // ---------------------------------------------------------------------------- // IDs for the controls and the menu commands - enum - { +enum +{ // menu items - Minimal_Quit = 1, - Minimal_PageOpen, - Minimal_Back, - Minimal_Forward, - Minimal_Processor, - - // controls start here (the numbers are, of course, arbitrary) - Minimal_Text = 1000 - }; + ID_PageOpen = wxID_HIGHEST, + ID_Back, + ID_Forward, + ID_Processor +}; // ---------------------------------------------------------------------------- // event tables and other macros for wxWindows // ---------------------------------------------------------------------------- -// the event tables connect the wxWindows events with the functions (event -// handlers) which process them. It can be also done at run-time, but for the -// simple menu events like this the static method is much simpler. - BEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU(Minimal_Quit, MyFrame::OnQuit) - EVT_MENU(Minimal_PageOpen, MyFrame::OnPageOpen) - EVT_MENU(Minimal_Back, MyFrame::OnBack) - EVT_MENU(Minimal_Forward, MyFrame::OnForward) - EVT_MENU(Minimal_Processor, MyFrame::OnProcessor) - END_EVENT_TABLE() - - // Create a new application object: this macro will allow wxWindows to create - // the application object during program execution (it's better than using a - // static object for many reasons) and also declares the accessor function - // wxGetApp() which will return the reference of the right type (i.e. MyApp and - // not wxApp) - IMPLEMENT_APP(MyApp) - - // ============================================================================ - // implementation - // ============================================================================ - - // ---------------------------------------------------------------------------- - // the application class - // ---------------------------------------------------------------------------- - // `Main program' equivalent: the program execution "starts" here - bool MyApp::OnInit() - { +BEGIN_EVENT_TABLE(MyFrame, wxFrame) + EVT_MENU(wxID_EXIT, MyFrame::OnQuit) + EVT_MENU(ID_PageOpen, MyFrame::OnPageOpen) + EVT_MENU(ID_Back, MyFrame::OnBack) + EVT_MENU(ID_Forward, MyFrame::OnForward) + EVT_MENU(ID_Processor, MyFrame::OnProcessor) +END_EVENT_TABLE() + +IMPLEMENT_APP(MyApp) + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// the application class +// ---------------------------------------------------------------------------- + +// `Main program' equivalent: the program execution "starts" here +bool MyApp::OnInit() +{ #if wxUSE_SYSTEM_OPTIONS - wxSystemOptions::SetOption(wxT("no-maskblt"), 1); + wxSystemOptions::SetOption(wxT("no-maskblt"), 1); #endif - wxInitAllImageHandlers(); + wxInitAllImageHandlers(); #if wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS - wxFileSystem::AddHandler(new wxInternetFSHandler); + wxFileSystem::AddHandler(new wxInternetFSHandler); #endif - SetVendorName(wxT("wxWindows")); - SetAppName(wxT("wxHtmlTest")); - // the following call to wxConfig::Get will use it to create an object... + SetVendorName(wxT("wxWindows")); + SetAppName(wxT("wxHtmlTest")); + // the following call to wxConfig::Get will use it to create an object... // Create the main application window - MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"), - wxPoint(50, 50), wxSize(640, 480)); - - // Show it and tell the application that it's our main window - // @@@ what does it do exactly, in fact? is it necessary here? - frame->Show(TRUE); - SetTopWindow(frame); - - - // success: wxApp::OnRun() will be called which will enter the main message - // loop and the application will run. If we returned FALSE here, the - // application would exit immediately. - return TRUE; - } + MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"), + wxDefaultPosition, wxSize(640, 480)); + + frame->Show(); + + return true /* continue running */; +} // ---------------------------------------------------------------------------- // main frame // ---------------------------------------------------------------------------- - // frame constructor - MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, -1, title, pos, size, wxDEFAULT_FRAME_STYLE, - wxT("html_test_app")) - { +MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) + : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size, + wxDEFAULT_FRAME_STYLE, wxT("html_test_app")) +{ // create a menu bar - wxMenu *menuFile = new wxMenu; - wxMenu *menuNav = new wxMenu; - - menuFile->Append(Minimal_PageOpen, _("&Open HTML page...")); - menuFile->AppendSeparator(); - menuFile->Append(Minimal_Processor, _("&Remove bold attribute"), wxT(""), TRUE); - - menuFile->AppendSeparator(); - menuFile->Append(Minimal_Quit, _("&Close frame")); - menuNav->Append(Minimal_Back, _("Go &BACK")); - menuNav->Append(Minimal_Forward, _("Go &FORWARD")); + wxMenu *menuFile = new wxMenu; + wxMenu *menuNav = new wxMenu; + + menuFile->Append(ID_PageOpen, _("&Open HTML page...")); + menuFile->AppendSeparator(); + menuFile->Append(ID_Processor, _("&Remove bold attribute"), + wxEmptyString, wxITEM_CHECK); + + menuFile->AppendSeparator(); + menuFile->Append(wxID_EXIT, _("&Close frame")); + menuNav->Append(ID_Back, _("Go &BACK")); + menuNav->Append(ID_Forward, _("Go &FORWARD")); // now append the freshly created menu to the menu bar... - wxMenuBar *menuBar = new wxMenuBar; - menuBar->Append(menuFile, _("&File")); - menuBar->Append(menuNav, _("&Navigate")); + wxMenuBar *menuBar = new wxMenuBar; + menuBar->Append(menuFile, _("&File")); + menuBar->Append(menuNav, _("&Navigate")); // ... and attach this menu bar to the frame - SetMenuBar(menuBar); - - CreateStatusBar(1); - - m_Processor = new BoldProcessor; - m_Processor->Enable(FALSE); - m_Html = new wxHtmlWindow(this); - m_Html->SetRelatedFrame(this, _("HTML : %s")); - m_Html->SetRelatedStatusBar(0); - m_Html->ReadCustomization(wxConfig::Get()); - m_Html->LoadFile(wxFileName(wxT("test.htm"))); - m_Html->AddProcessor(m_Processor); - } + SetMenuBar(menuBar); + +#if wxUSE_ACCEL + // Create convenient accelerators for Back and Forward navigation + wxAcceleratorEntry entries[2]; + entries[0].Set(wxACCEL_ALT, WXK_LEFT, ID_Back); + entries[1].Set(wxACCEL_ALT, WXK_RIGHT, ID_Forward); + + wxAcceleratorTable accel(WXSIZEOF(entries), entries); + SetAcceleratorTable(accel); +#endif // wxUSE_ACCEL + + CreateStatusBar(1); + + m_Processor = new BoldProcessor; + m_Processor->Enable(false); + m_Html = new wxHtmlWindow(this); + m_Html->SetRelatedFrame(this, _("HTML : %s")); + m_Html->SetRelatedStatusBar(0); + m_Html->ReadCustomization(wxConfig::Get()); + m_Html->LoadFile(wxFileName(wxT("test.htm"))); + m_Html->AddProcessor(m_Processor); +} // event handlers void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - // TRUE is to force the frame to close - m_Html -> WriteCustomization(wxConfig::Get()); - delete wxConfig::Set(NULL); - Close(TRUE); + m_Html->WriteCustomization(wxConfig::Get()); + delete wxConfig::Set(NULL); + + // true is to force the frame to close + Close(true); } void MyFrame::OnPageOpen(wxCommandEvent& WXUNUSED(event)) { - wxString p = wxFileSelector(_("Open HTML document"), wxT(""), wxT(""), wxT(""), wxT("HTML files|*.htm")); - if (p != wxEmptyString) - m_Html -> LoadPage(p); + wxString p = wxFileSelector(_("Open HTML document"), wxEmptyString, + wxEmptyString, wxEmptyString, wxT("HTML files|*.htm")); + + if (p != wxEmptyString) + m_Html->LoadPage(p); } void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event)) { -if (!m_Html -> HistoryBack()) wxMessageBox(_("You reached prehistory era!")); + if (!m_Html->HistoryBack()) + { + wxMessageBox(_("You reached prehistory era!")); + } } void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event)) { -if (!m_Html -> HistoryForward()) wxMessageBox(_("No more items in history!")); + if (!m_Html->HistoryForward()) + { + wxMessageBox(_("No more items in history!")); + } } void MyFrame::OnProcessor(wxCommandEvent& WXUNUSED(event)) -- 2.45.2