compilation fix

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

diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp
index 667d7705aa3f0976bce51f82afda73897f2de3ef..14ff729970c2aae4366194553cf7cabea2539dc8 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
 // 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"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -25,6 +20,8 @@
 
 #include "wx/html/htmlwin.h"
 
 
 #include "wx/html/htmlwin.h"
 

+#include "../../sample.xpm"
+

 
 /*
 
 
 /*
 


@@ -50,8 +47,15 @@ TAG_HANDLER_PROC(tag)
 
     if (tag.HasParam(wxT("FLOAT"))) fl = ax;
 
 
     if (tag.HasParam(wxT("FLOAT"))) fl = ax;
 

-    wnd = new wxTextCtrl(m_WParser->GetWindow(), wxID_ANY, 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);
 


@@ -118,7 +122,7 @@ enum
     Minimal_Forward,
 
     // controls start here (the numbers are, of course, arbitrary)
     Minimal_Forward,
 
     // controls start here (the numbers are, of course, arbitrary)

-    Minimal_Text = 1000,
+    Minimal_Text = 1000

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -193,16 +197,19 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... 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);
 #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"));
 #if wxUSE_STATUSBAR
     html -> SetRelatedStatusBar(1);
 #endif // wxUSE_STATUSBAR
     html -> LoadPage(wxT("start.htm"));

+

 }
 
 
 }