Enable GL_CULL_FACE in OpenGL samples.

[wxWidgets.git] / samples / regtest / regtest.cpp

diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index 2623dcc272bd8bab913abe24ed786c51d9db1494..a12d6f28b75773c769f16b3a71372abd4a166290 100644 (file)
--- a/samples/regtest/regtest.cpp
+++ b/samples/regtest/regtest.cpp
@@ -31,7 +31,7 @@
 #include "wx/imaglist.h"
 #include "wx/tokenzr.h"
 
 #include "wx/imaglist.h"
 #include "wx/tokenzr.h"
 

-#if wxUSE_CONFIG_NATIVE && defined( __WXMSW__ )
+#if wxUSE_CONFIG_NATIVE && defined( __WINDOWS__ )

 #   define DO_REGTEST 1
 #else
 #   define DO_REGTEST 0
 #   define DO_REGTEST 1
 #else
 #   define DO_REGTEST 0


@@ -378,7 +378,7 @@ RegFrame::RegFrame(wxFrame *parent, const wxChar *title, int x, int y, int w, in
     wxMenu *pMenuFile = new wxMenu;
     pMenuFile->Append(Menu_Test, wxT("Te&st"), wxT("Test key creation"));
     pMenuFile->AppendSeparator();
     wxMenu *pMenuFile = new wxMenu;
     pMenuFile->Append(Menu_Test, wxT("Te&st"), wxT("Test key creation"));
     pMenuFile->AppendSeparator();

-    pMenuFile->Append(Menu_About, wxT("&About..."), wxT("Show an extraordinarly beautiful dialog"));
+    pMenuFile->Append(Menu_About, wxT("&About"), wxT("Show an extraordinarly beautiful dialog"));

     pMenuFile->AppendSeparator();
     pMenuFile->Append(Menu_Quit,  wxT("E&xit"), wxT("Quit this program"));
 
     pMenuFile->AppendSeparator();
     pMenuFile->Append(Menu_Quit,  wxT("E&xit"), wxT("Quit this program"));
 


@@ -1193,7 +1193,7 @@ const wxChar *RegTreeCtrl::TreeNode::FullName() const
         s_strName = Parent()->FullName();
         s_strName << wxT('\\') << m_strName;
 
         s_strName = Parent()->FullName();
         s_strName << wxT('\\') << m_strName;
 

-        return s_strName;
+        return s_strName.t_str();

     }
 }
 
     }
 }