/////////////////////////////////////////////////////////////////////////////
-// Name: virtua;.cpp
+// Name: widget.cpp
// Purpose: wxHtml testing example
-// demonstrates virtual file systems feature
+// Demonstrates embedded controls
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(__APPLE__)
- #pragma implementation "test.cpp"
- #pragma interface "test.cpp"
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#endif
// 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" wxWidgets headers
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
#include "wx/html/htmlwin.h"
+#include "../../sample.xpm"
+
/*
if (tag.HasParam(wxT("FLOAT"))) fl = ax;
- wnd = new wxTextCtrl(m_WParser->GetWindow(), -1, tag.GetParam(wxT("NAME")),
- wxPoint(0,0), wxSize(ax, ay), wxTE_MULTILINE);
+ wnd = new wxTextCtrl
+ (
+ m_WParser->GetWindowInterface()->GetHTMLWindow(),
+ wxID_ANY,
+ tag.GetParam(wxT("NAME")),
+ wxPoint(0,0),
+ wxSize(ax, ay),
+ wxTE_MULTILINE
+ );
- wnd->Show(TRUE);
+ wnd->Show(true);
m_WParser->GetContainer()->InsertCell(new wxHtmlWidgetCell(wnd, fl));
- return FALSE;
+ return false;
}
TAG_HANDLER_END(MYBIND)
void OnForward(wxCommandEvent& event);
private:
- // any class wishing to process wxWindows events must use this macro
+ // any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
};
Minimal_Forward,
// controls start here (the numbers are, of course, arbitrary)
- Minimal_Text = 1000,
+ Minimal_Text = 1000
};
// ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
// ----------------------------------------------------------------------------
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets 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_Forward, MyFrame::OnForward)
END_EVENT_TABLE()
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets 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
// `Main program' equivalent: the program execution "starts" here
bool MyApp::OnInit()
{
+ if ( !wxApp::OnInit() )
+ return false;
+
// Create the main application window
- MyFrame *frame = new MyFrame( "wxHtmlWindow testing application",
- wxPoint(50, 50), wxSize(640, 480) );
+ MyFrame *frame = new MyFrame( _("wxHtmlWindow testing application"),
+ 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);
+ 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
+ // loop and the application will run. If we returned false here, the
// application would exit immediately.
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
// frame constructor
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
-: wxFrame((wxFrame *)NULL, -1, title, pos, size)
+: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
{
// create a menu bar
wxMenu *menuFile = new wxMenu;
wxMenu *menuNav = new wxMenu;
- menuFile->Append(Minimal_Quit, "E&xit");
- menuNav->Append(Minimal_Back, "Go &BACK");
- menuNav->Append(Minimal_Forward, "Go &FORWARD");
+ menuFile->Append(Minimal_Quit, _("E&xit"));
+ menuNav->Append(Minimal_Back, _("Go &BACK"));
+ menuNav->Append(Minimal_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");
+ menuBar->Append(menuFile, _("&File"));
+ menuBar->Append(menuNav, _("&Navigate"));
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
+ SetIcon(wxIcon(sample_xpm));
+
+#if wxUSE_STATUSBAR
CreateStatusBar(2);
+#endif // wxUSE_STATUSBAR
html = new wxHtmlWindow(this);
- html -> SetRelatedFrame(this, "VFS Demo: '%s'");
+ html -> SetRelatedFrame(this, _("wxHTML Demo: '%s'"));
+#if wxUSE_STATUSBAR
html -> SetRelatedStatusBar(1);
- html -> LoadPage("start.htm");
+#endif // wxUSE_STATUSBAR
+ html -> LoadPage(wxT("start.htm"));
+
}
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
- // TRUE is to force the frame to close
- Close(TRUE);
+ // true is to force the frame to close
+ Close(true);
}
void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event))
{
- if (!html -> HistoryBack()) wxMessageBox("You reached prehistory era!");
+ if (!html -> HistoryBack()) wxMessageBox(_("You reached prehistory era!"));
}
void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event))
{
- if (!html -> HistoryForward()) wxMessageBox("No more items in history!");
+ if (!html -> HistoryForward()) wxMessageBox(_("No more items in history!"));
}
projects / wxWidgets.git / blobdiff