Added default constructor to wxGLCanvas.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -108,6 +108,14 @@ public:
|
|||||||
int *attribList = (int*) NULL,
|
int *attribList = (int*) NULL,
|
||||||
const wxPalette& palette = wxNullPalette );
|
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,
|
bool Create( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)NULL,
|
||||||
wxWindowID id = -1,
|
wxWindowID id = -1,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
|
@@ -30,6 +30,8 @@ DECLARE_CLASS(wxGLCanvas)
|
|||||||
public:
|
public:
|
||||||
GLXContext glx_cx;
|
GLXContext glx_cx;
|
||||||
|
|
||||||
|
inline wxGLCanvas() { glx_cx = 0; }
|
||||||
|
|
||||||
wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
|
wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize, long style = 0,
|
const wxSize& size = wxDefaultSize, long style = 0,
|
||||||
const wxString& name = "GLCanvas", int *attribList = 0, const wxPalette& palette = wxNullPalette);
|
const wxString& name = "GLCanvas", int *attribList = 0, const wxPalette& palette = wxNullPalette);
|
||||||
|
@@ -69,6 +69,12 @@ class wxGLCanvas: public wxScrolledWindow
|
|||||||
{
|
{
|
||||||
DECLARE_CLASS(wxGLCanvas)
|
DECLARE_CLASS(wxGLCanvas)
|
||||||
public:
|
public:
|
||||||
|
wxGLCanvas()
|
||||||
|
{
|
||||||
|
m_glContext = (wxGLContext*) NULL;
|
||||||
|
m_hDC = 0;
|
||||||
|
}
|
||||||
|
|
||||||
wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
|
wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize, long style = 0,
|
const wxSize& size = wxDefaultSize, long style = 0,
|
||||||
const wxString& name = "GLCanvas", int *attribList = 0, const wxPalette& palette = wxNullPalette);
|
const wxString& name = "GLCanvas", int *attribList = 0, const wxPalette& palette = wxNullPalette);
|
||||||
|
Reference in New Issue
Block a user