focus setting must be possible even when not shown yet

[wxWidgets.git] / src / mac / carbon / glcanvas.cpp

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index 345fc2aeaf3a6ae42169cb09488275a277fcd203..44215b6b75824b9678a9a68717f3131d14498dea 100644 (file)
--- a/src/mac/carbon/glcanvas.cpp
+++ b/src/mac/carbon/glcanvas.cpp
@@ -33,6 +33,10 @@
 #include "wx/glcanvas.h"
 #include "wx/mac/uma.h"
 
 #include "wx/glcanvas.h"
 #include "wx/mac/uma.h"
 

+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxGL")
+

 /*
 * GLContext implementation
 */
 /*
 * GLContext implementation
 */


@@ -91,7 +95,7 @@ void wxGLContext::Update()
     }
 }
 
     }
 }
 

-void wxGLContext::SetColour(const char *colour)
+void wxGLContext::SetColour(const wxChar *colour)

 {
     float r = 0.0;
     float g = 0.0;
 {
     float r = 0.0;
     float g = 0.0;


@@ -224,7 +228,7 @@ bool wxGLCanvas::Create(wxWindow *parent, const wxGLContext *shared, wxWindowID
     wxCHECK_MSG( fmt, false, wxT("Couldn't create OpenGl pixel format") );
     
     m_glContext = new wxGLContext(fmt, this, palette, shared);
     wxCHECK_MSG( fmt, false, wxT("Couldn't create OpenGl pixel format") );
     
     m_glContext = new wxGLContext(fmt, this, palette, shared);

-    
+    m_macCanvasIsShown = true ;

     aglDestroyPixelFormat(fmt);
     
     return true;
     aglDestroyPixelFormat(fmt);
     
     return true;


@@ -249,18 +253,29 @@ void wxGLCanvas::SetViewport()
     int x = 0 ;
     int y = 0 ;
     
     int x = 0 ;
     int y = 0 ;
     

-    MacClientToRootWindow( &x , &y ) ;
-    int width, height;
-    GetClientSize(& width, & height);
-    Rect bounds ;
-    GetWindowPortBounds( MAC_WXHWND(MacGetRootWindow()) , &bounds ) ;
-    GLint parms[4] ;
-    parms[0] = x ;
-    parms[1] = bounds.bottom - bounds.top - ( y + height ) ;
-    parms[2] = width ;
-    parms[3] = height ;
+    wxWindow* iter = this ;
+    while( iter->GetParent() )
+    {
+       iter = iter->GetParent() ;
+    }

     
     

-       aglSetInteger( m_glContext->m_glContext , AGL_BUFFER_RECT , parms ) ;
+    if ( iter && iter->IsTopLevel() )
+    {
+           MacClientToRootWindow( &x , &y ) ;
+           int width, height;
+           GetClientSize(& width, & height);
+           Rect bounds ;
+           GetWindowPortBounds( MAC_WXHWND(MacGetRootWindow()) , &bounds ) ;
+           GLint parms[4] ;
+           parms[0] = x ;
+           parms[1] = bounds.bottom - bounds.top - ( y + height ) ;
+           parms[2] = width ;
+           parms[3] = height ;
+           
+           if ( !m_macCanvasIsShown )
+               parms[0] += 20000 ;
+           aglSetInteger( m_glContext->m_glContext , AGL_BUFFER_RECT , parms ) ;
+       }

 }
 
 void wxGLCanvas::OnSize(wxSizeEvent& event)
 }
 
 void wxGLCanvas::OnSize(wxSizeEvent& event)


@@ -298,12 +313,57 @@ void wxGLCanvas::SetCurrent()
     }
 }
 
     }
 }
 

-void wxGLCanvas::SetColour(const char *colour)
+void wxGLCanvas::SetColour(const wxChar *colour)

 {
     if (m_glContext)
         m_glContext->SetColour(colour);
 }
 
 {
     if (m_glContext)
         m_glContext->SetColour(colour);
 }
 

+bool wxGLCanvas::Show(bool show) 
+{
+    if ( !wxWindow::Show( show ) )
+        return FALSE ;
+        
+    if ( !show )
+    {
+        if ( m_macCanvasIsShown )
+        {
+            m_macCanvasIsShown = false ;
+            SetViewport() ;
+        }
+    }
+    else
+    {
+        if ( MacIsReallyShown() && !m_macCanvasIsShown )
+        {
+            m_macCanvasIsShown = true ;
+            SetViewport() ;
+        }
+    }
+    return TRUE ;
+}
+
+void wxGLCanvas::MacSuperShown( bool show ) 
+{
+    if ( !show )
+    {
+        if ( m_macCanvasIsShown )
+        {
+            m_macCanvasIsShown = false ;
+            SetViewport() ;
+        }
+    }
+    else
+    {
+        if ( MacIsReallyShown() && !m_macCanvasIsShown )
+        {
+            m_macCanvasIsShown = true ;
+            SetViewport() ;
+        }
+    }
+        
+    wxWindow::MacSuperShown( show ) ;
+}

 
 //---------------------------------------------------------------------------
 // wxGLApp
 
 //---------------------------------------------------------------------------
 // wxGLApp