From b7f5fd2d3dbbbd41af709b47d7c32d8a0e56fa2a Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 31 Jan 2007 00:27:56 +0000
Subject: [PATCH] Mac OS X: fix GL alignment in 'metal frames

svn: r5513
---
 src/wxmac/src/mac/wx_canvs.cc | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/wxmac/src/mac/wx_canvs.cc b/src/wxmac/src/mac/wx_canvs.cc
index 24fbcf9e7e..d99b0723de 100644
--- a/src/wxmac/src/mac/wx_canvs.cc
+++ b/src/wxmac/src/mac/wx_canvs.cc
@@ -884,9 +884,13 @@ void wxCanvas::OnPaint(void)
 void wxCanvas::ResetGLView()
 {
   if (wx_dc->gl) {
-    wxArea* clientArea, *topClientArea;
+    wxArea* clientArea;
+    wxMacDC *macdc;
     wxFrame *fr;
-    int h, w, th;
+    CGrafPtr graf;
+    WindowRef win;
+    int h, w;
+    Rect cr, sr;
 
     SetCurrentMacDC();
 
@@ -895,11 +899,15 @@ void wxCanvas::ResetGLView()
     h = clientArea->Height();
 
     fr = GetRootFrame();
-    topClientArea = fr->ContentArea();
-    th = topClientArea->Height();
+    macdc = fr->MacDC();
+    graf = macdc->macGrafPort();
+    win = GetWindowFromPort(graf);
 
-    wx_dc->gl->ResetGLView(SetOriginX,
-			   (th - (SetOriginY + h)),
+    GetWindowBounds(win, kWindowContentRgn, &cr);
+    GetWindowBounds(win, kWindowStructureRgn, &sr);
+    
+    wx_dc->gl->ResetGLView(SetOriginX + (cr.left - sr.left),
+			   (cr.bottom - cr.top) - (SetOriginY + h) + (sr.bottom - cr.bottom),
 			   w,
 			   h);
   }