#endif
// For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#include <wx/image.h>
+#include <wx/imagpng.h>
#include <wx/wxhtml.h>
+#include <wx/statline.h>
// ----------------------------------------------------------------------------
// private classes
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)
public:
// ctor(s)
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);
Minimal_About,
Minimal_Back,
Minimal_Forward,
-
+
// controls start here (the numbers are, of course, arbitrary)
- Minimal_Text = 1000,
+ Minimal_Text = 1000
};
// ----------------------------------------------------------------------------
EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(Minimal_About, MyFrame::OnAbout)
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
// ----------------------------------------------------------------------------
// Create the main application window
MyFrame *frame = new MyFrame("wxHtmlWindow testing application",
wxPoint(50, 50), wxSize(150, 50));
-
+
// 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);
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
+ wxBoxSizer *topsizer;
wxHtmlWindow *html;
- wxDialog dlg(this, -1, "About", wxDefaultPosition, wxSize(400, 230), wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE);
+ wxDialog dlg(this, -1, wxString("About"));
+
+ topsizer = new wxBoxSizer(wxVERTICAL);
- html = new wxHtmlWindow(&dlg, -1, wxPoint(10, 10), wxSize(380, 160), "htmlWindow", FALSE);
+ html = new wxHtmlWindow(&dlg, -1, wxDefaultPosition, wxSize(380, 160), wxHW_SCROLLBAR_NEVER);
html -> SetBorders(0);
html -> LoadPage("data/about.htm");
- wxButton *bu1 = new wxButton(&dlg, wxID_OK, "OK", wxPoint(250, 185), wxSize(100, 30));
- bu1 -> SetDefault();
- dlg.ShowModal();
- }
-
+ html -> SetSize(html -> GetInternalRepresentation() -> GetWidth(),
+ html -> GetInternalRepresentation() -> GetHeight());
+ topsizer -> Add(html, 1, wxALL, 10);
+ topsizer -> Add(new wxStaticLine(&dlg, -1), 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+
+ wxButton *bu1 = new wxButton(&dlg, wxID_OK, "Okay");
+ bu1 -> SetDefault();
+ topsizer -> Add(bu1, 0, wxALL | wxALIGN_RIGHT, 15);
+ dlg.SetAutoLayout(TRUE);
+ dlg.SetSizer(topsizer);
+ topsizer -> Fit(&dlg);
+ dlg.ShowModal();
+ }