X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb71207424c20cc8aa39280e108a9bb12cb379e1..d15040492413b54a530b5a291b26750f3d265d23:/samples/opengl/penguin/penguin.cpp

diff --git a/samples/opengl/penguin/penguin.cpp b/samples/opengl/penguin/penguin.cpp
index 7e2e82a16d..1b09d9530c 100644
--- a/samples/opengl/penguin/penguin.cpp
+++ b/samples/opengl/penguin/penguin.cpp
@@ -57,7 +57,7 @@ bool MyApp::OnInit(void)
   menuBar->Append(fileMenu, "&File");
   frame->SetMenuBar(menuBar);
 
-  frame->m_canvas = new TestGLCanvas(frame, -1, wxPoint(0, 0), wxSize(200, 200));
+  frame->m_canvas = new TestGLCanvas(frame, -1, wxPoint(0, 0), wxSize(200, 200), wxSUNKEN_BORDER);
 
   /* Load file wiht mesh data */
   frame->m_canvas->LoadLWO( "penguin.lwo" );
@@ -155,9 +155,19 @@ void TestGLCanvas::OnPaint( wxPaintEvent& event )
 
 void TestGLCanvas::OnSize(wxSizeEvent& event)
 {
-    // the viewport must be initialized this way, not glViewport
     // this is also necessary to update the context on some platforms
     wxGLCanvas::OnSize(event);
+    
+    // set GL viewport (not called by wxGLCanvas::OnSize on all platforms...)
+		int w, h;
+		GetClientSize(&w, &h);
+#ifndef __WXMOTIF__
+    if (GetContext())
+#endif
+    {
+        SetCurrent();
+        glViewport(0, 0, (GLint) w, (GLint) h);
+    }
 }
 
 void TestGLCanvas::OnEraseBackground(wxEraseEvent& event)