applied patch to make wxGLCanvas derive from wxWindow, not wxScrolledWindow (Paul A. Thiessen)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -111,9 +111,9 @@ void wxGLContext::SetColour(const char *colour)
|
||||
* wxGLCanvas implementation
|
||||
*/
|
||||
|
||||
IMPLEMENT_CLASS(wxGLCanvas, wxScrolledWindow)
|
||||
IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
|
||||
|
||||
BEGIN_EVENT_TABLE(wxGLCanvas, wxScrolledWindow)
|
||||
BEGIN_EVENT_TABLE(wxGLCanvas, wxWindow)
|
||||
EVT_SIZE(wxGLCanvas::OnSize)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
@@ -217,7 +217,7 @@ bool wxGLCanvas::Create(wxWindow *parent, const wxGLContext *shared, wxWindowID
|
||||
int *attribList, const wxPalette& palette)
|
||||
{
|
||||
m_macEraseOnRedraw = false ;
|
||||
wxScrolledWindow::Create( parent, id, pos, size, style, name );
|
||||
wxWindow::Create( parent, id, pos, size, style, name );
|
||||
|
||||
AGLPixelFormat fmt = ChoosePixelFormat(attribList);
|
||||
wxCHECK_MSG( fmt, false, wxT("Couldn't create OpenGl pixel format") );
|
||||
|
||||
Reference in New Issue
Block a user