X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..9920ad328b7bb97ad927b9524cbe6e1b785be742:/samples/html/widget/widget.cpp

diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp
index 54489fd12c..14ff729970 100644
--- a/samples/html/widget/widget.cpp
+++ b/samples/html/widget/widget.cpp
@@ -1,14 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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"
 
@@ -25,6 +20,8 @@
 
 #include "wx/html/htmlwin.h"
 
+#include "../../sample.xpm"
+
 
 /*
 
@@ -50,14 +47,21 @@ TAG_HANDLER_PROC(tag)
 
     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)
@@ -118,7 +122,7 @@ enum
     Minimal_Forward,
 
     // controls start here (the numbers are, of course, arbitrary)
-    Minimal_Text = 1000,
+    Minimal_Text = 1000
 };
 
 // ----------------------------------------------------------------------------
@@ -154,17 +158,17 @@ bool MyApp::OnInit()
 {
     // Create the main application window
     MyFrame *frame = new MyFrame( _("wxHtmlWindow testing application"),
-        wxPoint(50, 50), wxSize(640, 480) );
+        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;
 }
 
 // ----------------------------------------------------------------------------
@@ -175,7 +179,7 @@ wxHtmlWindow *html;
 
 // 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;
@@ -193,12 +197,19 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // ... 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);
+#endif // wxUSE_STATUSBAR
     html -> LoadPage(wxT("start.htm"));
+
 }
 
 
@@ -206,8 +217,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 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))