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

fixed bug with 2 frames

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-10-10 20:21:08 +00:00
parent 1b231e235b
commit 2083616e16
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,6 +55,7 @@
void OnForward(wxCommandEvent& event); void OnForward(wxCommandEvent& event);
private: private:
wxHtmlWindow *m_Html;
// 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() DECLARE_EVENT_TABLE()
}; };
@@ -120,8 +121,8 @@
// 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(640, 480)); wxPoint(50, 50), wxSize(640, 480));
MyFrame *frame2 = new MyFrame("wxHtmlWindow testing application", MyFrame *frame2 = new MyFrame("wxHtmlWindow testing application, frame 2",
wxPoint(150, 50), wxSize(640, 480)); wxPoint(150, 50), wxSize(320, 240));
// 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?
@@ -140,7 +141,6 @@
// main frame // main frame
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxHtmlWindow *html;
// frame constructor // frame constructor
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
@@ -152,7 +152,7 @@ wxHtmlWindow *html;
menuFile->Append(Minimal_About, "&Load wxWindows manual page"); menuFile->Append(Minimal_About, "&Load wxWindows manual page");
menuFile->AppendSeparator(); menuFile->AppendSeparator();
menuFile->Append(Minimal_Quit, "E&xit"); menuFile->Append(Minimal_Quit, "&Close frame");
menuNav->Append(Minimal_Back, "Go &BACK"); menuNav->Append(Minimal_Back, "Go &BACK");
menuNav->Append(Minimal_Forward, "Go &FORWARD"); menuNav->Append(Minimal_Forward, "Go &FORWARD");
@@ -168,12 +168,12 @@ wxHtmlWindow *html;
{ {
wxConfig *cfg = new wxConfig("wxHtmlTest"); wxConfig *cfg = new wxConfig("wxHtmlTest");
html = new wxHtmlWindow(this); m_Html = new wxHtmlWindow(this);
html -> SetRelatedFrame(this, "HTML : %s"); m_Html -> SetRelatedFrame(this, "HTML : %s");
html -> SetRelatedStatusBar(0); m_Html -> SetRelatedStatusBar(0);
html -> ReadCustomization(cfg); m_Html -> ReadCustomization(cfg);
delete cfg; delete cfg;
html -> LoadPage("test.htm"); m_Html -> LoadPage("test.htm");
} }
} }
@@ -185,25 +185,25 @@ wxHtmlWindow *html;
// TRUE is to force the frame to close // TRUE is to force the frame to close
wxLogDebug("about to save config..."); wxLogDebug("about to save config...");
wxConfig *cfg = new wxConfig("wxHtmlTest"); wxConfig *cfg = new wxConfig("wxHtmlTest");
html -> WriteCustomization(cfg); m_Html -> WriteCustomization(cfg);
delete cfg; delete cfg;
Close(TRUE); Close(TRUE);
} }
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{ {
html -> LoadPage("fft.html"); m_Html -> LoadPage("fft.html");
} }
void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event))
{ {
if (!html -> HistoryBack()) wxMessageBox("You reached prehistory era!"); if (!m_Html -> HistoryBack()) wxMessageBox("You reached prehistory era!");
} }
void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event))
{ {
if (!html -> HistoryForward()) wxMessageBox("No more items in history!"); if (!m_Html -> HistoryForward()) wxMessageBox("No more items in history!");
} }