Forward port of r60190 (wxMSW Cairo support) to trunk.

[wxWidgets.git] / samples / opengl / cube / cube.cpp

diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp
index 74cd1bf7ebf194a3877541138eaa2ad75130fc01..7396d9bb5e385b8d14e5fa93037888bbd64a6ee2 100644 (file)
--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@@ -57,20 +57,20 @@ static void CheckGLError()
         // so check that we get a different error than the last time
         if ( err == errLast )
         {
         // so check that we get a different error than the last time
         if ( err == errLast )
         {

-            wxLogError(_T("OpenGL error state couldn't be reset."));
+            wxLogError(wxT("OpenGL error state couldn't be reset."));

             return;
         }
 
         errLast = err;
 
             return;
         }
 
         errLast = err;
 

-        wxLogError(_T("OpenGL error %d"), err);
+        wxLogError(wxT("OpenGL error %d"), err);

     }
 }
 
 // function to draw the texture for cube faces
 static wxImage DrawDice(int size, unsigned num)
 {
     }
 }
 
 // function to draw the texture for cube faces
 static wxImage DrawDice(int size, unsigned num)
 {

-    wxASSERT_MSG( num >= 1 && num <= 6, _T("invalid dice index") );
+    wxASSERT_MSG( num >= 1 && num <= 6, wxT("invalid dice index") );

 
     const int dot = size/16;        // radius of a single dot
     const int gap = 5*size/32;      // gap between dots
 
     const int dot = size/16;        // radius of a single dot
     const int gap = 5*size/32;      // gap between dots


@@ -369,7 +369,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()

-       : wxFrame(NULL, wxID_ANY, _T("wxWidgets OpenGL Cube Sample"))
+       : wxFrame(NULL, wxID_ANY, wxT("wxWidgets OpenGL Cube Sample"))

 {
     new TestGLCanvas(this);
 
 {
     new TestGLCanvas(this);
 


@@ -381,7 +381,7 @@ MyFrame::MyFrame()
     menu->AppendSeparator();
     menu->Append(wxID_CLOSE);
     wxMenuBar *menuBar = new wxMenuBar;
     menu->AppendSeparator();
     menu->Append(wxID_CLOSE);
     wxMenuBar *menuBar = new wxMenuBar;

-    menuBar->Append(menu, _T("&Cube"));
+    menuBar->Append(menu, wxT("&Cube"));

 
     SetMenuBar(menuBar);
 
 
     SetMenuBar(menuBar);