Make it possible to use svn-find-native-eols script without svn checkout.

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

diff --git a/samples/opengl/penguin/penguin.cpp b/samples/opengl/penguin/penguin.cpp
index aa01dc0ccbb95481e667e05a35a1894bb7f99e14..b60619ed77c56c805ae37c83143c8b5c62175298 100644 (file)
--- a/samples/opengl/penguin/penguin.cpp
+++ b/samples/opengl/penguin/penguin.cpp
@@ -87,7 +87,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
     fileMenu->Append(wxID_EXIT, wxT("E&xit\tALT-X"));
     // Make the "Help" menu
     wxMenu *helpMenu = new wxMenu;
     fileMenu->Append(wxID_EXIT, wxT("E&xit\tALT-X"));
     // Make the "Help" menu
     wxMenu *helpMenu = new wxMenu;

-    helpMenu->Append(wxID_HELP, wxT("&About..."));
+    helpMenu->Append(wxID_HELP, wxT("&About"));

 
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append(fileMenu, wxT("&File"));
 
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append(fileMenu, wxT("&File"));


@@ -124,7 +124,7 @@ void MyFrame::OnMenuFileExit( wxCommandEvent& WXUNUSED(event) )
     Close(true);
 }
 
     Close(true);
 }
 

-// Help|About... command
+// Help|About command

 void MyFrame::OnMenuHelpAbout( wxCommandEvent& WXUNUSED(event) )
 {
     wxMessageBox(wxT("OpenGL Penguin Sample (c) Robert Roebling, Sandro Sigala et al"));
 void MyFrame::OnMenuHelpAbout( wxCommandEvent& WXUNUSED(event) )
 {
     wxMessageBox(wxT("OpenGL Penguin Sample (c) Robert Roebling, Sandro Sigala et al"));


@@ -153,9 +153,6 @@ TestGLCanvas::TestGLCanvas(wxWindow *parent,
     // Explicitly create a new rendering context instance for this canvas.
     m_glRC = new wxGLContext(this);
 
     // Explicitly create a new rendering context instance for this canvas.
     m_glRC = new wxGLContext(this);
 

-    // Make the new context current (activate it for use) with this canvas.
-    SetCurrent(*m_glRC);
-

     m_gldata.initialized = false;
 
     // initialize view matrix
     m_gldata.initialized = false;
 
     // initialize view matrix


@@ -223,7 +220,7 @@ void TestGLCanvas::OnEraseBackground(wxEraseEvent& WXUNUSED(event))
 void TestGLCanvas::LoadDXF(const wxString& filename)
 {
     wxFileInputStream stream(filename);
 void TestGLCanvas::LoadDXF(const wxString& filename)
 {
     wxFileInputStream stream(filename);

-    if (stream.Ok())
+    if (stream.IsOk())

 #if wxUSE_ZLIB
     {
         if (filename.Right(3).Lower() == wxT(".gz"))
 #if wxUSE_ZLIB
     {
         if (filename.Right(3).Lower() == wxT(".gz"))


@@ -279,7 +276,7 @@ void TestGLCanvas::InitGL()
     static const GLfloat light1_color[4] = { 0.4f, 0.4f, 1.0f, 1.0f };
 
     /* remove back faces */
     static const GLfloat light1_color[4] = { 0.4f, 0.4f, 1.0f, 1.0f };
 
     /* remove back faces */

-    glDisable(GL_CULL_FACE);
+    glEnable(GL_CULL_FACE);

     glEnable(GL_DEPTH_TEST);
 
     /* speedups */
     glEnable(GL_DEPTH_TEST);
 
     /* speedups */


@@ -303,6 +300,9 @@ void TestGLCanvas::InitGL()
 
 void TestGLCanvas::ResetProjectionMode()
 {
 
 void TestGLCanvas::ResetProjectionMode()
 {

+    if ( !IsShownOnScreen() )
+        return;
+

     // This is normally only necessary if there is more than one wxGLCanvas
     // or more than one wxGLContext in the application.
     SetCurrent(*m_glRC);
     // This is normally only necessary if there is more than one wxGLCanvas
     // or more than one wxGLContext in the application.
     SetCurrent(*m_glRC);