redefined TRUE and FALSE to be of type bool

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

diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp
index 43f03c55eddc15d224a580f131493f95f1091538..730f2886ddd41c747e9248e2ad872a07062af4a4 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


@@ -19,11 +19,11 @@
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWindows headers
 #ifndef WX_PRECOMP
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWindows headers
 #ifndef WX_PRECOMP

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

 #endif
 
 
 #endif
 
 

-#include <wx/html/htmlwin.h>
+#include "wx/html/htmlwin.h"

 
 
 
 
 
 


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

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

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


@@ -49,13 +49,14 @@ TAG_HANDLER_BEGIN(MYBIND, "MYBIND")
 
         tag.ScanParam(wxT("X"), wxT("%i"), &ax);
         tag.ScanParam(wxT("Y"), wxT("%i"), &ay);
 
         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;
     }
 
         return FALSE;
     }