disable the first top level parent, not the topmost top level parent

[wxWidgets.git] / contrib / samples / xrc / xrcdemo.cpp

diff --git a/contrib/samples/xrc/xrcdemo.cpp b/contrib/samples/xrc/xrcdemo.cpp
index f7d755352c2b2dae388efe48fe4c20cc866b9982..824477921d97e8cb7fdd780103be4e4610900df9 100644 (file)
--- a/contrib/samples/xrc/xrcdemo.cpp
+++ b/contrib/samples/xrc/xrcdemo.cpp
@@ -16,7 +16,7 @@
 #endif
 
 //-----------------------------------------------------------------------------
-// Standard wxWindows headers
+// Standard wxWidgets headers
 //-----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
 #endif
 
 // For all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
@@ -53,10 +53,10 @@
 #include "myframe.h"
 
 //-----------------------------------------------------------------------------
-// wxWindows macro: Declare the application.
+// wxWidgets macro: Declare the application.
 //-----------------------------------------------------------------------------
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. the_app and
@@ -88,27 +88,27 @@ bool MyApp::OnInit()
     // into one giant XRC file if you wanted, but then they become more 
     // diffcult to manage, and harder to reuse in later projects.   
     // The menubar
-    wxXmlResource::Get()->Load("rc/menu.xrc");
+    wxXmlResource::Get()->Load(wxT("rc/menu.xrc"));
     // The toolbar
-    wxXmlResource::Get()->Load("rc/toolbar.xrc");
+    wxXmlResource::Get()->Load(wxT("rc/toolbar.xrc"));
     // Non-derived dialog example
-    wxXmlResource::Get()->Load("rc/basicdlg.xrc");
+    wxXmlResource::Get()->Load(wxT("rc/basicdlg.xrc"));
     // Derived dialog example
-    wxXmlResource::Get()->Load("rc/derivdlg.xrc");
+    wxXmlResource::Get()->Load(wxT("rc/derivdlg.xrc"));
     // Controls property example
-    wxXmlResource::Get()->Load("rc/controls.xrc");
+    wxXmlResource::Get()->Load(wxT("rc/controls.xrc"));
     // Frame example
-    wxXmlResource::Get()->Load("rc/frame.xrc");
+    wxXmlResource::Get()->Load(wxT("rc/frame.xrc"));
     // Uncentered example
-    wxXmlResource::Get()->Load("rc/uncenter.xrc");    
+    wxXmlResource::Get()->Load(wxT("rc/uncenter.xrc"));    
     // Custom class example
-    wxXmlResource::Get()->Load("rc/custclas.xrc");
+    wxXmlResource::Get()->Load(wxT("rc/custclas.xrc"));
     // wxArtProvider example
-    wxXmlResource::Get()->Load("rc/artprov.xrc");
+    wxXmlResource::Get()->Load(wxT("rc/artprov.xrc"));
     // Platform property example
-    wxXmlResource::Get()->Load("rc/platform.xrc");
+    wxXmlResource::Get()->Load(wxT("rc/platform.xrc"));
     // Variable expansion example
-    wxXmlResource::Get()->Load("rc/variable.xrc");
+    wxXmlResource::Get()->Load(wxT("rc/variable.xrc"));
 
     // Make an instance of your derived frame. Passing NULL (the default value 
     // of MyFrame's constructor is NULL) as the frame doesn't have a frame