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

made SetCurrent() and SwapBuffers() return boolean status indicator instead of void (slightly modified patch 1844090)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-12-22 15:48:03 +00:00
parent 242019eef3
commit 5ec69e9666
7 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/unix/glx11.cpp
View File

@@ -68,26 +68,26 @@ wxGLContext::~wxGLContext()
glXDestroyContext( wxGetX11Display(), m_glContext );
}
void wxGLContext::SetCurrent(const wxGLCanvas& win) const
bool wxGLContext::SetCurrent(const wxGLCanvas& win) const
{
if ( !m_glContext )
return;
return false;
const Window xid = win.GetXWindow();
wxCHECK_RET( xid, _T("window must be shown") );
wxCHECK2_MSG( xid, return false, _T("window must be shown") );
MakeCurrent(xid, m_glContext);
return MakeCurrent(xid, m_glContext);
}
// wrapper around glXMakeContextCurrent/glXMakeCurrent depending on GLX
// version
/* static */
void wxGLContext::MakeCurrent(GLXDrawable drawable, GLXContext context)
bool wxGLContext::MakeCurrent(GLXDrawable drawable, GLXContext context)
{
if (wxGLCanvas::GetGLXVersion() >= 13)
glXMakeContextCurrent( wxGetX11Display(), drawable, drawable, context);
return glXMakeContextCurrent( wxGetX11Display(), drawable, drawable, context);
else // GLX <= 1.2 doesn't have glXMakeContextCurrent()
glXMakeCurrent( wxGetX11Display(), drawable, context);
return glXMakeCurrent( wxGetX11Display(), drawable, context);
}
// ============================================================================
@@ -351,12 +351,13 @@ int wxGLCanvasX11::GetGLXVersion()
return s_glxVersion;
}
void wxGLCanvasX11::SwapBuffers()
bool wxGLCanvasX11::SwapBuffers()
{
const Window xid = GetXWindow();
wxCHECK_RET( xid, _T("window must be shown") );
wxCHECK2_MSG( xid, return false, _T("window must be shown") );
glXSwapBuffers(wxGetX11Display(), xid);
return true;
}
bool wxGLCanvasX11::IsShownOnScreen() const