X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4693b20c7500190c3cc8c02919c45436bf5efbc9..0c4fdf1d3d73c61e8804dc8c40da23cf208c1491:/samples/html/widget/widget.cpp diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp index 43f03c55ed..b567e193f4 100644 --- a/samples/html/widget/widget.cpp +++ b/samples/html/widget/widget.cpp @@ -4,13 +4,13 @@ // demonstrates virtual file systems feature ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma implementation "test.cpp" #pragma interface "test.cpp" #endif // For compilers that support precompilation, includes "wx/wx.h". -#include +#include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -19,13 +19,11 @@ // 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 + #include "wx/wx.h" #endif -#include - - +#include "wx/html/htmlwin.h" /* @@ -36,29 +34,31 @@ TAG HANDER FOR 'MYBIND' TAG */ -#include +#include "wx/html/m_templ.h" TAG_HANDLER_BEGIN(MYBIND, "MYBIND") - TAG_HANDLER_PROC(tag) - { - wxWindow *wnd; - int ax, ay; - int fl = 0; +TAG_HANDLER_PROC(tag) +{ + wxWindow *wnd; + int ax, ay; + int fl = 0; + + tag.ScanParam(wxT("X"), wxT("%i"), &ax); + tag.ScanParam(wxT("Y"), wxT("%i"), &ay); + + if (tag.HasParam(wxT("FLOAT"))) fl = ax; - tag.ScanParam(wxT("X"), wxT("%i"), &ax); - tag.ScanParam(wxT("Y"), wxT("%i"), &ay); - if (tag.HasParam("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 -> GetWindow(), -1, tag.GetParam("NAME"), - wxPoint(0,0), wxSize(ax, ay), wxTE_MULTILINE ); - wnd -> Show(TRUE); + wnd->Show(TRUE); - m_WParser -> OpenContainer() -> InsertCell(new wxHtmlWidgetCell(wnd, fl)); + m_WParser->GetContainer()->InsertCell(new wxHtmlWidgetCell(wnd, fl)); - return FALSE; - } + return FALSE; +} TAG_HANDLER_END(MYBIND) @@ -71,64 +71,55 @@ TAGS_MODULE_BEGIN(MyBind) TAGS_MODULE_END(MyBind) - - - - - - - // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- // Define a new application type, each program should derive a class from wxApp - class MyApp : public wxApp - { - public: +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: +class MyFrame : public wxFrame +{ +public: // 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) - void OnQuit(wxCommandEvent& event); - void OnAbout(wxCommandEvent& event); - void OnBack(wxCommandEvent& event); - void OnForward(wxCommandEvent& event); + void OnQuit(wxCommandEvent& event); + void OnBack(wxCommandEvent& event); + void OnForward(wxCommandEvent& event); - private: +private: // any class wishing to process wxWindows events must use this macro DECLARE_EVENT_TABLE() - }; +}; // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- // IDs for the controls and the menu commands - enum - { +enum +{ // menu items - Minimal_Quit = 1, - Minimal_About, - Minimal_Back, - Minimal_Forward, - + Minimal_Quit = 1, + Minimal_Back, + Minimal_Forward, + // controls start here (the numbers are, of course, arbitrary) - Minimal_Text = 1000, - }; + Minimal_Text = 1000, +}; // ---------------------------------------------------------------------------- // event tables and other macros for wxWindows @@ -137,45 +128,44 @@ TAGS_MODULE_END(MyBind) // 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_About, MyFrame::OnAbout) - EVT_MENU(Minimal_Back, MyFrame::OnBack) - EVT_MENU(Minimal_Forward, MyFrame::OnForward) - 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(Minimal_Quit, MyFrame::OnQuit) + EVT_MENU(Minimal_Back, MyFrame::OnBack) + EVT_MENU(Minimal_Forward, MyFrame::OnForward) +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() +{ // 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"), + 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); + 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; - } + return TRUE; +} // ---------------------------------------------------------------------------- // main frame @@ -184,61 +174,49 @@ TAGS_MODULE_END(MyBind) wxHtmlWindow *html; // frame constructor - MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, -1, title, pos, size) - { +MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) +: wxFrame((wxFrame *)NULL, -1, title, pos, size) +{ // create a menu bar - wxMenu *menuFile = new wxMenu; - wxMenu *menuNav = new wxMenu; + 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"); + wxMenuBar *menuBar = new wxMenuBar; + menuBar->Append(menuFile, _("&File")); + menuBar->Append(menuNav, _("&Navigate")); // ... and attach this menu bar to the frame - SetMenuBar(menuBar); - - CreateStatusBar(2); + SetMenuBar(menuBar); - html = new wxHtmlWindow(this); - html -> SetRelatedFrame(this, "VFS Demo: '%s'"); - html -> SetRelatedStatusBar(1); - html -> LoadPage("start.htm"); - } + CreateStatusBar(2); + + html = new wxHtmlWindow(this); + html -> SetRelatedFrame(this, _("VFS Demo: '%s'")); + html -> SetRelatedStatusBar(1); + html -> LoadPage(wxT("start.htm")); +} // event handlers - void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) - { +void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) +{ // TRUE is to force the frame to close - Close(TRUE); - } - - void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) - { - } - - - - void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event)) - { - if (!html -> HistoryBack()) wxMessageBox("You reached prehistory era!"); - } - - - void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event)) - { - if (!html -> HistoryForward()) wxMessageBox("No more items in history!"); - } - - - + Close(TRUE); +} +void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event)) +{ + if (!html -> HistoryBack()) wxMessageBox(_("You reached prehistory era!")); +} +void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event)) +{ + if (!html -> HistoryForward()) wxMessageBox(_("No more items in history!")); +}