updated samples/html/widget to avoid confusion

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/html/widget/start.htm b/samples/html/widget/start.htm
index 2b969f425f28f8aa3d8a56fad1a7fae643b60e7f..dfe45fe4eb89d1f0bbbf97df846b1ca3c5c4773a 100644 (file)
--- a/samples/html/widget/start.htm
+++ b/samples/html/widget/start.htm
@@ -7,14 +7,22 @@ There is binded window somewhere around. Enjoy it.
 
 <hr>
 <center>
-<mybind name="experimental binded window :-)" x=300 y=500>
+<mybind name="experimental binded window" x=300 y=500>
 </center>
 <hr>
 
 <mybind name="(small one)" x=150 y=30>
 <hr>
 
-<mybind name="a widget with floating width, hurray :-)" float=y x="50" y=50>
+<mybind name="a widget with floating width" float=y x="50" y=50>
+
+<hr>
+
+Here you can find multiple widgets at the same line:<br>
+ here
+<mybind name="widget_1" x="100" y=30>
+...and here:
+<mybind name="widget_2"  x="150" y=30>
 
 </body>
 </html>

diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp
index 9c7bbed699ec48b241e2eae4ed576466b9b2573a..730f2886ddd41c747e9248e2ad872a07062af4a4 100644 (file)
--- a/samples/html/widget/widget.cpp
+++ b/samples/html/widget/widget.cpp
@@ -49,13 +49,14 @@ TAG_HANDLER_BEGIN(MYBIND, "MYBIND")
 
         tag.ScanParam(wxT("X"), wxT("%i"), &ax);
         tag.ScanParam(wxT("Y"), wxT("%i"), &ay);
-        if (tag.HasParam("FLOAT")) fl = ax;
+        if (tag.HasParam(wxT("FLOAT")))
+            fl = ax;
 
-        wnd = new wxTextCtrl( m_WParser -> GetWindow(), -1, tag.GetParam("NAME"),
-                              wxPoint(0,0), wxSize(ax, ay), wxTE_MULTILINE );
-        wnd -> Show(TRUE);
+        wnd = new wxTextCtrl(m_WParser->GetWindow(), -1, tag.GetParam(wxT("NAME")),
+                             wxPoint(0,0), wxSize(ax, ay), wxTE_MULTILINE);
+        wnd->Show(TRUE);
 
-        m_WParser -> OpenContainer() -> InsertCell(new wxHtmlWidgetCell(wnd, fl));
+        m_WParser->GetContainer()->InsertCell(new wxHtmlWidgetCell(wnd, fl));
 
         return FALSE;
     }