don't throw away the first three stack frames in the assert stack dump (fix needed...

[wxWidgets.git] / samples / html / widget / widget.cpp

diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp
index 697edfc3f3b3988c8723e35ff8174748ba63edc7..e51fe68f1d7bf286c1bd199391a916e953907ced 100644 (file)
--- 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"
+
 
 /*
 
@@ -154,7 +151,7 @@ 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?
@@ -193,12 +190,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"));
+
 }