fixed encoding handling in ANSI mode

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

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index 8edf2fc38e9c533c57b9a84b9f381fbabdb82462..16e47d4c79ad0685a24ecca6adb156e8360775da 100644 (file)
--- a/src/mac/carbon/glcanvas.cpp
+++ b/src/mac/carbon/glcanvas.cpp
@@ -45,7 +45,7 @@ wxGLContext::wxGLContext(
 {
     m_window = win;
 
 {
     m_window = win;
 

-    m_drawable = (AGLDrawable) UMAGetWindowPort(win->GetMacRootWindow());
+    m_drawable = (AGLDrawable) UMAGetWindowPort(MAC_WXHWND(win->MacGetRootWindow()));

 
     m_glContext = aglCreateContext(fmt, other ? other->m_glContext : NULL);
     wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGl context") );
 
     m_glContext = aglCreateContext(fmt, other ? other->m_glContext : NULL);
     wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGl context") );


@@ -141,8 +141,10 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID i
 
 wxGLCanvas::~wxGLCanvas()
 {
 
 wxGLCanvas::~wxGLCanvas()
 {

-  if (m_glContext)
-    delete m_glContext;
+    if (m_glContext != NULL) {
+        delete m_glContext;
+        m_glContext = NULL;
+    }

 }
 
 static AGLPixelFormat ChoosePixelFormat(const int *attribList)
 }
 
 static AGLPixelFormat ChoosePixelFormat(const int *attribList)


@@ -216,7 +218,6 @@ bool wxGLCanvas::Create(wxWindow *parent, const wxGLContext *shared, wxWindowID
                        const wxPoint& pos, const wxSize& size, long style, const wxString& name,
                        int *attribList, const wxPalette& palette)
 {
                        const wxPoint& pos, const wxSize& size, long style, const wxString& name,
                        int *attribList, const wxPalette& palette)
 {

-       m_macEraseOnRedraw = false ;

     wxWindow::Create( parent, id, pos, size, style, name );
 
     AGLPixelFormat fmt = ChoosePixelFormat(attribList);
     wxWindow::Create( parent, id, pos, size, style, name );
 
     AGLPixelFormat fmt = ChoosePixelFormat(attribList);


@@ -252,7 +253,7 @@ void wxGLCanvas::SetViewport()
     int width, height;
     GetClientSize(& width, & height);
     Rect bounds ;
     int width, height;
     GetClientSize(& width, & height);
     Rect bounds ;

-    GetWindowPortBounds( GetMacRootWindow() , &bounds ) ;
+    GetWindowPortBounds( MAC_WXHWND(MacGetRootWindow()) , &bounds ) ;

     GLint parms[4] ;
     parms[0] = x ;
     parms[1] = bounds.bottom - bounds.top - ( y + height ) ;
     GLint parms[4] ;
     parms[0] = x ;
     parms[1] = bounds.bottom - bounds.top - ( y + height ) ;


@@ -273,12 +274,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);

   }
 }
 
   }
 }