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

wxCleanup; Added accelerators for navigation (Alt+left, Alt+right).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2004-02-19 00:24:06 +00:00
parent 1aa81b1712
commit 3f6bd7c1c5
2 changed files with 124 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/html/test/tables.htm
View File

@@ -11,7 +11,7 @@ This is TABLES
tests page...</H3> tests page...</H3>
(yes, really, see bellow:) (yes, really, see below:)
<BR>Click <a href="test.htm">here</a> to go to original testing page... <BR>Click <a href="test.htm">here</a> to go to original testing page...
<BR>Click <a href="../../docs/html/man.htm">here</a> to go to manuals... <BR>Click <a href="../../docs/html/man.htm">here</a> to go to manuals...
<BR>&nbsp; <BR>&nbsp;

244
samples/html/test/test.cpp
View File

@@ -1,6 +1,11 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: test.cpp // Name: test.cpp
// Purpose: wxHtml testing example // 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__) #if defined(__GNUG__) && !defined(__APPLE__)
@@ -15,7 +20,7 @@
#pragma hdrstop #pragma hdrstop
#endif #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 // need because it includes almost all "standard" wxWindows headers
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
@@ -36,23 +41,17 @@
class MyApp : public wxApp class MyApp : public wxApp
{ {
public: public:
// override base class virtuals virtual bool OnInit();
// ----------------------------
// 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();
}; };
// Define a new frame type: this is going to be our main frame // Define a new frame type: this is going to be our main frame
class MyFrame : public wxFrame class MyFrame : public wxFrame
{ {
public: public:
// ctor(s) // ctor(s)
MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size); 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 OnQuit(wxCommandEvent& event);
void OnPageOpen(wxCommandEvent& event); void OnPageOpen(wxCommandEvent& event);
void OnBack(wxCommandEvent& event); void OnBack(wxCommandEvent& event);
@@ -60,25 +59,27 @@ public:
void OnProcessor(wxCommandEvent& event); void OnProcessor(wxCommandEvent& event);
private: private:
wxHtmlWindow *m_Html; wxHtmlWindow *m_Html;
wxHtmlProcessor *m_Processor; wxHtmlProcessor *m_Processor;
// any class wishing to process wxWindows events must use this macro
DECLARE_EVENT_TABLE() // Any class wishing to process wxWindows events must use this macro
DECLARE_EVENT_TABLE()
}; };
class BoldProcessor : public wxHtmlProcessor class BoldProcessor : public wxHtmlProcessor
{ {
public: public:
virtual wxString Process(const wxString& s) const virtual wxString Process(const wxString& s) const
{ {
wxString r(s); wxString r(s);
r.Replace(wxT("<b>"), wxEmptyString); r.Replace(wxT("<b>"), wxEmptyString);
r.Replace(wxT("<B>"), wxEmptyString); r.Replace(wxT("<B>"), wxEmptyString);
r.Replace(wxT("</b>"), wxEmptyString); r.Replace(wxT("</b>"), wxEmptyString);
r.Replace(wxT("</B>"), wxEmptyString); r.Replace(wxT("</B>"), wxEmptyString);
return r;
} return r;
}
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -86,149 +87,150 @@ class BoldProcessor : public wxHtmlProcessor
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// IDs for the controls and the menu commands // IDs for the controls and the menu commands
enum enum
{ {
// menu items // menu items
Minimal_Quit = 1, ID_PageOpen = wxID_HIGHEST,
Minimal_PageOpen, ID_Back,
Minimal_Back, ID_Forward,
Minimal_Forward, ID_Processor
Minimal_Processor, };
// controls start here (the numbers are, of course, arbitrary)
Minimal_Text = 1000
};
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// event tables and other macros for wxWindows // event tables and other macros for wxWindows
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// the event tables connect the wxWindows events with the functions (event BEGIN_EVENT_TABLE(MyFrame, wxFrame)
// handlers) which process them. It can be also done at run-time, but for the EVT_MENU(wxID_EXIT, MyFrame::OnQuit)
// simple menu events like this the static method is much simpler. EVT_MENU(ID_PageOpen, MyFrame::OnPageOpen)
BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(ID_Back, MyFrame::OnBack)
EVT_MENU(Minimal_Quit, MyFrame::OnQuit) EVT_MENU(ID_Forward, MyFrame::OnForward)
EVT_MENU(Minimal_PageOpen, MyFrame::OnPageOpen) EVT_MENU(ID_Processor, MyFrame::OnProcessor)
EVT_MENU(Minimal_Back, MyFrame::OnBack) END_EVENT_TABLE()
EVT_MENU(Minimal_Forward, MyFrame::OnForward)
EVT_MENU(Minimal_Processor, MyFrame::OnProcessor) IMPLEMENT_APP(MyApp)
END_EVENT_TABLE()
// ============================================================================
// Create a new application object: this macro will allow wxWindows to create // implementation
// 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) // the application class
IMPLEMENT_APP(MyApp) // ----------------------------------------------------------------------------
// ============================================================================ // `Main program' equivalent: the program execution "starts" here
// implementation bool MyApp::OnInit()
// ============================================================================ {
// ----------------------------------------------------------------------------
// the application class
// ----------------------------------------------------------------------------
// `Main program' equivalent: the program execution "starts" here
bool MyApp::OnInit()
{
#if wxUSE_SYSTEM_OPTIONS #if wxUSE_SYSTEM_OPTIONS
wxSystemOptions::SetOption(wxT("no-maskblt"), 1); wxSystemOptions::SetOption(wxT("no-maskblt"), 1);
#endif #endif
wxInitAllImageHandlers(); wxInitAllImageHandlers();
#if wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS #if wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS
wxFileSystem::AddHandler(new wxInternetFSHandler); wxFileSystem::AddHandler(new wxInternetFSHandler);
#endif #endif
SetVendorName(wxT("wxWindows")); SetVendorName(wxT("wxWindows"));
SetAppName(wxT("wxHtmlTest")); SetAppName(wxT("wxHtmlTest"));
// the following call to wxConfig::Get will use it to create an object... // the following call to wxConfig::Get will use it to create an object...
// Create the main application window // Create the main application window
MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"), MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),
wxPoint(50, 50), wxSize(640, 480)); wxDefaultPosition, 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);
frame->Show();
// success: wxApp::OnRun() will be called which will enter the main message
// loop and the application will run. If we returned FALSE here, the return true /* continue running */;
// application would exit immediately. }
return TRUE;
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// main frame // main frame
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// frame constructor // frame constructor
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
: wxFrame((wxFrame *)NULL, -1, title, pos, size, wxDEFAULT_FRAME_STYLE, : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size,
wxT("html_test_app")) wxDEFAULT_FRAME_STYLE, wxT("html_test_app"))
{ {
// create a menu bar // create a menu bar
wxMenu *menuFile = new wxMenu; wxMenu *menuFile = new wxMenu;
wxMenu *menuNav = new wxMenu; wxMenu *menuNav = new wxMenu;
menuFile->Append(Minimal_PageOpen, _("&Open HTML page...")); menuFile->Append(ID_PageOpen, _("&Open HTML page..."));
menuFile->AppendSeparator(); menuFile->AppendSeparator();
menuFile->Append(Minimal_Processor, _("&Remove bold attribute"), wxT(""), TRUE); menuFile->Append(ID_Processor, _("&Remove bold attribute"),
wxEmptyString, wxITEM_CHECK);
menuFile->AppendSeparator();
menuFile->Append(Minimal_Quit, _("&Close frame")); menuFile->AppendSeparator();
menuNav->Append(Minimal_Back, _("Go &BACK")); menuFile->Append(wxID_EXIT, _("&Close frame"));
menuNav->Append(Minimal_Forward, _("Go &FORWARD")); menuNav->Append(ID_Back, _("Go &BACK"));
menuNav->Append(ID_Forward, _("Go &FORWARD"));
// now append the freshly created menu to the menu bar... // now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar; wxMenuBar *menuBar = new wxMenuBar;
menuBar->Append(menuFile, _("&File")); menuBar->Append(menuFile, _("&File"));
menuBar->Append(menuNav, _("&Navigate")); menuBar->Append(menuNav, _("&Navigate"));
// ... and attach this menu bar to the frame // ... and attach this menu bar to the frame
SetMenuBar(menuBar); SetMenuBar(menuBar);
CreateStatusBar(1);
m_Processor = new BoldProcessor; #if wxUSE_ACCEL
m_Processor->Enable(FALSE); // Create convenient accelerators for Back and Forward navigation
m_Html = new wxHtmlWindow(this); wxAcceleratorEntry entries[2];
m_Html->SetRelatedFrame(this, _("HTML : %s")); entries[0].Set(wxACCEL_ALT, WXK_LEFT, ID_Back);
m_Html->SetRelatedStatusBar(0); entries[1].Set(wxACCEL_ALT, WXK_RIGHT, ID_Forward);
m_Html->ReadCustomization(wxConfig::Get());
m_Html->LoadFile(wxFileName(wxT("test.htm"))); wxAcceleratorTable accel(WXSIZEOF(entries), entries);
m_Html->AddProcessor(m_Processor); 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 // event handlers
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{ {
// TRUE is to force the frame to close m_Html->WriteCustomization(wxConfig::Get());
m_Html -> WriteCustomization(wxConfig::Get()); delete wxConfig::Set(NULL);
delete wxConfig::Set(NULL);
Close(TRUE); // true is to force the frame to close
Close(true);
} }
void MyFrame::OnPageOpen(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnPageOpen(wxCommandEvent& WXUNUSED(event))
{ {
wxString p = wxFileSelector(_("Open HTML document"), wxT(""), wxT(""), wxT(""), wxT("HTML files|*.htm")); wxString p = wxFileSelector(_("Open HTML document"), wxEmptyString,
if (p != wxEmptyString) wxEmptyString, wxEmptyString, wxT("HTML files|*.htm"));
m_Html -> LoadPage(p);
if (p != wxEmptyString)
m_Html->LoadPage(p);
} }
void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event)) 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)) 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)) void MyFrame::OnProcessor(wxCommandEvent& WXUNUSED(event))