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>
(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="../../docs/html/man.htm">here</a> to go to manuals...
<BR>&nbsp;

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

@@ -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,12 +41,6 @@
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();
};
@@ -62,7 +61,8 @@ public:
private:
wxHtmlWindow *m_Html;
wxHtmlProcessor *m_Processor;
// any class wishing to process wxWindows events must use this macro
// Any class wishing to process wxWindows events must use this macro
DECLARE_EVENT_TABLE()
};
@@ -77,6 +77,7 @@ class BoldProcessor : public wxHtmlProcessor
r.Replace(wxT("<B>"), wxEmptyString);
r.Replace(wxT("</b>"), wxEmptyString);
r.Replace(wxT("</B>"), wxEmptyString);
return r;
}
};
@@ -89,36 +90,24 @@ class BoldProcessor : public wxHtmlProcessor
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)
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()
// 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)
// ============================================================================
@@ -128,6 +117,7 @@ class BoldProcessor : public wxHtmlProcessor
// ----------------------------------------------------------------------------
// the application class
// ----------------------------------------------------------------------------
// `Main program' equivalent: the program execution "starts" here
bool MyApp::OnInit()
{
@@ -146,42 +136,35 @@ class BoldProcessor : public wxHtmlProcessor
// Create the main application window
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
// application would exit immediately.
return TRUE;
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"))
: 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->Append(ID_PageOpen, _("&Open HTML page..."));
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"));
menuNav->Append(Minimal_Back, _("Go &BACK"));
menuNav->Append(Minimal_Forward, _("Go &FORWARD"));
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;
@@ -191,10 +174,20 @@ class BoldProcessor : public wxHtmlProcessor
// ... and attach this menu bar to the frame
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_Processor->Enable(false);
m_Html = new wxHtmlWindow(this);
m_Html->SetRelatedFrame(this, _("HTML : %s"));
m_Html->SetRelatedStatusBar(0);
@@ -208,27 +201,36 @@ class BoldProcessor : public wxHtmlProcessor
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);
// 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"));
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))