wxPython updates to match recent updates to wxCalendarCtrl, wxGrid,
and wxGLCanvas. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -128,9 +128,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)
 | 
			
		||||
    EVT_PALETTE_CHANGED(wxGLCanvas::OnPaletteChanged)
 | 
			
		||||
    EVT_QUERY_NEW_PALETTE(wxGLCanvas::OnQueryNewPalette)
 | 
			
		||||
@@ -138,7 +138,7 @@ END_EVENT_TABLE()
 | 
			
		||||
 | 
			
		||||
wxGLCanvas::wxGLCanvas(wxWindow *parent, wxWindowID id,
 | 
			
		||||
    const wxPoint& pos, const wxSize& size, long style, const wxString& name,
 | 
			
		||||
    int *attribList, const wxPalette& palette) : wxScrolledWindow()
 | 
			
		||||
    int *attribList, const wxPalette& palette) : wxWindow()
 | 
			
		||||
{
 | 
			
		||||
  m_glContext = (wxGLContext*) NULL;
 | 
			
		||||
 | 
			
		||||
@@ -162,7 +162,7 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent,
 | 
			
		||||
              const wxGLContext *shared, wxWindowID id,
 | 
			
		||||
              const wxPoint& pos, const wxSize& size, long style, const wxString& name,
 | 
			
		||||
              int *attribList, const wxPalette& palette )
 | 
			
		||||
  : wxScrolledWindow()
 | 
			
		||||
  : wxWindow()
 | 
			
		||||
{
 | 
			
		||||
  m_glContext = (wxGLContext*) NULL;
 | 
			
		||||
 | 
			
		||||
@@ -187,7 +187,7 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent,
 | 
			
		||||
wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id,
 | 
			
		||||
                        const wxPoint& pos, const wxSize& size, long style, const wxString& name,
 | 
			
		||||
                        int *attribList, const wxPalette& palette ):
 | 
			
		||||
  wxScrolledWindow()
 | 
			
		||||
  wxWindow()
 | 
			
		||||
{
 | 
			
		||||
  m_glContext = (wxGLContext*) NULL;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user