fixed bug with the caret positioning after SetValue() introduced by the last commit

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

diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp
index 74fa22ff81ffcfbd4ceb8bceb666a06961aee3f4..7c48e1971a2a35e9b55718dd538594bf0fcb0c2b 100644 (file)
--- a/samples/html/widget/widget.cpp
+++ b/samples/html/widget/widget.cpp
@@ -10,7 +10,7 @@
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -36,7 +36,7 @@ TAG HANDER FOR 'MYBIND' TAG
 
 */
 
 
 */
 

-#include <wx/html/mod_templ.h>
+#include <wx/html/m_templ.h>

 
 
 TAG_HANDLER_BEGIN(MYBIND, "MYBIND")
 
 
 TAG_HANDLER_BEGIN(MYBIND, "MYBIND")


@@ -47,8 +47,8 @@ TAG_HANDLER_BEGIN(MYBIND, "MYBIND")
         int ax, ay;
         int fl = 0;
 
         int ax, ay;
         int fl = 0;
 

-        tag.ScanParam("X", "%i", &ax);
-        tag.ScanParam("Y", "%i", &ay);
+        tag.ScanParam(wxT("X"), wxT("%i"), &ax);
+        tag.ScanParam(wxT("Y"), wxT("%i"), &ay);

         if (tag.HasParam("FLOAT")) fl = ax;
 
         wnd = new wxTextCtrl( m_WParser -> GetWindow(), -1, tag.GetParam("NAME"),
         if (tag.HasParam("FLOAT")) fl = ax;
 
         wnd = new wxTextCtrl( m_WParser -> GetWindow(), -1, tag.GetParam("NAME"),


@@ -203,7 +203,7 @@ wxHtmlWindow *html;
     // ... and attach this menu bar to the frame
       SetMenuBar(menuBar);
    
     // ... and attach this menu bar to the frame
       SetMenuBar(menuBar);
    

-      CreateStatusBar(1);
+      CreateStatusBar(2);

 
       html = new wxHtmlWindow(this);
       html -> SetRelatedFrame(this, "VFS Demo: '%s'");
 
       html = new wxHtmlWindow(this);
       html -> SetRelatedFrame(this, "VFS Demo: '%s'");