Disable some wxWebView tests that fail on the buildbot but not locally.

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

diff --git a/samples/opengl/penguin/penguin.cpp b/samples/opengl/penguin/penguin.cpp
index e18cb95adc1c5cdea3c349c7e131c43e7e94bdee..c0c894069e7650a9d4e02aa436c94ff50c318172 100644 (file)
--- a/samples/opengl/penguin/penguin.cpp
+++ b/samples/opengl/penguin/penguin.cpp
@@ -78,7 +78,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
     const wxSize& size, long style)
     : wxFrame(frame, wxID_ANY, title, pos, size, style)
 {
     const wxSize& size, long style)
     : wxFrame(frame, wxID_ANY, title, pos, size, style)
 {

-    SetIcon(wxIcon(sample_xpm));
+    SetIcon(wxICON(sample));

 
     // Make the "File" menu
     wxMenu *fileMenu = new wxMenu;
 
     // Make the "File" menu
     wxMenu *fileMenu = new wxMenu;


@@ -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"))


@@ -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);