Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

committing the code for resolution independence (turned off)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-08-11 04:26:16 +00:00
parent f21449aead
commit 3a5ff9b13b
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mac/carbon/glcanvas.cpp
View File

@@ -31,6 +31,8 @@
#include "wx/build.h" #include "wx/build.h"
WX_CHECK_BUILD_OPTIONS("wxGL") WX_CHECK_BUILD_OPTIONS("wxGL")
#include "wx/mac/private.h"
/* /*
* GLContext implementation * GLContext implementation
*/ */
@@ -258,13 +260,27 @@ void wxGLCanvas::SetViewport()
int width, height; int width, height;
GetClientSize(& width, & height); GetClientSize(& width, & height);
Rect bounds ; Rect bounds ;
#if 0
// TODO in case we adopt point vs pixel coordinates, this will make the conversion
GetWindowPortBounds( MAC_WXHWND(MacGetTopLevelWindowRef()) , &bounds ) ;
HIRect hiRect = CGRectMake( x, y, width, height ) ;
HIRectConvert( &hiRect, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceScreenPixel, NULL) ;
HIRect hiBounds = CGRectMake( 0, 0, bounds.right - bounds.left , bounds.bottom - bounds.top ) ;
HIRectConvert( &hiBounds, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceScreenPixel, NULL) ;
GLint parms[4] ;
parms[0] = hiRect.origin.x ;
parms[1] = hiBounds.size.height - (hiRect.origin.y + hiRect.size.height) ;
parms[2] = hiRect.size.width ;
parms[3] = hiRect.size.height ;
#else
Rect bounds ;
GetWindowPortBounds( MAC_WXHWND(MacGetTopLevelWindowRef()) , &bounds ) ; GetWindowPortBounds( MAC_WXHWND(MacGetTopLevelWindowRef()) , &bounds ) ;
GLint parms[4] ; GLint parms[4] ;
parms[0] = x ; parms[0] = x ;
parms[1] = bounds.bottom - bounds.top - ( y + height ) ; parms[1] = bounds.bottom - bounds.top - ( y + height ) ;
parms[2] = width ; parms[2] = width ;
parms[3] = height ; parms[3] = height ;
#endif
if ( !m_macCanvasIsShown ) if ( !m_macCanvasIsShown )
parms[0] += 20000 ; parms[0] += 20000 ;
aglSetInteger( m_glContext->m_glContext , AGL_BUFFER_RECT , parms ) ; aglSetInteger( m_glContext->m_glContext , AGL_BUFFER_RECT , parms ) ;