From 4660d7e5d656bd63c6ba410e6bf36486e7a77d4e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 2 Nov 2001 16:08:52 +0000 Subject: [PATCH] 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 --- docs/changes.txt | 2 ++ include/wx/gtk/glcanvas.h | 2 +- include/wx/gtk1/glcanvas.h | 2 +- include/wx/mac/glcanvas.h | 2 +- include/wx/msw/glcanvas.h | 2 +- src/gtk/glcanvas.cpp | 6 +++--- src/gtk1/glcanvas.cpp | 6 +++--- src/mac/carbon/glcanvas.cpp | 6 +++--- src/mac/glcanvas.cpp | 6 +++--- src/msw/glcanvas.cpp | 10 +++++----- 10 files changed, 23 insertions(+), 21 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index e91020cca4..b95bf4162a 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -6,6 +6,8 @@ INCOMPATIBLE CHANGES SINCE 2.2.x All (GUI): +- wxGLCanvas now derives directly from wxWindow, not wxScrolledWindow + - wxGridCellAttrProvider class API changed, you will need to update your code if you derived any classes from it diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h index ae7de3acc6..f78a8d8f10 100644 --- a/include/wx/gtk/glcanvas.h +++ b/include/wx/gtk/glcanvas.h @@ -100,7 +100,7 @@ private: // wxGLCanvas //--------------------------------------------------------------------------- -class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow +class WXDLLEXPORT wxGLCanvas: public wxWindow { public: inline wxGLCanvas() { diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h index ae7de3acc6..f78a8d8f10 100644 --- a/include/wx/gtk1/glcanvas.h +++ b/include/wx/gtk1/glcanvas.h @@ -100,7 +100,7 @@ private: // wxGLCanvas //--------------------------------------------------------------------------- -class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow +class WXDLLEXPORT wxGLCanvas: public wxWindow { public: inline wxGLCanvas() { diff --git a/include/wx/mac/glcanvas.h b/include/wx/mac/glcanvas.h index 877d501974..c0b1f9e30a 100644 --- a/include/wx/mac/glcanvas.h +++ b/include/wx/mac/glcanvas.h @@ -82,7 +82,7 @@ public: wxWindow* m_window; }; -class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow +class WXDLLEXPORT wxGLCanvas: public wxWindow { DECLARE_CLASS(wxGLCanvas) public: diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h index df45b5e816..69d6e5cc51 100644 --- a/include/wx/msw/glcanvas.h +++ b/include/wx/msw/glcanvas.h @@ -79,7 +79,7 @@ public: wxWindow* m_window; }; -class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow +class WXDLLEXPORT wxGLCanvas: public wxWindow { DECLARE_CLASS(wxGLCanvas) public: diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp index c15057112d..146597dc46 100644 --- a/src/gtk/glcanvas.cpp +++ b/src/gtk/glcanvas.cpp @@ -237,9 +237,9 @@ gtk_glcanvas_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, w // wxGlCanvas //--------------------------------------------------------------------------- -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() @@ -309,7 +309,7 @@ bool wxGLCanvas::Create( wxWindow *parent, gtk_widget_push_colormap( colormap ); gtk_widget_push_visual( visual ); - wxScrolledWindow::Create( parent, id, pos, size, style, name ); + wxWindow::Create( parent, id, pos, size, style, name ); m_glWidget = m_wxwindow; diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp index c15057112d..146597dc46 100644 --- a/src/gtk1/glcanvas.cpp +++ b/src/gtk1/glcanvas.cpp @@ -237,9 +237,9 @@ gtk_glcanvas_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, w // wxGlCanvas //--------------------------------------------------------------------------- -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() @@ -309,7 +309,7 @@ bool wxGLCanvas::Create( wxWindow *parent, gtk_widget_push_colormap( colormap ); gtk_widget_push_visual( visual ); - wxScrolledWindow::Create( parent, id, pos, size, style, name ); + wxWindow::Create( parent, id, pos, size, style, name ); m_glWidget = m_wxwindow; diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp index 0b86e94269..1629d068b6 100644 --- a/src/mac/carbon/glcanvas.cpp +++ b/src/mac/carbon/glcanvas.cpp @@ -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") ); diff --git a/src/mac/glcanvas.cpp b/src/mac/glcanvas.cpp index 0b86e94269..1629d068b6 100644 --- a/src/mac/glcanvas.cpp +++ b/src/mac/glcanvas.cpp @@ -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") ); diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp index 0f24a7cff6..218b4969b2 100644 --- a/src/msw/glcanvas.cpp +++ b/src/msw/glcanvas.cpp @@ -125,9 +125,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) @@ -135,7 +135,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; @@ -159,7 +159,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; @@ -184,7 +184,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; -- 2.47.2