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

fixed compile error

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-08-05 19:31:15 +00:00
parent 60b6c062f8
commit 48e74ff549
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/html/about/about.cpp
View File

@@ -35,7 +35,7 @@
public: public:
// override base class virtuals // override base class virtuals
// ---------------------------- // ----------------------------
// this one is called on application startup and is a good place for the app // 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 // initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates) // return: if OnInit() returns false, the application terminates)
@@ -48,7 +48,7 @@
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 OnAbout(wxCommandEvent& event); void OnAbout(wxCommandEvent& event);
@@ -70,7 +70,7 @@
Minimal_About, Minimal_About,
Minimal_Back, Minimal_Back,
Minimal_Forward, Minimal_Forward,
// controls start here (the numbers are, of course, arbitrary) // controls start here (the numbers are, of course, arbitrary)
Minimal_Text = 1000, Minimal_Text = 1000,
}; };
@@ -86,18 +86,18 @@
EVT_MENU(Minimal_Quit, MyFrame::OnQuit) EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(Minimal_About, MyFrame::OnAbout) EVT_MENU(Minimal_About, MyFrame::OnAbout)
END_EVENT_TABLE() END_EVENT_TABLE()
// Create a new application object: this macro will allow wxWindows to create // Create a new application object: this macro will allow wxWindows to create
// the application object during program execution (it's better than using a // the application object during program execution (it's better than using a
// static object for many reasons) and also declares the accessor function // 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 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
// not wxApp) // not wxApp)
IMPLEMENT_APP(MyApp) IMPLEMENT_APP(MyApp)
// ============================================================================ // ============================================================================
// implementation // implementation
// ============================================================================ // ============================================================================
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// the application class // the application class
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -108,7 +108,7 @@
// 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(150, 50)); wxPoint(50, 50), wxSize(150, 50));
// Show it and tell the application that it's our main window // Show it and tell the application that it's our main window
// @@@ what does it do exactly, in fact? is it necessary here? // @@@ what does it do exactly, in fact? is it necessary here?
frame->Show(TRUE); frame->Show(TRUE);
@@ -162,7 +162,7 @@
wxDialog dlg(this, -1, "About", wxDefaultPosition, wxSize(400, 230), wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE); wxDialog dlg(this, -1, "About", wxDefaultPosition, wxSize(400, 230), wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE);
#endif #endif
html = new wxHtmlWindow(&dlg, -1, wxPoint(10, 10), wxSize(380, 160), "htmlWindow", FALSE); html = new wxHtmlWindow(&dlg, -1, wxPoint(10, 10), wxSize(380, 160));//, "htmlWindow", FALSE);
html -> SetBorders(0); html -> SetBorders(0);
html -> LoadPage("data/about.htm"); html -> LoadPage("data/about.htm");
wxButton *bu1 = new wxButton(&dlg, wxID_OK, "OK", wxPoint(250, 185), wxSize(100, 30)); wxButton *bu1 = new wxButton(&dlg, wxID_OK, "OK", wxPoint(250, 185), wxSize(100, 30));