Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cured memory leak report in wxDateTime; wxGLCanvas corrections

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-01-30 13:43:37 +00:00
parent 4c45f240f6
commit f6081a0462
11 changed files with 68 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
utils/glcanvas/win/glcanvas.cpp
View File

@@ -129,14 +129,25 @@ END_EVENT_TABLE()
wxGLCanvas::wxGLCanvas(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size, long style, const wxString& name,
int *attribList /* not used yet! */, const wxPalette& palette):
wxScrolledWindow(parent, id, pos, size, style, name)
wxScrolledWindow()
{
m_hDC = (WXHDC) ::GetDC((HWND) GetHWND());
m_glContext = (wxGLContext*) NULL;
SetupPixelFormat();
SetupPalette(palette);
bool ret = Create(parent, id, pos, size, style, name);
if ( ret )
{
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
}
m_hDC = (WXHDC) ::GetDC((HWND) GetHWND());
SetupPixelFormat();
SetupPalette(palette);
m_glContext = new wxGLContext(TRUE, this, palette);
m_glContext = new wxGLContext(TRUE, this, palette);
}
wxGLCanvas::wxGLCanvas( wxWindow *parent,
@@ -144,8 +155,9 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent,
const wxPoint& pos, const wxSize& size, long style, const wxString& name,
int *attribList, const wxPalette& palette )
: wxScrolledWindow()
// : wxScrolledWindow(parent, id, pos, size, style, name)
{
m_glContext = (wxGLContext*) NULL;
bool ret = Create(parent, id, pos, size, style, name);
if ( ret )