Since wxPanel is now AutoLayout aware, removed indirect auto layouting

[wxWidgets.git] / utils / glcanvas / samples / penguin / penguin.cpp

diff --git a/utils/glcanvas/samples/penguin/penguin.cpp b/utils/glcanvas/samples/penguin/penguin.cpp
index 9444b7ec083b4f215407167bffeb704430537bbf..8eaed6a1d9bd74fb9361e90604628e42da3190fd 100644 (file)
--- a/utils/glcanvas/samples/penguin/penguin.cpp
+++ b/utils/glcanvas/samples/penguin/penguin.cpp
@@ -76,11 +76,6 @@ void MyFrame::OnExit(wxCommandEvent& event)
     Destroy();
 }
 
     Destroy();
 }
 

-bool MyFrame::OnClose(void)
-{
-    return TRUE;
-}
-

 BEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas)
     EVT_SIZE(TestGLCanvas::OnSize)
     EVT_PAINT(TestGLCanvas::OnPaint)
 BEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas)
     EVT_SIZE(TestGLCanvas::OnSize)
     EVT_PAINT(TestGLCanvas::OnPaint)


@@ -106,7 +101,9 @@ void TestGLCanvas::OnPaint( wxPaintEvent& event )
     /* must always be here */
     wxPaintDC dc(this);
 
     /* must always be here */
     wxPaintDC dc(this);
 

+#ifndef __WXMOTIF__

     if (!GetContext()) return;
     if (!GetContext()) return;

+#endif

 
     SetCurrent();
     
 
     SetCurrent();
     


@@ -148,8 +145,10 @@ void TestGLCanvas::OnSize(wxSizeEvent& event)
 {
     int width, height;
     GetClientSize(& width, & height);
 {
     int width, height;
     GetClientSize(& width, & height);

-
+    
+#ifndef __WXMOTIF__

     if (GetContext())
     if (GetContext())

+#endif

     {
         SetCurrent();
         glViewport(0, 0, width, height);
     {
         SetCurrent();
         glViewport(0, 0, width, height);


@@ -183,20 +182,21 @@ void TestGLCanvas::LoadLWO(const wxString &filename)
 
 void TestGLCanvas::OnMouse( wxMouseEvent& event )
 {
 
 void TestGLCanvas::OnMouse( wxMouseEvent& event )
 {

+    wxSize sz(GetClientSize());

     if (event.Dragging())
     {
         /* drag in progress, simulate trackball */
         float spin_quat[4];
         trackball(spin_quat,
     if (event.Dragging())
     {
         /* drag in progress, simulate trackball */
         float spin_quat[4];
         trackball(spin_quat,

-             (2.0*info.beginx -       m_width) / m_width,
-             (     m_height - 2.0*info.beginy) / m_height,
-             (     2.0*event.GetX() - m_width) / m_width,
-             (    m_height - 2.0*event.GetY()) / m_height);
+             (2.0*info.beginx -       sz.x) / sz.x,
+             (     sz.y - 2.0*info.beginy) / sz.y,
+             (     2.0*event.GetX() - sz.x) / sz.x,
+             (    sz.y - 2.0*event.GetY()) / sz.y);

              
         add_quats( spin_quat, info.quat, info.quat );
        
         /* orientation has changed, redraw mesh */
              
         add_quats( spin_quat, info.quat, info.quat );
        
         /* orientation has changed, redraw mesh */

-       Refresh();
+       Refresh(FALSE);

     }
     
     info.beginx = event.GetX();
     }
     
     info.beginx = event.GetX();