projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo fix
[wxWidgets.git]
/
src
/
mac
/
glcanvas.cpp
diff --git
a/src/mac/glcanvas.cpp
b/src/mac/glcanvas.cpp
index 2ff4a891281280606ad0baf1ae5123c0f0d907f0..62d9c307c44a67542b3859f67957d993cb0f1fbe 100644
(file)
--- a/
src/mac/glcanvas.cpp
+++ b/
src/mac/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") );
@@
-216,7
+216,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
+251,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 ) ;