removed code (re)setting the camera from wxGLCanvas::OnSize()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 146597dc469e007b09b354f3b968346197fe8dd4..e46cac9e32957f5d9de8c5a77850958ab5bb2aa2 100644 (file)
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -426,19 +426,6 @@ void wxGLCanvas::SwapBuffers()
 
 void wxGLCanvas::OnSize(wxSizeEvent& WXUNUSED(event))
 {
 
 void wxGLCanvas::OnSize(wxSizeEvent& WXUNUSED(event))
 {

-    int width, height;
-    GetClientSize( &width, &height );
-    
-    if (m_glContext && GTK_WIDGET_REALIZED(m_glWidget) )
-    {
-        SetCurrent(); 
-       
-        glViewport(0, 0, (GLint)width, (GLint)height );
-        glMatrixMode(GL_PROJECTION);
-        glLoadIdentity();
-        glFrustum( -1.0, 1.0, -1.0, 1.0, 5.0, 15.0 );
-        glMatrixMode(GL_MODELVIEW);
-    }

 }
 
 void wxGLCanvas::SetCurrent()
 }
 
 void wxGLCanvas::SetCurrent()

diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp
index 146597dc469e007b09b354f3b968346197fe8dd4..e46cac9e32957f5d9de8c5a77850958ab5bb2aa2 100644 (file)
--- a/src/gtk1/glcanvas.cpp
+++ b/src/gtk1/glcanvas.cpp
@@ -426,19 +426,6 @@ void wxGLCanvas::SwapBuffers()
 
 void wxGLCanvas::OnSize(wxSizeEvent& WXUNUSED(event))
 {
 
 void wxGLCanvas::OnSize(wxSizeEvent& WXUNUSED(event))
 {

-    int width, height;
-    GetClientSize( &width, &height );
-    
-    if (m_glContext && GTK_WIDGET_REALIZED(m_glWidget) )
-    {
-        SetCurrent(); 
-       
-        glViewport(0, 0, (GLint)width, (GLint)height );
-        glMatrixMode(GL_PROJECTION);
-        glLoadIdentity();
-        glFrustum( -1.0, 1.0, -1.0, 1.0, 5.0, 15.0 );
-        glMatrixMode(GL_MODELVIEW);
-    }

 }
 
 void wxGLCanvas::SetCurrent()
 }
 
 void wxGLCanvas::SetCurrent()

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index 8edf2fc38e9c533c57b9a84b9f381fbabdb82462..2ff4a891281280606ad0baf1ae5123c0f0d907f0 100644 (file)
--- a/src/mac/carbon/glcanvas.cpp
+++ b/src/mac/carbon/glcanvas.cpp
@@ -273,12 +273,7 @@ void wxGLCanvas::MacUpdateView()
   {
     UpdateContext();
     m_glContext->SetCurrent();
   {
     UpdateContext();
     m_glContext->SetCurrent();

-

     SetViewport();
     SetViewport();

-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    glFrustum( -1.0, 1.0, -1.0, 1.0, 5.0, 15.0 );
-    glMatrixMode(GL_MODELVIEW);

   }
 }
 
   }
 }
 

diff --git a/src/mac/glcanvas.cpp b/src/mac/glcanvas.cpp
index 8edf2fc38e9c533c57b9a84b9f381fbabdb82462..2ff4a891281280606ad0baf1ae5123c0f0d907f0 100644 (file)
--- a/src/mac/glcanvas.cpp
+++ b/src/mac/glcanvas.cpp
@@ -273,12 +273,7 @@ void wxGLCanvas::MacUpdateView()
   {
     UpdateContext();
     m_glContext->SetCurrent();
   {
     UpdateContext();
     m_glContext->SetCurrent();

-

     SetViewport();
     SetViewport();

-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    glFrustum( -1.0, 1.0, -1.0, 1.0, 5.0, 15.0 );
-    glMatrixMode(GL_MODELVIEW);

   }
 }
 
   }
 }
 

diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp
index 218b4969b28c18f394b2f6d8343051d7a7e0fcf0..f799f1ca586318efc3dae7d270ae8681e8c7eb1b 100644 (file)
--- a/src/msw/glcanvas.cpp
+++ b/src/msw/glcanvas.cpp
@@ -522,19 +522,6 @@ void wxGLCanvas::SwapBuffers()
 
 void wxGLCanvas::OnSize(wxSizeEvent& event)
 {
 
 void wxGLCanvas::OnSize(wxSizeEvent& event)
 {

-  int width, height;
-  GetClientSize(& width, & height);
-
-  if (m_glContext)
-  {
-    m_glContext->SetCurrent();
-
-    glViewport(0, 0, (GLint)width, (GLint)height);
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    glFrustum( -1.0, 1.0, -1.0, 1.0, 5.0, 15.0 );
-    glMatrixMode(GL_MODELVIEW);
-  }

 }
 
 void wxGLCanvas::SetCurrent()
 }
 
 void wxGLCanvas::SetCurrent()