Moved typedef to within public block to avoid compile error in VC++

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

diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp
index 7b5f005112808825b191c84dd915fa5eefa2ecc2..7b6aec192e408eef9ecb067152e0af2ee81f123b 100644 (file)
--- a/samples/html/about/about.cpp
+++ b/samples/html/about/about.cpp
@@ -9,7 +9,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


@@ -18,13 +18,13 @@
 // 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/image.h>
-#include <wx/imagpng.h>
-#include <wx/wxhtml.h>
-#include <wx/statline.h>
+#include "wx/image.h"
+#include "wx/imagpng.h"
+#include "wx/wxhtml.h"
+#include "wx/statline.h"

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -74,7 +74,7 @@
    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

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


@@ -159,7 +159,7 @@
    {
         wxBoxSizer *topsizer;
         wxHtmlWindow *html;
    {
         wxBoxSizer *topsizer;
         wxHtmlWindow *html;

-        wxDialog dlg(this, -1, "About");
+        wxDialog dlg(this, -1, wxString("About"));

 
         topsizer = new wxBoxSizer(wxVERTICAL);
 
 
         topsizer = new wxBoxSizer(wxVERTICAL);