applied patch to make wxGLCanvas derive from wxWindow, not wxScrolledWindow (Paul...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index e91020cca49ec948286196fb6fd2855a57c87de3..b95bf4162a3aca90930b11236e8b06d59eb1bcbd 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -6,6 +6,8 @@ INCOMPATIBLE CHANGES SINCE 2.2.x
 
 All (GUI):
 
 
 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
 
 - 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 ae7de3acc6da1d226d80943666db39d1fb820b5a..f78a8d8f10787b45832858cf08ba2a9dfa6b55d7 100644 (file)
--- a/include/wx/gtk/glcanvas.h
+++ b/include/wx/gtk/glcanvas.h
@@ -100,7 +100,7 @@ private:
 // wxGLCanvas
 //---------------------------------------------------------------------------
 
 // wxGLCanvas
 //---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
+class WXDLLEXPORT wxGLCanvas: public wxWindow

 {
 public:
    inline wxGLCanvas() {
 {
 public:
    inline wxGLCanvas() {

diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index ae7de3acc6da1d226d80943666db39d1fb820b5a..f78a8d8f10787b45832858cf08ba2a9dfa6b55d7 100644 (file)
--- a/include/wx/gtk1/glcanvas.h
+++ b/include/wx/gtk1/glcanvas.h
@@ -100,7 +100,7 @@ private:
 // wxGLCanvas
 //---------------------------------------------------------------------------
 
 // wxGLCanvas
 //---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
+class WXDLLEXPORT wxGLCanvas: public wxWindow

 {
 public:
    inline wxGLCanvas() {
 {
 public:
    inline wxGLCanvas() {

diff --git a/include/wx/mac/glcanvas.h b/include/wx/mac/glcanvas.h
index 877d50197458d6c8aecad1d28dc1489a2a700238..c0b1f9e30a2b1e820b20a7a7664d55bb5facb0e2 100644 (file)
--- a/include/wx/mac/glcanvas.h
+++ b/include/wx/mac/glcanvas.h
@@ -82,7 +82,7 @@ public:
    wxWindow*        m_window;
 };
 
    wxWindow*        m_window;
 };
 

-class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
+class WXDLLEXPORT wxGLCanvas: public wxWindow

 {
    DECLARE_CLASS(wxGLCanvas)
  public:
 {
    DECLARE_CLASS(wxGLCanvas)
  public:

diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h
index df45b5e8163c9e2e4b2d3adbc4a6cd807a64bf87..69d6e5cc51e447e3f60ca1a0fec28b8e0e6ee4a5 100644 (file)
--- a/include/wx/msw/glcanvas.h
+++ b/include/wx/msw/glcanvas.h
@@ -79,7 +79,7 @@ public:
    wxWindow*        m_window;
 };
 
    wxWindow*        m_window;
 };
 

-class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
+class WXDLLEXPORT wxGLCanvas: public wxWindow

 {
    DECLARE_CLASS(wxGLCanvas)
  public:
 {
    DECLARE_CLASS(wxGLCanvas)
  public:

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index c15057112d81dd4a991232f6566f641f88029ba5..146597dc469e007b09b354f3b968346197fe8dd4 100644 (file)
--- 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
 //---------------------------------------------------------------------------
 
 // 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()
 
     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 );
 
     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;
     
 
     m_glWidget = m_wxwindow;
     

diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp
index c15057112d81dd4a991232f6566f641f88029ba5..146597dc469e007b09b354f3b968346197fe8dd4 100644 (file)
--- 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
 //---------------------------------------------------------------------------
 
 // 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()
 
     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 );
 
     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;
     
 
     m_glWidget = m_wxwindow;
     

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index 0b86e94269243b0e5e550d8cf2846b763bd8eee9..1629d068b66e6eb2c2bac929cd2d442730fb4ed5 100644 (file)
--- a/src/mac/carbon/glcanvas.cpp
+++ b/src/mac/carbon/glcanvas.cpp
@@ -111,9 +111,9 @@ void wxGLContext::SetColour(const char *colour)
  * wxGLCanvas implementation
  */
 
  * 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()
 
     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 ;
                        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") );
 
     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 0b86e94269243b0e5e550d8cf2846b763bd8eee9..1629d068b66e6eb2c2bac929cd2d442730fb4ed5 100644 (file)
--- a/src/mac/glcanvas.cpp
+++ b/src/mac/glcanvas.cpp
@@ -111,9 +111,9 @@ void wxGLContext::SetColour(const char *colour)
  * wxGLCanvas implementation
  */
 
  * 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()
 
     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 ;
                        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") );
 
     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 0f24a7cff6e3d2ce985e4cc48707b6b40fc0dc50..218b4969b28c18f394b2f6d8343051d7a7e0fcf0 100644 (file)
--- a/src/msw/glcanvas.cpp
+++ b/src/msw/glcanvas.cpp
@@ -125,9 +125,9 @@ void wxGLContext::SetColour(const char *colour)
  * wxGLCanvas implementation
  */
 
  * 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)
     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,
 
 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;
 
 {
   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 )
               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;
 
 {
   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 ):
 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;
 
 {
   m_glContext = (wxGLContext*) NULL;