Added default constructor to wxGLCanvas.

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

diff --git a/utils/glcanvas/gtk/glcanvas.h b/utils/glcanvas/gtk/glcanvas.h
index f426e65ddaff34120aa59528aa6134ac4043a806..3b7cb08cbd15e672b14815060cbca7ad31d3cf1d 100644 (file)
--- a/utils/glcanvas/gtk/glcanvas.h
+++ b/utils/glcanvas/gtk/glcanvas.h
@@ -108,6 +108,14 @@ public:
         int *attribList = (int*) NULL, 
         const wxPalette& palette = wxNullPalette );
 
         int *attribList = (int*) NULL, 
         const wxPalette& palette = wxNullPalette );
 

+   inline wxGLCanvas() {
+      m_glContext = (wxGLContext*) NULL;
+      m_sharedContext = (wxGLContext*) NULL;
+      m_glWidget = (GtkWidget*) NULL;
+      m_vi = (void*) NULL;
+      m_exposed = FALSE;
+   }
+

    bool Create( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)NULL,
         wxWindowID id = -1, 
         const wxPoint& pos = wxDefaultPosition,
    bool Create( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)NULL,
         wxWindowID id = -1, 
         const wxPoint& pos = wxDefaultPosition,

diff --git a/utils/glcanvas/motif/glcanvas.h b/utils/glcanvas/motif/glcanvas.h
index ee4afde5fc74c5b90c0fb16adeab9d1a0319a36c..96ae147094ddcc7a172708a23107898ee63b7d07 100644 (file)
--- a/utils/glcanvas/motif/glcanvas.h
+++ b/utils/glcanvas/motif/glcanvas.h
@@ -30,6 +30,8 @@ DECLARE_CLASS(wxGLCanvas)
 public:
     GLXContext glx_cx;
 
 public:
     GLXContext glx_cx;
 

+    inline wxGLCanvas() { glx_cx = 0; }
+

     wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxString& name = "GLCanvas", int *attribList = 0, const wxPalette& palette = wxNullPalette);
     wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxString& name = "GLCanvas", int *attribList = 0, const wxPalette& palette = wxNullPalette);

diff --git a/utils/glcanvas/win/glcanvas.h b/utils/glcanvas/win/glcanvas.h
index 6dd7e60c6c6beae0f156a454784a62b37cf4314d..9c6dbc746d081ba4efbca6fce7fb2f70bcc8117a 100644 (file)
--- a/utils/glcanvas/win/glcanvas.h
+++ b/utils/glcanvas/win/glcanvas.h
@@ -69,6 +69,12 @@ class wxGLCanvas: public wxScrolledWindow
 {
    DECLARE_CLASS(wxGLCanvas)
  public:
 {
    DECLARE_CLASS(wxGLCanvas)
  public:

+   wxGLCanvas()
+   {
+       m_glContext = (wxGLContext*) NULL;
+       m_hDC = 0;
+   }
+

    wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxString& name = "GLCanvas", int *attribList = 0, const wxPalette& palette = wxNullPalette);
    wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxString& name = "GLCanvas", int *attribList = 0, const wxPalette& palette = wxNullPalette);